From 425cf217ef7ea10d8bfac66a1381d7635dc45c4e Mon Sep 17 00:00:00 2001 From: franklin Date: Wed, 1 Oct 2014 16:51:57 +0200 Subject: [PATCH] renamed files apply naming conventions --- .gitignore | 9 +- doc.go | 4 +- main.go | 4 +- server/http.go | 8 +- server/repo/content/repoNode.go | 179 ------------------- server/repo/content/siteContent-example.json | 44 ----- server/repo/content/siteContent.go | 27 --- server/repo/repo.go | 10 +- server/requests/itemMap.go | 10 -- server/server.go | 2 +- server/socket.go | 8 +- 11 files changed, 22 insertions(+), 283 deletions(-) delete mode 100644 server/repo/content/repoNode.go delete mode 100644 server/repo/content/siteContent-example.json delete mode 100644 server/repo/content/siteContent.go delete mode 100644 server/requests/itemMap.go diff --git a/.gitignore b/.gitignore index 535354e..a81a4ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .* -!.git* -/buildOnLinux.sh +*~ /main -/ContentServer.sublime-project -/ContentServer.sublime-workspace -/ContentServer +/*.sublime-* +/buildOnLinux.sh +!.git* diff --git a/doc.go b/doc.go index 1e4c5c0..797763c 100644 --- a/doc.go +++ b/doc.go @@ -1,6 +1,6 @@ -// ContentServer project doc.go +// contentserver project doc.go /* -ContentServer document +contentserver document */ package main diff --git a/main.go b/main.go index 86cce3d..e7fb49e 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,8 @@ package main import ( "flag" "fmt" - "github.com/foomo/ContentServer/server" - "github.com/foomo/ContentServer/server/log" + "github.com/foomo/contentserver/server" + "github.com/foomo/contentserver/server/log" "os" "strings" ) diff --git a/server/http.go b/server/http.go index 8438070..4344dfc 100644 --- a/server/http.go +++ b/server/http.go @@ -2,10 +2,10 @@ package server import ( "fmt" - "github.com/foomo/ContentServer/server/log" - "github.com/foomo/ContentServer/server/repo" - "github.com/foomo/ContentServer/server/requests" - "github.com/foomo/ContentServer/server/utils" + "github.com/foomo/contentserver/server/log" + "github.com/foomo/contentserver/server/repo" + "github.com/foomo/contentserver/server/requests" + "github.com/foomo/contentserver/server/utils" "net/http" "strconv" "strings" diff --git a/server/repo/content/repoNode.go b/server/repo/content/repoNode.go deleted file mode 100644 index bc315de..0000000 --- a/server/repo/content/repoNode.go +++ /dev/null @@ -1,179 +0,0 @@ -package content - -import ( - "fmt" - "strings" -) - -type RepoNode struct { - Id string `json:"id"` // unique identifier - it is your responsibility, that they are unique - MimeType string `json:"mimeType"` // well a mime type http://www.ietf.org/rfc/rfc2046.txt - LinkIds map[string]map[string]string `json:"linkIds"` // (symbolic) link/alias to another node - Handler string `json:"handler"` // that information is for you - Regions []string `json:"regions"` // in what regions is this node available, if empty it will be accessible everywhere - Groups []string `json:"groups"` // which groups have access to the node, if empty everybody has access to it - States []string `json:"states"` // in which states is this node valid, if empty => in all of them - URIs map[string]map[string]string `json:"URIs"` - Names map[string]map[string]string `json:"names"` - Hidden map[string]map[string]bool `json:"hidden"` // hidden in content.nodes, but can still be resolved when being directly addressed - DestinationIds map[string]map[string]string `json:"destinationIds"` // if a node does not have any content like a folder the destinationIds can point to nodes that do aka. the first displayable child node - Data map[string]interface{} `json:"data"` // what ever you want to stuff into it - the payload you want to attach to a node - Nodes map[string]*RepoNode `json:"nodes"` // child nodes - Index []string `json:"index"` // defines the order of the child nodes - parent *RepoNode // parent node - helps to resolve a path / bread crumb - // published from - to is going to be an array of fromTos -} - -func (node *RepoNode) GetLanguageAndRegionForURI(URI string) (resolved bool, region string, language string) { - for possibleRegion, URIs := range node.URIs { - for possibleLanguage, regionLangURI := range URIs { - if regionLangURI == URI { - resolved = true - region = possibleRegion - language = possibleLanguage - return - } - } - } - resolved = false - return -} - -func (node *RepoNode) WireParents() { - for _, childNode := range node.Nodes { - childNode.parent = node - childNode.WireParents() - } -} - -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) InState(state string) bool { - if len(node.States) == 0 { - return true - } else { - for _, nodeState := range node.States { - if state == nodeState { - 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 { - parentNode = parentNode.parent - pathLength++ - } - parentNode = node.parent - i := 0 - path := make([]*Item, pathLength) - for parentNode != nil { - path[i] = parentNode.ToItem(region, language, []string{}) - parentNode = parentNode.parent - i++ - } - return path -} - -func (node *RepoNode) ToItem(region string, language string, dataFields []string) *Item { - item := NewItem() - item.Id = node.Id - item.Name = node.GetName(region, language) - item.URI = node.URIs[region][language] //uri //repo.GetURI(region, language, node.Id) - for _, dataField := range dataFields { - if data, ok := node.Data[dataField]; ok { - item.Data[dataField] = data - } - } - return item -} - -func (node *RepoNode) GetParent() *RepoNode { - return node.parent -} - -func (node *RepoNode) AddNode(name string, childNode *RepoNode) *RepoNode { - node.Nodes[name] = childNode - return node -} - -func (node *RepoNode) IsHidden(region string, language string) bool { - if regionMap, ok := node.Hidden[region]; ok { - if languageHidden, ok := regionMap[language]; ok { - return languageHidden - } else { - return false - } - } - return false -} - -func (node *RepoNode) GetName(region string, language string) string { - return node.Names[region][language] -} - -func (node *RepoNode) IsOneOfTheseMimeTypes(mimeTypes []string) bool { - if len(mimeTypes) == 0 { - return true - } else { - for _, mimeType := range mimeTypes { - if mimeType == node.MimeType { - return true - } - } - return false - } -} - -func (node *RepoNode) CanBeAccessedByGroups(groups []string) bool { - if len(groups) == 0 || len(node.Groups) == 0 { - return true - } else { - // @todo is there sth like in_array ... or some array intersection - for _, group := range groups { - for _, myGroup := range node.Groups { - if group == myGroup { - return true - } - } - } - return false - } -} - -func (node *RepoNode) PrintNode(id string, level int) { - prefix := strings.Repeat(INDENT, level) - fmt.Printf("%s %s:\n", prefix, id) - for lang, name := range node.Names { - fmt.Printf("%s %s: %s\n", prefix+INDENT, lang, name) - } - for key, childNode := range node.Nodes { - childNode.PrintNode(key, level+1) - } -} - -func NewRepoNode() *RepoNode { - node := new(RepoNode) - return node -} diff --git a/server/repo/content/siteContent-example.json b/server/repo/content/siteContent-example.json deleted file mode 100644 index f3b1342..0000000 --- a/server/repo/content/siteContent-example.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "status": 200, - "nodes" : { - "main" : { - "id" : "xxx", - "name" : "home", - "nodes" : { - - } - }, - "footer" : { - - }, - "meta" : { - - } - }, - "content" : { - "item" : { - "id" : "xxx-content-id", - "name" : "foo", - "mimeType" : "" - }, - "handler" : "creation/full", - "data": { - "foo" : "bar" - }, - "uris" : { - "id-yyy" : "/de/...", - "" - } - }, - "linksToOtherRegionsAndLanguages": { - "ch" : { - "de" : "/ch/de/foo", - "it" : "/ch/it/va-fan-foo", - // no fr no have - }, - "si" : { - "si" : "/si/si/..." - } - // no other regions for this one - } -} \ No newline at end of file diff --git a/server/repo/content/siteContent.go b/server/repo/content/siteContent.go deleted file mode 100644 index 029b298..0000000 --- a/server/repo/content/siteContent.go +++ /dev/null @@ -1,27 +0,0 @@ -package content - -const ( - STATUS_OK = 200 - STATUS_FORBIDDEN = 403 - STATUS_NOT_FOUND = 404 -) - -type SiteContent struct { - Status int `json:"status"` - 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 []*Item `json:"path"` - URIs map[string]string `json:"URIs"` - Nodes map[string]*Node `json:"nodes"` -} - -func NewSiteContent() *SiteContent { - c := new(SiteContent) - c.Nodes = make(map[string]*Node) - c.URIs = make(map[string]string) - return c -} diff --git a/server/repo/repo.go b/server/repo/repo.go index 106493f..dd9514d 100644 --- a/server/repo/repo.go +++ b/server/repo/repo.go @@ -2,11 +2,11 @@ package repo import ( "fmt" - "github.com/foomo/ContentServer/server/log" - "github.com/foomo/ContentServer/server/repo/content" - "github.com/foomo/ContentServer/server/requests" - "github.com/foomo/ContentServer/server/responses" - "github.com/foomo/ContentServer/server/utils" + "github.com/foomo/contentserver/server/log" + "github.com/foomo/contentserver/server/repo/content" + "github.com/foomo/contentserver/server/requests" + "github.com/foomo/contentserver/server/responses" + "github.com/foomo/contentserver/server/utils" "strings" "time" ) diff --git a/server/requests/itemMap.go b/server/requests/itemMap.go deleted file mode 100644 index 321d2fc..0000000 --- a/server/requests/itemMap.go +++ /dev/null @@ -1,10 +0,0 @@ -package requests - -type ItemMap struct { - Id string `json:"id"` - DataFields []string `json:"dataFields"` -} - -func NewItemMap() *ItemMap { - return new(ItemMap) -} diff --git a/server/server.go b/server/server.go index e451e38..ab85d89 100644 --- a/server/server.go +++ b/server/server.go @@ -1,7 +1,7 @@ package server import ( - "github.com/foomo/ContentServer/server/repo" + "github.com/foomo/contentserver/server/repo" ) // our data diff --git a/server/socket.go b/server/socket.go index 7c9cbe1..344c9d2 100644 --- a/server/socket.go +++ b/server/socket.go @@ -4,10 +4,10 @@ import ( "encoding/json" "errors" "fmt" - "github.com/foomo/ContentServer/server/log" - "github.com/foomo/ContentServer/server/repo" - "github.com/foomo/ContentServer/server/requests" - "github.com/foomo/ContentServer/server/responses" + "github.com/foomo/contentserver/server/log" + "github.com/foomo/contentserver/server/repo" + "github.com/foomo/contentserver/server/requests" + "github.com/foomo/contentserver/server/responses" "net" "strconv" "strings"