foomo/contentserver
1
0
Fork 0
mirror of https://github.com/foomo/contentserver.git synced 2025-10-16 12:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lotsa api polishing up and down

Browse Source
This commit is contained in:
Jan Halfar 2013-09-12 22:32:25 +02:00
parent ada4f0f6d2
commit ad90df7fe2
11 changed files with 150 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
.*
!.git*
/buildOnLinux.sh
/main
/ContentServer.sublime-project
/ContentServer.sublime-workspace

BIN
ContentServer Executable file
View File

Binary file not shown.

49
main.go
View File

@ -1,12 +1,53 @@
package main
import (
"flag"
"fmt"
"github.com/foomo/ContentServer/server"
"github.com/foomo/ContentServer/server/log"
"os"
)
func main() {
log.SetLogLevel(log.LOG_LEVEL_DEBUG)
//server.Run(":8080", "http://test.bestbytes/foomo/modules/Foomo.Page.Content/services/content.php")
server.RunSocketServer("http://test.bestbytes/foomo/modules/Foomo.Page.Content/services/content.php", "0.0.0.0:8081")
const (
PROTOCOL_TCP = "tcp"
PROTOCOL_HTTP = "http"
)
type ExitCode int
const (
EXIT_CODE_OK = 0
EXIT_CODE_INSUFFICIENT_ARGS = 1
)
var contentServer string
var protocol = flag.String("protocol", PROTOCOL_TCP, "what protocol to server for")
var address = flag.String("address", "127.0.0.1:8081", "address to bind host:port")
func exitUsage(code int) {
fmt.Printf("Usage: %s http(s)://your-content-server/path/to/content.json\n", os.Args[0])
flag.PrintDefaults()
os.Exit(code)
}
func main() {
flag.Parse()
log.SetLogLevel(log.LOG_LEVEL_DEBUG)
if len(flag.Args()) == 1 {
fmt.Println(*protocol, *address, flag.Arg(0))
//server.Run(":8080", "http://test.bestbytes/foomo/modules/Foomo.Page.Content/services/content.php")
switch *protocol {
case PROTOCOL_TCP:
server.RunSocketServer(flag.Arg(0), *address)
break
case PROTOCOL_HTTP:
fmt.Println("http server does not work yet - use tcp instead")
break
default:
exitUsage(EXIT_CODE_INSUFFICIENT_ARGS)
}
} else {
exitUsage(EXIT_CODE_INSUFFICIENT_ARGS)
}
}

2
server/http.go
View File

@ -57,7 +57,7 @@ func commandHandler(w http.ResponseWriter, r *http.Request) {
}
func Run(addr string, serverUrl string) {
log.Notice("staring content server")
log.Notice("starting content server")
log.Notice(" loading content from " + serverUrl)
contentRepo = repo.NewRepo(serverUrl)
contentRepo.Update()

1
server/repo/content/node.go
View File

@ -5,6 +5,7 @@ import ()
type Node struct {
Item *Item `json:"item"`
Nodes map[string]*Node `json:"nodes"`
Index []string `json:"index"`
}
func NewNode() *Node {

76
server/repo/content/repoNode.go
View File

@ -6,20 +6,21 @@ import (
)
type RepoNode struct {
Id string `json:"id"`
MimeType string `json:"mimeType"`
Handler string `json:"handler"`
Regions []string `json:"regions"`
URIs map[string]map[string]string `json:"URIs"`
Names map[string]string `json:"names"`
Hidden bool `json:"hidden"` // hidden in tree
Groups []string `json:"groups"`
Data map[string]interface{} `json:"data"`
Content map[string]interface{} `json:"content"`
Index []string `json:"index"`
Nodes map[string]*RepoNode `json:"nodes"`
LinkIds map[string]map[string]string `json:"linkIds"` // ids to link to
parent *RepoNode
Id string `json:"id"`
MimeType string `json:"mimeType"`
Handler string `json:"handler"`
Regions []string `json:"regions"`
URIs map[string]map[string]string `json:"URIs"`
DestinationIds map[string]map[string]string `json:"destinationIds"`
Names map[string]string `json:"names"`
Hidden bool `json:"hidden"` // hidden in tree
Groups []string `json:"groups"`
Data map[string]interface{} `json:"data"`
Content map[string]interface{} `json:"content"`
Nodes map[string]*RepoNode `json:"nodes"`
Index []string `json:"index"`
LinkIds map[string]map[string]string `json:"linkIds"` // ids to link to
parent *RepoNode
// published from - to
}
@ -45,12 +46,39 @@ func (node *RepoNode) WireParents() {
}
}
func (node *RepoNode) GetPath(region string, language string) map[string]*Item {
path := make(map[string]*Item)
func (node *RepoNode) InPath(path []*Item) bool {
myParentId := node.parent.Id
for _, pathItem := range path {
if pathItem.Id == myParentId {
return true
}
}
return false
}
func (node *RepoNode) InRegion(region string) bool {
for _, nodeRegion := range node.Regions {
if nodeRegion == region {
return true
}
}
return false
}
func (node *RepoNode) GetPath(region string, language string) []*Item {
parentNode := node.parent
pathLength := 0
for parentNode != nil {
path[parentNode.Id] = parentNode.ToItem(region, language)
parentNode = parentNode.parent
pathLength++
}
parentNode = node.parent
i := 0
path := make([]*Item, pathLength)
for parentNode != nil {
path[i] = parentNode.ToItem(region, language)
parentNode = parentNode.parent
i++
}
return path
}
@ -59,6 +87,7 @@ func (node *RepoNode) ToItem(region string, language string) *Item {
item := NewItem()
item.Id = node.Id
item.Name = node.GetName(language)
//todo handle destinationIds ....
item.URI = node.URIs[region][language]
return item
}
@ -77,12 +106,16 @@ func (node *RepoNode) GetName(language string) string {
}
func (node *RepoNode) IsOneOfTheseMimeTypes(mimeTypes []string) bool {
for _, mimeType := range mimeTypes {
if mimeType == node.MimeType {
return true
if len(mimeTypes) == 0 {
return true
} else {
for _, mimeType := range mimeTypes {
if mimeType == node.MimeType {
return true
}
}
return false
}
return false
}
func (node *RepoNode) PrintNode(id string, level int) {
@ -98,6 +131,5 @@ func (node *RepoNode) PrintNode(id string, level int) {
func NewRepoNode() *RepoNode {
node := new(RepoNode)
return node
}

3
server/repo/content/siteContent.go
View File

@ -11,9 +11,10 @@ type SiteContent struct {
URI string `json:"URI"`
Region string `json:"region"`
Language string `json:"language"`
Handler string `json:"handler"`
Item *Item `json:"item"`
Data interface{} `json:"data"`
Path map[string]*Item `json:"path"`
Path []*Item `json:"path"`
URIs map[string]string `json:"URIs"`
Nodes map[string]*Node `json:"nodes"`
}

33
server/repo/repo.go
View File

@ -1,6 +1,7 @@
package repo
import (
"fmt"
"github.com/foomo/ContentServer/server/log"
"github.com/foomo/ContentServer/server/repo/content"
"github.com/foomo/ContentServer/server/requests"
@ -31,9 +32,18 @@ func (repo *Repo) ResolveContent(URI string) (resolved bool, resolvedURI string,
testURI := strings.Join(parts[0:i], content.PATH_SEPARATOR)
log.Debug(" testing" + testURI)
if repoNode, ok := repo.URIDirectory[testURI]; ok {
log.Debug(" => " + testURI)
resolved = true
_, region, language := repoNode.GetLanguageAndRegionForURI(testURI)
log.Debug(" => " + testURI)
log.Debug(" destionations " + fmt.Sprint(repoNode.DestinationIds))
log.Debug(" .region " + region + " " + fmt.Sprint(repoNode.DestinationIds[region]))
if languageDestinations, regionOk := repoNode.DestinationIds[region]; regionOk {
log.Debug(" there is a destionation map for this one " + fmt.Sprint(languageDestinations))
if languageDestination, destinationOk := languageDestinations[language]; destinationOk {
// what if it is not there ....
repoNode = repo.Directory[languageDestination]
}
}
return true, testURI, region, language, repoNode
} else {
log.Debug(" => !" + testURI)
@ -43,6 +53,14 @@ func (repo *Repo) ResolveContent(URI string) (resolved bool, resolvedURI string,
return
}
func (repo *Repo) GetURIs(region string, language string, ids []string) map[string]string {
uris := make(map[string]string)
for _, id := range ids {
uris[id] = repo.GetURI(region, language, id)
}
return uris
}
func (repo *Repo) GetURI(region string, language string, id string) string {
repoNode, ok := repo.Directory[id]
if ok {
@ -57,16 +75,19 @@ func (repo *Repo) GetURI(region string, language string, id string) string {
return ""
}
func (repo *Repo) GetNode(repoNode *content.RepoNode, expanded bool, mimeTypes []string, path []string, region string, language string) *content.Node {
func (repo *Repo) GetNode(repoNode *content.RepoNode, expanded bool, mimeTypes []string, path []*content.Item, region string, language string) *content.Node {
node := content.NewNode()
node.Item = repoNode.ToItem(region, language)
log.Debug("repo.GetNode: " + repoNode.Id)
for _, childId := range repoNode.Index {
childNode := repoNode.Nodes[childId]
if expanded && !childNode.Hidden && childNode.IsOneOfTheseMimeTypes(mimeTypes) {
// || in path and in region mimes
if (expanded || !expanded && childNode.InPath(path)) && !childNode.Hidden && childNode.IsOneOfTheseMimeTypes(mimeTypes) && childNode.InRegion(region) {
node.Nodes[childId] = repo.GetNode(childNode, expanded, mimeTypes, path, region, language)
node.Index = append(node.Index, childId)
} else {
fmt.Println("no see for", childNode.GetName(language), childNode.Hidden)
}
}
return node
}
@ -81,13 +102,14 @@ func (repo *Repo) GetContent(r *requests.Content) *content.SiteContent {
c.Region = region
c.Language = language
c.Status = content.STATUS_OK
c.Handler = node.Handler
c.URI = resolvedURI
c.Item = node.ToItem(region, language)
c.Path = node.GetPath(region, language)
c.Data = node.Data
for treeName, treeRequest := range r.Nodes {
log.Debug(" adding tree " + treeName + " " + treeRequest.Id)
c.Nodes[treeName] = repo.GetNode(repo.Directory[treeRequest.Id], treeRequest.Expand, treeRequest.MimeTypes, []string{}, region, language)
c.Nodes[treeName] = repo.GetNode(repo.Directory[treeRequest.Id], treeRequest.Expand, treeRequest.MimeTypes, c.Path, region, language)
}
} else {
log.Notice("404 for " + r.URI)
@ -99,6 +121,7 @@ func (repo *Repo) GetContent(r *requests.Content) *content.SiteContent {
func (repo *Repo) builDirectory(dirNode *content.RepoNode) {
log.Debug("repo.buildDirectory: " + dirNode.Id)
repo.Directory[dirNode.Id] = dirNode
//todo handle duplicate uris
for _, languageURIs := range dirNode.URIs {
for _, URI := range languageURIs {
log.Debug(" URI: " + URI + " => Id: " + dirNode.Id)

11
server/requests/uri.go
View File

@ -1,11 +0,0 @@
package requests
type URI struct {
Id string `json:"id"`
Region string `json:"region"`
Language string `json:"language"`
}
func NewURI() *URI {
return new(URI)
}

11
server/requests/uris.go Normal file
View File

@ -0,0 +1,11 @@
package requests
type URIs struct {
Ids []string `json:"ids"`
Region string `json:"region"`
Language string `json:"language"`
}
func NewURIs() *URIs {
return new(URIs)
}

14
server/socket.go
View File

@ -27,13 +27,13 @@ func handleSocketRequest(handler string, jsonBuffer []byte) (replyBytes []byte,
var jsonErr error
log.Record(fmt.Sprintf("socket.handleSocketRequest(%d): %s %s", numRequests(), handler, string(jsonBuffer)))
switch handler {
case "getURI":
getURIRequest := requests.NewURI()
case "getURIs":
getURIRequest := requests.NewURIs()
jsonErr = json.Unmarshal(jsonBuffer, &getURIRequest)
log.Debug(" getURIRequest: " + fmt.Sprint(getURIRequest))
uri := contentRepo.GetURI(getURIRequest.Region, getURIRequest.Language, getURIRequest.Id)
log.Debug(" resolved: " + uri)
reply = uri
uris := contentRepo.GetURIs(getURIRequest.Region, getURIRequest.Language, getURIRequest.Ids)
log.Debug(" resolved: " + fmt.Sprint(uris))
reply = uris
break
case "content":
contentRequest := requests.NewContent()
@ -104,8 +104,8 @@ func handleConnection(conn net.Conn) {
log.Error("socket.handleConnection: could not write my reply: " + fmt.Sprint(writeError))
return
} else {
log.Debug(" replied.")
return
log.Debug(" replied. waiting for next request on open connection")
//return
}
}
} else {