model folders. closes #142

cooper · cooper · commit 447bd0dae289 · 2025-03-03T22:49:51.000-05:00
diff --git a/adminifier/wiki.go b/adminifier/wiki.go
@@ -26,6 +26,7 @@ var wikiFrameHandlers = map[string]func(*wikiRequest){
 	"images":        handleImagesFrame,
 	"images/":       handleImagesFrame,
 	"models":        handleModelsFrame,
+	"models/":       handleModelsFrame,
 	"settings":      handleSettingsFrame,
 	"edit-page":     handleEditPageFrame,
 	"edit-category": handleEditCategoryFrame,
@@ -36,16 +37,18 @@ var wikiFrameHandlers = map[string]func(*wikiRequest){
 }
 
 var wikiFuncHandlers = map[string]func(*wikiRequest){
-	"switch-branch/":     handleSwitchBranch,
-	"create-branch":      handleCreateBranch,
-	"write-page":         handleWritePage,
-	"write-model":        handleWriteModel,
-	"write-config":       handleWriteWikiConfig,
-	"image/":             handleImage,
-	"page-revisions":     handlePageRevisions,
-	"create-page":        handleCreatePage,
-	"create-model":       handleCreateModel,
-	"create-page-folder": handleCreatePageFolder,
+	"switch-branch/":      handleSwitchBranch,
+	"create-branch":       handleCreateBranch,
+	"write-page":          handleWritePage,
+	"write-model":         handleWriteModel,
+	"write-config":        handleWriteWikiConfig,
+	"image/":              handleImage,
+	"page-revisions":      handlePageRevisions,
+	"create-page":         handleCreatePage,
+	"create-model":        handleCreateModel,
+	"create-page-folder":  handleCreatePageFolder,
+	"create-model-folder": handleCreateModelFolder,
+	"create-image-folder": handleCreateImageFolder,
 }
 
 // wikiTemplate members are available to all wiki templates
@@ -325,8 +328,13 @@ func handleImagesFrame(wr *wikiRequest) {
 
 func handleModelsFrame(wr *wikiRequest) {
 	descending, sortFunc := getSortFunc(wr, wiki.SortModified, true)
-	models := wr.wi.ModelsSorted(descending, sortFunc, wiki.SortTitle)
-	handleFileFrames(wr, "models", models)
+	dir := strings.TrimPrefix(strings.TrimPrefix(wr.r.URL.Path, wr.wikiRoot+"frame/models"), "/")
+	models, dirs := wr.wi.ModelsAndDirsSorted(dir, descending, sortFunc, wiki.SortTitle)
+	handleFileFrames(wr, "models", struct {
+		Models []wikifier.ModelInfo `json:"models"`
+		Dirs   []string             `json:"dirs"`
+		Cd     string               `json:"cd"`
+	}{models, dirs, dir})
 }
 
 func handleCategoriesFrame(wr *wikiRequest) {
@@ -718,6 +726,18 @@ func handleCreatePageFolder(wr *wikiRequest) {
 	})
 }
 
+func handleCreateImageFolder(wr *wikiRequest) {
+	handleCreateFolder("image", wr, func(dir, name string) (string, error) {
+		return wr.wi.CreateImageFolder(dir, name)
+	})
+}
+
+func handleCreateModelFolder(wr *wikiRequest) {
+	handleCreateFolder("model", wr, func(dir, name string) (string, error) {
+		return wr.wi.CreateModelFolder(dir, name)
+	})
+}
+
 func handleCreateFolder(typ string, wr *wikiRequest, createFunc func(dir, name string) (string, error)) {
 	if !parsePost(wr.w, wr.r, "name") {
 		return
diff --git a/resources/adminifier/static/script/adminifier.js b/resources/adminifier/static/script/adminifier.js
@@ -536,7 +536,7 @@ function handlePageData (page, data) {
                 return;
             crumbs.reverse().each(function (crumb, i) {
                 var a = new Element('a', {
-                    href: '../'.repeat(i) + crumb,
+                    href: '../'.repeat(i) + crumb + window.location.search,
                     text: crumb
                 });
                 addFrameClickHandler(a);
@@ -549,7 +549,7 @@ function handlePageData (page, data) {
 
             var pageTitle = $$('#page-title span')[0];
             var titleA = new Element('a', {
-                href: '../'.repeat(crumbs.length) + page.replace(/^\/?([^\/]+).*/, '$1') + location.search,
+                href: '../'.repeat(crumbs.length) + page.replace(/^\/?([^\/]+).*/, '$1') + window.location.search,
                 html: pageTitle.innerHTML
             });
             addFrameClickHandler(titleA);
diff --git a/resources/adminifier/static/script/file-list/images.js b/resources/adminifier/static/script/file-list/images.js
@@ -12,7 +12,7 @@ var imageList = new FileList({
     }
 });
 
-var currentDir = a.json.results.cd;
+var currentDir;
 
 function nextDir(dir) {
     if (!currentDir)
@@ -22,6 +22,8 @@ function nextDir(dir) {
 
 if (a.json.results) {
 
+currentDir = a.json.results.cd;
+
 a.json.results.dirs.each(function (dir) {
     var entry = new FileListEntry({ Filename: dir });
     entry.isDir = true;
@@ -49,4 +51,6 @@ a.json.results.images.each(function (imageData) {
 
 imageList.draw($('content'));
 
+// common functions are in ../images.js
+
 })(adminifier, window);
diff --git a/resources/adminifier/static/script/file-list/models.js b/resources/adminifier/static/script/file-list/models.js
@@ -11,8 +11,26 @@ var modelList = new FileList({
     }
 });
 
-if (a.json.results)
-a.json.results.each(function (modelData) {
+var currentDir;
+
+function nextDir(dir) {
+    if (!currentDir)
+        return dir;
+    return currentDir + '/' + dir;
+}
+
+if (a.json.results) {
+
+currentDir = a.json.results.cd;
+
+a.json.results.dirs.each(function (dir) {
+    var entry = new FileListEntry({ Title: dir });
+    entry.isDir = true;
+    entry.link = adminifier.wikiRoot + '/models/' + nextDir(dir) + location.search;
+    modelList.addEntry(entry);
+});
+    
+a.json.results.models.each(function (modelData) {
     var entry = new FileListEntry({
         Title:      modelData.title || modelData.file_ne || modelData.file,
         Author:     modelData.author,
@@ -23,6 +41,8 @@ a.json.results.each(function (modelData) {
     modelList.addEntry(entry);
 });
 
+}
+
 modelList.draw($('content'));
 
 exports.createModel = function () {
@@ -39,4 +59,18 @@ exports.createModel = function () {
     modal.show();
 }
 
+exports.createFolder = function () {
+    var modal = new ModalWindow({
+        icon:           'folder',
+        title:          'New Folder',
+        html:           tmpl('tmpl-create-folder', { mode: 'model' }),
+        padded:         true,
+        id:             'create-folder-window',
+        autoDestroy:    true,
+        onDone:         null,
+        doneText:       'Cancel',
+    });
+    modal.show();
+}
+
 })(adminifier, window);
diff --git a/resources/adminifier/static/script/file-list/pages.js b/resources/adminifier/static/script/file-list/pages.js
@@ -11,7 +11,7 @@ var pageList = new FileList({
     }
 });
 
-var currentDir = a.json.results.cd;
+var currentDir;
 
 function nextDir(dir) {
     if (!currentDir)
@@ -21,6 +21,8 @@ function nextDir(dir) {
 
 if (a.json.results) {
 
+currentDir = a.json.results.cd;
+
 a.json.results.dirs.each(function (dir) {
     var entry = new FileListEntry({ Title: dir });
     entry.isDir = true;
@@ -68,7 +70,7 @@ exports.createFolder = function () {
     var modal = new ModalWindow({
         icon:           'folder',
         title:          'New Folder',
-        html:           tmpl('tmpl-create-folder', {}),
+        html:           tmpl('tmpl-create-folder', { mode: 'page' }),
         padded:         true,
         id:             'create-folder-window',
         autoDestroy:    true,
diff --git a/resources/adminifier/static/script/image-grid.js b/resources/adminifier/static/script/image-grid.js
@@ -4,7 +4,7 @@ var dirContainer = new Element('div', { class: 'image-grid' });
 var imageContainer = new Element('div', { class: 'image-grid' });
 $('content').appendChild(imageContainer);
 
-var currentDir = a.json.results.cd;
+var currentDir;
 
 function nextDir(dir) {
     if (!currentDir)
@@ -14,6 +14,8 @@ function nextDir(dir) {
 
 if (a.json.results && (a.json.results.dirs.length || a.json.results.images.length)) {
 
+currentDir = a.json.results.cd;
+
 a.json.results.dirs.each(function (dir) {
     var div = new Element('div', {
         class: 'image-grid-item',
diff --git a/resources/adminifier/static/script/images.js b/resources/adminifier/static/script/images.js
@@ -0,0 +1,20 @@
+(function (a, exports) {
+
+// this file is common to both the image grid and the image list.
+// see also ./image-grid.js and ./file-list/images.js
+
+exports.createFolder = function () {
+    var modal = new ModalWindow({
+        icon:           'folder',
+        title:          'New Folder',
+        html:           tmpl('tmpl-create-folder', { mode: 'image' }),
+        padded:         true,
+        id:             'create-folder-window',
+        autoDestroy:    true,
+        onDone:         null,
+        doneText:       'Cancel',
+    });
+    modal.show();
+}
+
+})(adminifier, window);
diff --git a/resources/adminifier/template/common-file-list.tpl b/resources/adminifier/template/common-file-list.tpl
@@ -39,3 +39,12 @@
     <i class="fa fa-minus-circle fa-lg" style="color: #FF7070;"></i>
     {%= o.mode %} &quot;{%= o.item %}&quot;
 </template>
+
+<template id="tmpl-create-folder">
+    <form action="{{.Root}}/func/create-{%= o.mode %}-folder" method="post">
+        <label for="name">Folder Name:</label>
+        <input type="text" name="name" />
+        <input type="hidden" name="dir" value="{{.Cd}}" />
+        <input type="submit" value="Create" />
+    </form>
+</template>
diff --git a/resources/adminifier/template/frame-images.tpl b/resources/adminifier/template/frame-images.tpl
@@ -8,8 +8,9 @@
     data-sort="{{.Order}}"
     data-cd="{{.Cd}}"
 
-    data-buttons="upload image-mode filter"
+
     data-button-upload="{'title': 'Upload', 'icon': 'upload', 'href': '{{.Root}}/upload-images'}"
+    data-button-create-folder="{'title': 'New Folder', 'icon': 'folder', 'func': 'createFolder'}"
     data-button-filter="{'title': 'Filter', 'icon': 'filter', 'func': 'displayFilter'}"
 
     data-selection-buttons="move rename delete"
@@ -18,12 +19,14 @@
     data-button-delete="{'title': 'Delete', 'icon': 'trash', 'func': 'deleteSelected', 'hide': true}"
 
 {{if .List}}
+    data-buttons="upload create-folder image-mode filter"
     data-button-image-mode="{'title': 'Grid', 'icon': 'th', 'frameHref': '{{.Root}}/images/{{.Cd}}'}"
-    data-scripts="file-list file-list/images pikaday"
+    data-scripts="file-list file-list/images images pikaday"
     data-styles="file-list pikaday"
 {{else}}
+    data-buttons="upload create-folder image-mode"
     data-button-image-mode="{'title': 'List', 'icon': 'list', 'frameHref': '{{.Root}}/images/{{.Cd}}?mode=list'}"
-    data-scripts="image-grid pikaday"
+    data-scripts="image-grid images pikaday"
     data-styles="image-grid pikaday"
 {{end}}
 />
diff --git a/resources/adminifier/template/frame-models.tpl b/resources/adminifier/template/frame-models.tpl
@@ -5,14 +5,15 @@
     data-title="Models"
     data-icon="cube"
     data-scripts="file-list file-list/models pikaday"
-
     data-styles="file-list pikaday"
     data-flags="no-margin search buttons"
     data-search="fileSearch"
     data-sort="{{.Order}}"
+    data-cd="{{.Cd}}"
 
-    data-buttons="create filter"
+    data-buttons="create create-folder filter"
     data-button-create="{'title': 'New Model', 'icon': 'plus-circle', 'func': 'createModel'}"
+    data-button-create-folder="{'title': 'New Folder', 'icon': 'folder', 'func': 'createFolder'}"
     data-button-filter="{'title': 'Filter', 'icon': 'filter', 'func': 'displayFilter'}"
 
     data-selection-buttons="move rename delete"
diff --git a/resources/adminifier/template/frame-pages.tpl b/resources/adminifier/template/frame-pages.tpl
@@ -32,12 +32,3 @@
         <input type="submit" value="Create" />
     </form>
 </template>
-
-<template id="tmpl-create-folder">
-    <form action="{{.Root}}/func/create-page-folder" method="post">
-        <label for="name">Folder Name:</label>
-        <input type="text" name="name" />
-        <input type="hidden" name="dir" value="{{.Cd}}" />
-        <input type="submit" value="Create" />
-    </form>
-</template>
diff --git a/wiki/file.go b/wiki/file.go
@@ -173,6 +173,11 @@ func (w *Wiki) allModelFiles() []string {
 	return files
 }
 
+func (w *Wiki) modelFilesInDir(where string) []string {
+	files, _ := wikifier.UniqueFilesInDir(filepath.Join(w.Opt.Dir.Model, where), []string{"model"}, true)
+	return files
+}
+
 func (w *Wiki) allImageFiles() []string {
 	files, _ := wikifier.UniqueFilesInDir(w.Opt.Dir.Image, imageExtensions, false)
 	return files
diff --git a/wiki/folder.go b/wiki/folder.go
@@ -0,0 +1,29 @@
+package wiki
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/cooper/quiki/wikifier"
+)
+
+// CreatePageFolder creates a new page folder.
+func (w *Wiki) CreatePageFolder(where, name string) (string, error) {
+	return w.createFolder(w.Opt.Dir.Page, where, name)
+}
+
+// CreateModelFolder creates a new model folder.
+func (w *Wiki) CreateModelFolder(where, name string) (string, error) {
+	return w.createFolder(w.Opt.Dir.Model, where, name)
+}
+
+// CreateImageFolder creates a new image folder.
+func (w *Wiki) CreateImageFolder(where, name string) (string, error) {
+	return w.createFolder(w.Opt.Dir.Image, where, name)
+}
+
+func (w *Wiki) createFolder(base, where, name string) (string, error) {
+	name = wikifier.PageNameLink(strings.Replace(name, "/", "_", -1))
+	return name, os.MkdirAll(filepath.Join(base, where, name), 0755)
+}
diff --git a/wiki/model.go b/wiki/model.go
diff --git a/wiki/revision.go b/wiki/revision.go
