summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Dockerfile27
-rw-r--r--management/editor/repeaters.go64
-rw-r--r--system/api/search.go5
-rw-r--r--system/db/content.go71
-rw-r--r--system/db/init.go3
-rw-r--r--system/item/item.go4
-rw-r--r--system/search/search.go (renamed from system/db/search.go)32
7 files changed, 150 insertions, 56 deletions
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..73446aa
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,27 @@
+
+# Base our image on an official, minimal image of our preferred golang
+FROM golang:latest
+
+# Note: The default golang docker image, already has the GOPATH env variable set.
+# GOPATH is located at /go
+ENV GO_SRC $GOPATH/src
+ENV PONZU_GITHUB github.com/ponzu-cms/ponzu
+ENV PONZU_ROOT $GO_SRC/$PONZU_GITHUB
+
+# Consider updating package in the future. For instance ca-certificates etc.
+# RUN apt-get update -qq && apt-get install -y build-essential
+
+# Make the ponzu root directory
+RUN mkdir -p $PONZU_ROOT
+
+# All commands will be run inside of ponzu root
+WORKDIR $PONZU_ROOT
+
+# Copy the ponzu source into ponzu root.
+COPY . .
+
+# the following runs the code inside of the $GO_SRC/$PONZU_GITHUB directory
+RUN go get $PONZU_GITHUB...
+
+# Define the scripts we want run once the container boots
+# CMD [ "" ]
diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
index 250f2d2..bfdd335 100644
--- a/management/editor/repeaters.go
+++ b/management/editor/repeaters.go
@@ -215,8 +215,27 @@ func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []by
clip = preview.find('.img-clip'),
reset = document.createElement('div'),
img = document.createElement('img'),
+ video = document.createElement('video'),
+ unknown = document.createElement('div'),
+ viewLink = document.createElement('a'),
+ viewLinkText = document.createTextNode('Download / View '),
+ iconLaunch = document.createElement('i'),
+ iconLaunchText = document.createTextNode('launch'),
uploadSrc = store.val();
+ video.setAttribute
preview.hide();
+ viewLink.setAttribute('href', '%[3]s');
+ viewLink.setAttribute('target', '_blank');
+ viewLink.appendChild(viewLinkText);
+ viewLink.style.display = 'block';
+ viewLink.style.marginRight = '10px';
+ viewLink.style.textAlign = 'right';
+ iconLaunch.className = 'material-icons tiny';
+ iconLaunch.style.position = 'relative';
+ iconLaunch.style.top = '3px';
+ iconLaunch.appendChild(iconLaunchText);
+ viewLink.appendChild(iconLaunch);
+ preview.append(viewLink);
// when %[2]s input changes (file is selected), remove
// the 'name' and 'value' attrs from the hidden store input.
@@ -226,15 +245,52 @@ func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []by
});
if (uploadSrc.length > 0) {
- $(img).attr('src', store.val());
- clip.append(img);
+ var ext = uploadSrc.substring(uploadSrc.lastIndexOf('.'));
+ ext = ext.toLowerCase();
+ switch (ext) {
+ case '.jpg':
+ case '.jpeg':
+ case '.webp':
+ case '.gif':
+ case '.png':
+ $(img).attr('src', store.val());
+ clip.append(img);
+ break;
+ case '.mp4':
+ case '.webm':
+ $(video)
+ .attr('src', store.val())
+ .attr('type', 'video/'+ext.substring(1))
+ .attr('controls', true)
+ .css('width', '100%%');
+ clip.append(video);
+ break;
+ default:
+ $(img).attr('src', '/admin/static/dashboard/img/ponzu-file.png');
+ $(unknown)
+ .css({
+ position: 'absolute',
+ top: '10px',
+ left: '10px',
+ border: 'solid 1px #ddd',
+ padding: '7px 7px 5px 12px',
+ fontWeight: 'bold',
+ background: '#888',
+ color: '#fff',
+ textTransform: 'uppercase',
+ letterSpacing: '2px'
+ })
+ .text(ext);
+ clip.append(img);
+ clip.append(unknown);
+ clip.css('maxWidth', '200px');
+ }
preview.show();
$(reset).addClass('reset %[2]s btn waves-effect waves-light grey');
$(reset).html('<i class="material-icons tiny">clear<i>');
$(reset).on('click', function(e) {
e.preventDefault();
- var preview = $(this).parent().closest('.preview');
preview.animate({"opacity": 0.1}, 200, function() {
preview.slideUp(250, function() {
resetImage();
@@ -274,7 +330,7 @@ func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []by
return nil
}
- _, err = html.WriteString(fmt.Sprintf(script, nameidx, className))
+ _, err = html.WriteString(fmt.Sprintf(script, nameidx, className, val))
if err != nil {
log.Println("Error writing HTML string to FileRepeater buffer")
return nil
diff --git a/system/api/search.go b/system/api/search.go
index c743d9f..9c7f0ae 100644
--- a/system/api/search.go
+++ b/system/api/search.go
@@ -8,6 +8,7 @@ import (
"github.com/ponzu-cms/ponzu/system/db"
"github.com/ponzu-cms/ponzu/system/item"
+ "github.com/ponzu-cms/ponzu/system/search"
)
func searchContentHandler(res http.ResponseWriter, req *http.Request) {
@@ -42,8 +43,8 @@ func searchContentHandler(res http.ResponseWriter, req *http.Request) {
}
// execute search for query provided, if no index for type send 404
- matches, err := db.SearchType(t, q)
- if err == db.ErrNoSearchIndex {
+ matches, err := search.TypeQuery(t, q)
+ if err == search.ErrNoIndex {
res.WriteHeader(http.StatusNotFound)
return
}
diff --git a/system/db/content.go b/system/db/content.go
index fbdd8dd..b503a60 100644
--- a/system/db/content.go
+++ b/system/db/content.go
@@ -9,9 +9,11 @@ import (
"sort"
"strconv"
"strings"
+ "sync"
"time"
"github.com/ponzu-cms/ponzu/system/item"
+ "github.com/ponzu-cms/ponzu/system/search"
"github.com/boltdb/bolt"
"github.com/gorilla/schema"
@@ -125,9 +127,9 @@ func update(ns, id string, data url.Values, existingContent *[]byte) (int, error
go func() {
// update data in search index
target := fmt.Sprintf("%s:%s", ns, id)
- err = UpdateSearchIndex(target, j)
+ err = search.UpdateIndex(target, j)
if err != nil {
- log.Println("[search] UpdateSearchIndex Error:", err)
+ log.Println("[search] UpdateIndex Error:", err)
}
}()
@@ -253,9 +255,9 @@ func insert(ns string, data url.Values) (int, error) {
go func() {
// add data to seach index
target := fmt.Sprintf("%s:%s", ns, cid)
- err = UpdateSearchIndex(target, j)
+ err = search.UpdateIndex(target, j)
if err != nil {
- log.Println("[search] UpdateSearchIndex Error:", err)
+ log.Println("[search] UpdateIndex Error:", err)
}
}()
@@ -322,9 +324,9 @@ func DeleteContent(target string) error {
// delete indexed data from search index
if !strings.Contains(ns, "__") {
target = fmt.Sprintf("%s:%s", ns, id)
- err = DeleteSearchIndex(target)
+ err = search.DeleteIndex(target)
if err != nil {
- log.Println("[search] DeleteSearchIndex Error:", err)
+ log.Println("[search] DeleteIndex Error:", err)
}
}
}()
@@ -566,41 +568,48 @@ func Query(namespace string, opts QueryOptions) (int, [][]byte) {
var sortContentCalls = make(map[string]time.Time)
var waitDuration = time.Millisecond * 2000
+var sortMutex = &sync.Mutex{}
-func enoughTime(key string, withDelay bool) bool {
+func setLastInvocation(key string) {
+ sortMutex.Lock()
+ sortContentCalls[key] = time.Now()
+ sortMutex.Unlock()
+}
+
+func lastInvocation(key string) (time.Time, bool) {
+ sortMutex.Lock()
last, ok := sortContentCalls[key]
+ sortMutex.Unlock()
+ return last, ok
+}
+
+func enoughTime(key string) bool {
+ last, ok := lastInvocation(key)
if !ok {
// no invocation yet
// track next invocation
- sortContentCalls[key] = time.Now()
+ setLastInvocation(key)
return true
}
- // if our required wait time has not been met, return false
- if !time.Now().After(last.Add(waitDuration)) {
- return false
+ // if our required wait time has been met, return true
+ if time.Now().After(last.Add(waitDuration)) {
+ setLastInvocation(key)
+ return true
}
- // dispatch a delayed envocation in case no additional one follows
- if withDelay {
- go func() {
- select {
- case <-time.After(waitDuration):
- if enoughTime(key, false) {
- // track next invocation
- sortContentCalls[key] = time.Now()
- SortContent(key)
- } else {
- // retrigger
- SortContent(key)
- }
- }
- }()
- }
+ // dispatch a delayed invocation in case no additional one follows
+ go func() {
+ lastInvocationBeforeTimer, _ := lastInvocation(key) // zero value can be handled, no need for ok
+ enoughTimer := time.NewTimer(waitDuration)
+ <-enoughTimer.C
+ lastInvocationAfterTimer, _ := lastInvocation(key)
+ if !lastInvocationAfterTimer.After(lastInvocationBeforeTimer) {
+ SortContent(key)
+ }
+ }()
- // track next invocation
- sortContentCalls[key] = time.Now()
- return true
+ return false
}
// SortContent sorts all content of the type supplied as the namespace by time,
@@ -608,7 +617,7 @@ func enoughTime(key string, withDelay bool) bool {
// Should be called from a goroutine after SetContent is successful
func SortContent(namespace string) {
// wait if running too frequently per namespace
- if !enoughTime(namespace, true) {
+ if !enoughTime(namespace) {
return
}
diff --git a/system/db/init.go b/system/db/init.go
index 4e9c3cf..3fc35f5 100644
--- a/system/db/init.go
+++ b/system/db/init.go
@@ -4,6 +4,7 @@ import (
"log"
"github.com/ponzu-cms/ponzu/system/item"
+ "github.com/ponzu-cms/ponzu/system/search"
"github.com/boltdb/bolt"
"github.com/nilslice/jwt"
@@ -80,7 +81,7 @@ func Init() {
go func() {
for t := range item.Types {
- err := MapSearchIndex(t)
+ err := search.MapIndex(t)
if err != nil {
log.Fatalln(err)
return
diff --git a/system/item/item.go b/system/item/item.go
index 8f392ca..227cd26 100644
--- a/system/item/item.go
+++ b/system/item/item.go
@@ -211,7 +211,7 @@ func (i Item) AfterReject(res http.ResponseWriter, req *http.Request) error {
}
// SearchMapping returns a default implementation of a Bleve IndexMappingImpl
-// partially implements db.Searchable
+// partially implements search.Searchable
func (i Item) SearchMapping() (*mapping.IndexMappingImpl, error) {
mapping := bleve.NewIndexMapping()
mapping.StoreDynamic = false
@@ -220,7 +220,7 @@ func (i Item) SearchMapping() (*mapping.IndexMappingImpl, error) {
}
// IndexContent determines if a type should be indexed for searching
-// partially implements db.Searchable
+// partially implements search.Searchable
func (i Item) IndexContent() bool {
return false
}
diff --git a/system/db/search.go b/system/search/search.go
index b3d5fa1..6d538ed 100644
--- a/system/db/search.go
+++ b/system/search/search.go
@@ -1,4 +1,4 @@
-package db
+package search
import (
"errors"
@@ -19,8 +19,8 @@ var (
// Search tracks all search indices to use throughout system
Search map[string]bleve.Index
- // ErrNoSearchIndex is for failed checks for an index in Search map
- ErrNoSearchIndex = errors.New("No search index found for type provided")
+ // ErrNoIndex is for failed checks for an index in Search map
+ ErrNoIndex = errors.New("No search index found for type provided")
)
// Searchable ...
@@ -33,18 +33,18 @@ func init() {
Search = make(map[string]bleve.Index)
}
-// MapSearchIndex creates the mapping for a type and tracks the index to be used within
+// MapIndex creates the mapping for a type and tracks the index to be used within
// the system for adding/deleting/checking data
-func MapSearchIndex(typeName string) error {
+func MapIndex(typeName string) error {
// type assert for Searchable, get configuration (which can be overridden)
// by Ponzu user if defines own SearchMapping()
it, ok := item.Types[typeName]
if !ok {
- return fmt.Errorf("[search] MapSearchIndex Error: Failed to MapIndex for %s, type doesn't exist", typeName)
+ return fmt.Errorf("[search] MapIndex Error: Failed to MapIndex for %s, type doesn't exist", typeName)
}
s, ok := it().(Searchable)
if !ok {
- return fmt.Errorf("[search] MapSearchIndex Error: Item type %s doesn't implement db.Searchable", typeName)
+ return fmt.Errorf("[search] MapIndex Error: Item type %s doesn't implement search.Searchable", typeName)
}
// skip setting or using index for types that shouldn't be indexed
@@ -93,9 +93,9 @@ func MapSearchIndex(typeName string) error {
return nil
}
-// UpdateSearchIndex sets data into a content type's search index at the given
+// UpdateIndex sets data into a content type's search index at the given
// identifier
-func UpdateSearchIndex(id string, data interface{}) error {
+func UpdateIndex(id string, data interface{}) error {
// check if there is a search index to work with
target := strings.Split(id, ":")
ns := target[0]
@@ -105,7 +105,7 @@ func UpdateSearchIndex(id string, data interface{}) error {
// unmarshal json to struct, error if not registered
it, ok := item.Types[ns]
if !ok {
- return fmt.Errorf("[search] UpdateSearchIndex Error: type '%s' doesn't exist", ns)
+ return fmt.Errorf("[search] UpdateIndex Error: type '%s' doesn't exist", ns)
}
p := it()
@@ -121,9 +121,9 @@ func UpdateSearchIndex(id string, data interface{}) error {
return nil
}
-// DeleteSearchIndex removes data from a content type's search index at the
+// DeleteIndex removes data from a content type's search index at the
// given identifier
-func DeleteSearchIndex(id string) error {
+func DeleteIndex(id string) error {
// check if there is a search index to work with
target := strings.Split(id, ":")
ns := target[0]
@@ -137,13 +137,13 @@ func DeleteSearchIndex(id string) error {
return nil
}
-// SearchType conducts a search and returns a set of Ponzu "targets", Type:ID pairs,
+// TypeQuery conducts a search and returns a set of Ponzu "targets", Type:ID pairs,
// and an error. If there is no search index for the typeName (Type) provided,
-// db.ErrNoSearchIndex will be returned as the error
-func SearchType(typeName, query string) ([]string, error) {
+// db.ErrNoIndex will be returned as the error
+func TypeQuery(typeName, query string) ([]string, error) {
idx, ok := Search[typeName]
if !ok {
- return nil, ErrNoSearchIndex
+ return nil, ErrNoIndex
}
q := bleve.NewQueryStringQuery(query)
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 13:37:53 +0000