Skip to content

Commit

Permalink
initial working draft for priorized meta tag filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
@yneuma
yneuma committed Oct 16, 2016
1 parent 667b56b commit 92a7da1
Show file tree
Hide file tree
Showing 4 changed files with 407 additions and 137 deletions.
10 changes: 2 additions & 8 deletions composition/composition_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,9 @@ func (agg *CompositionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
// fetch all contents
results := fetcher.WaitForResults()


priorityExists := hasPrioritySetting(results)
if (priorityExists) {
//check if priority order is defined and sort results
if (hasPrioritySetting(results)) {
sort.Sort(FetchResults(results))
//TODO hier oder anders wo
// für alle fragmente in aufsteigender prioritätsreihenfolge:
// extrahiere alle meta-tags (inkl. entfernen) und schreibe sie in eine map
// fragmente mit höherer Priorität können werte mit gleichem key überschreiben.
// schreibe die meta-tags in den head des letzten fragments
}

mergeContext := agg.contentMergerFactory(fetcher.MetaJSON())
Expand Down
233 changes: 126 additions & 107 deletions composition/content_merge.go
View file
Original file line number Diff line number Diff line change
@@ -1,155 +1,174 @@
package composition

import (
"bytes"
"errors"
"io"
"strings"
// "fmt"
"bytes"
"errors"
"io"
"strings"
)

const (
DefaultBufferSize = 1024 * 100
DefaultBufferSize = 1024 * 100
)

// ContentMerge is a helper type for creation of a combined html document
// out of multiple Content pages.
type ContentMerge struct {
MetaJSON map[string]interface{}
Head []Fragment
BodyAttrs []Fragment
Body map[string]Fragment
Tail []Fragment
Buffered bool
FdHashes []string
MetaJSON map[string]interface{}
Head []Fragment
BodyAttrs []Fragment
Body map[string]Fragment
Tail []Fragment
Buffered bool
FdHashes []string
priority bool
}

// NewContentMerge creates a new buffered ContentMerge
func NewContentMerge(metaJSON map[string]interface{}) *ContentMerge {
cntx := &ContentMerge{
MetaJSON: metaJSON,
Head: make([]Fragment, 0, 0),
BodyAttrs: make([]Fragment, 0, 0),
Body: make(map[string]Fragment),
Tail: make([]Fragment, 0, 0),
Buffered: true,
FdHashes: make([]string, 0, 0),
}
return cntx
cntx := &ContentMerge{
MetaJSON: metaJSON,
Head: make([]Fragment, 0, 0),
BodyAttrs: make([]Fragment, 0, 0),
Body: make(map[string]Fragment),
Tail: make([]Fragment, 0, 0),
Buffered: true,
FdHashes: make([]string, 0, 0),
priority: false,
}
return cntx
}

func (cntx *ContentMerge) GetHtml() ([]byte, error) {
w := bytes.NewBuffer(make([]byte, 0, DefaultBufferSize))

var executeFragment func(fragmentName string) error
executeFragment = func(fragmentName string) error {
f, exist := cntx.Body[fragmentName]
if !exist {
missingFragmentString := generateMissingFragmentString(cntx.Body, fragmentName)
return errors.New(missingFragmentString)
}
return f.Execute(w, cntx.MetaJSON, executeFragment)
}

io.WriteString(w, "<!DOCTYPE html>\n<html>\n <head>\n ")

for _, f := range cntx.Head {
if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}
io.WriteString(w, "\n </head>\n <body")

for _, f := range cntx.BodyAttrs {
io.WriteString(w, " ")

if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}

io.WriteString(w, ">\n ")

if err := executeFragment(""); err != nil {
return nil, err
}

for _, f := range cntx.Tail {
if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}

io.WriteString(w, "\n </body>\n</html>\n")

return w.Bytes(), nil
if (cntx.priority) {
cntx.processMetaPriorityParsing()
}
w := bytes.NewBuffer(make([]byte, 0, DefaultBufferSize))

var executeFragment func(fragmentName string) error
executeFragment = func(fragmentName string) error {
f, exist := cntx.Body[fragmentName]
if !exist {
missingFragmentString := generateMissingFragmentString(cntx.Body, fragmentName)
return errors.New(missingFragmentString)
}
return f.Execute(w, cntx.MetaJSON, executeFragment)
}

io.WriteString(w, "<!DOCTYPE html>\n<html>\n <head>\n ")

for _, f := range cntx.Head {
if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}
io.WriteString(w, "\n </head>\n <body")

for _, f := range cntx.BodyAttrs {
io.WriteString(w, " ")

if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}

io.WriteString(w, ">\n ")

if err := executeFragment(""); err != nil {
return nil, err
}

for _, f := range cntx.Tail {
if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}

io.WriteString(w, "\n </body>\n</html>\n")

return w.Bytes(), nil
}

func (cntx *ContentMerge) AddContent(fetchResult *FetchResult) {
cntx.addHead(fetchResult.Content.Head())
cntx.addBodyAttributes(fetchResult.Content.BodyAttributes())
cntx.addBody(fetchResult.Def.URL, fetchResult.Content.Body())
cntx.addTail(fetchResult.Content.Tail())
cntx.addFdHash(fetchResult.Hash)
cntx.addHead(fetchResult.Content.Head())
cntx.addBodyAttributes(fetchResult.Content.BodyAttributes())
cntx.addBody(fetchResult.Def.URL, fetchResult.Content.Body())
cntx.addTail(fetchResult.Content.Tail())
cntx.addFdHash(fetchResult.Hash)
if(fetchResult.Def.Priority > 0) {
cntx.priority = true
}
}

func (cntx *ContentMerge) GetHashes() []string {
return cntx.FdHashes
return cntx.FdHashes
}

func (cntx *ContentMerge) addHead(f Fragment) {
if f != nil {
cntx.Head = append(cntx.Head, f)
}
if f != nil {
cntx.Head = append(cntx.Head, f)
}
}

func (cntx *ContentMerge) addBodyAttributes(f Fragment) {
if f != nil {
cntx.BodyAttrs = append(cntx.BodyAttrs, f)
}
if f != nil {
cntx.BodyAttrs = append(cntx.BodyAttrs, f)
}
}

func (cntx *ContentMerge) addBody(url string, bodyFragmentMap map[string]Fragment) {
for name, f := range bodyFragmentMap {
// add twice: local and full qualified name
cntx.Body[name] = f
cntx.Body[urlToFragmentName(url+"#"+name)] = f
}
for name, f := range bodyFragmentMap {
// add twice: local and full qualified name
cntx.Body[name] = f
cntx.Body[urlToFragmentName(url + "#" + name)] = f
}
}

func (cntx *ContentMerge) addTail(f Fragment) {
if f != nil {
cntx.Tail = append(cntx.Tail, f)
}
if f != nil {
cntx.Tail = append(cntx.Tail, f)
}
}

func (cntx *ContentMerge) addFdHash(hash string) {
if hash != "" {
cntx.FdHashes = append(cntx.FdHashes, hash)
}
if hash != "" {
cntx.FdHashes = append(cntx.FdHashes, hash)
}
}

// Returns a name from a url, which has template placeholders eliminated
func urlToFragmentName(url string) string {
url = strings.Replace(url, `§[`, `\§\[`, -1)
url = strings.Replace(url, `]§`, `\]\§`, -1)
return url
url = strings.Replace(url, `§[`, `\§\[`, -1)
url = strings.Replace(url, `]§`, `\]\§`, -1)
return url
}

// Generates String for the missing Fragment error message. It adds all existing fragments from the body
func generateMissingFragmentString(body map[string]Fragment, fragmentName string) string {
text := "Fragment does not exist: " + fragmentName + ". Existing fragments: "
index := 0
for k, _ := range body {

if k != "" {
if index == 0 {
text += k
} else {
text += ", " + k
}
index++
}
}
return text
text := "Fragment does not exist: " + fragmentName + ". Existing fragments: "
index := 0
for k, _ := range body {

if k != "" {
if index == 0 {
text += k
} else {
text += ", " + k
}
index++
}
}
return text
}

func (cntx *ContentMerge) processMetaPriorityParsing() {
headPropertyMap := make(map[string]string)
for i := len(cntx.Head) - 1; i >= 0; i-- {
var currentHead interface{} = cntx.Head[i];
if (currentHead != nil) {
currentStringFragment := currentHead.(StringFragment)
ParseHeadFragment(&currentStringFragment, headPropertyMap)
cntx.Head[i] = currentStringFragment
}
}
}
Loading

0 comments on commit 92a7da1

Please sign in to comment.