simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/22' into develop

Browse source
This commit is contained in:
Simon Brooke 2020-09-02 14:18:39 +01:00
commit c4e7083a2b
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
8 changed files with 107 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -17,7 +17,7 @@ pom.xml.asc
smeagol.log* smeagol.log*
/node_modules/ /node_modules/
.DS_Store .DS_Store
/.calva
resources/public/content/uploads/ resources/public/content/uploads/

2
project.clj
View file

@ -3,7 +3,7 @@
:url "https://github.com/simon-brooke/smeagol" :url "https://github.com/simon-brooke/smeagol"
:license {:name "GNU General Public License,version 2.0 or (at your option) any later version" :license {:name "GNU General Public License,version 2.0 or (at your option) any later version"
:url "https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"} :url "https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"}
:dependencies [[clj-jgit "0.8.10"] :dependencies [[clj-jgit "1.0.0"]
[clj-yaml "0.4.0"] [clj-yaml "0.4.0"]
[clojure.java-time "0.3.2"] [clojure.java-time "0.3.2"]
[com.cemerick/url "0.1.1"] [com.cemerick/url "0.1.1"]

120
resources/public/html-includes/photoswipe-boilerplate.html
View file

@ -1,65 +1,97 @@
<!-- this is the whole of the photoswipe boilerplate as documented <div class="gallery" id="gallery{{index}}">
[here](https://photoswipe.com/documentation/getting-started.html) with the <div class="pswp" id="pswp-{{index}}" tabindex="-1" role="dialog" aria-hidden="true">
outermost div removed; it is supplied by the function
`smeagol.extensions.photoswipe/photoswipe-processor`, q.v. -->
<!-- Background of PhotoSwipe.
It's a separate element as animating opacity is faster than rgba(). -->
<div class="pswp__bg"></div>
<!-- Slides wrapper with overflow:hidden. --> <!-- this is the whole of the photoswipe boilerplate as documented
<div class="pswp__scroll-wrap"> [here](https://photoswipe.com/documentation/getting-started.html) with the
outermost div removed; it is supplied by the function
`smeagol.extensions.photoswipe/photoswipe-processor`, q.v. -->
<!-- Background of PhotoSwipe.
It's a separate element as animating opacity is faster than rgba(). -->
<div class="pswp__bg"></div>
<!-- Container that holds slides. <!-- Slides wrapper with overflow:hidden. -->
PhotoSwipe keeps only 3 of them in the DOM to save memory. <div class="pswp__scroll-wrap">
Don't modify these 3 pswp__item elements, data is added later on. -->
<div class="pswp__container">
<div class="pswp__item"></div>
<div class="pswp__item"></div>
<div class="pswp__item"></div>
</div>
<!-- Default (PhotoSwipeUI_Default) interface on top of sliding area. Can be changed. --> <!-- Container that holds slides.
<div class="pswp__ui pswp__ui--hidden"> PhotoSwipe keeps only 3 of them in the DOM to save memory.
Don't modify these 3 pswp__item elements, data is added later on. -->
<div class="pswp__container">
<div class="pswp__item"></div>
<div class="pswp__item"></div>
<div class="pswp__item"></div>
</div>
<div class="pswp__top-bar"> <!-- Default (PhotoSwipeUI_Default) interface on top of sliding area. Can be changed. -->
<div class="pswp__ui pswp__ui--hidden">
<!-- Controls are self-explanatory. Order can be changed. --> <div class="pswp__top-bar">
<div class="pswp__counter"></div> <!-- Controls are self-explanatory. Order can be changed. -->
<button class="pswp__button pswp__button--close" title="Close (Esc)"></button> <div class="pswp__counter"></div>
<button class="pswp__button pswp__button--share" title="Share"></button> <button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
<button class="pswp__button pswp__button--fs" title="Toggle fullscreen"></button> <button class="pswp__button pswp__button--share" title="Share"></button>
<button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button> <button class="pswp__button pswp__button--fs" title="Toggle fullscreen"></button>
<!-- Preloader demo https://codepen.io/dimsemenov/pen/yyBWoR --> <button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
<!-- element will get class pswp__preloader--active when preloader is running -->
<div class="pswp__preloader"> <!-- Preloader demo https://codepen.io/dimsemenov/pen/yyBWoR -->
<div class="pswp__preloader__icn"> <!-- element will get class pswp__preloader active when preloader is running -->
<div class="pswp__preloader__cut"> <div class="pswp__preloader">
<div class="pswp__preloader__donut"></div> <div class="pswp__preloader__icn">
</div> <div class="pswp__preloader__cut">
<div class="pswp__preloader__donut"></div>
</div>
</div>
</div> </div>
</div> </div>
</div>
<div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap"> <div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
<div class="pswp__share-tooltip"></div> <div class="pswp__share-tooltip"></div>
</div> </div>
<button class="pswp__button pswp__button--arrow--left" title="Previous (arrow left)"> <button class="pswp__button pswp__button--arrow--left" title="Previous (arrow left)">
</button> </button>
<button class="pswp__button pswp__button--arrow--right" title="Next (arrow right)"> <button class="pswp__button pswp__button--arrow--right" title="Next (arrow right)">
</button> </button>
<div class="pswp__caption">
<div class="pswp__caption__center"></div>
</div>
<div class="pswp__caption">
<div class="pswp__caption__center"></div>
</div> </div>
</div> </div>
</div> </div>
<script>
//<![CDATA[
var gallery{{index}} = null;
var spec{{index}} = {{spec}};
var openGallery{{index}} = function() {
if (gallery{{index}}) {
try {
gallery{{index}}.destroy();
}
catch (error) {
console.error(error);
}
}
gallery{{index}} = new PhotoSwipe(document.getElementById("pswp-{{index}}"),
PhotoSwipeUI_Default,
spec{{index}}.slides,
spec{{index}}.options);
gallery{{index}}.init();
};
if (spec{{index}}.openImmediately) {
openGallery{{index}}();
}
//]]>
</script>
<p>
<button id="open-gallery-{{index}}" onclick="openGallery{{index}}()">Open the gallery</button>
</p>
</div>

30
src/smeagol/extensions/photoswipe.clj
View file

@ -9,6 +9,8 @@
[instaparse.core :as insta] [instaparse.core :as insta]
[me.raynes.fs :as fs] [me.raynes.fs :as fs]
[noir.io :as io] [noir.io :as io]
[selmer.parser :refer [render]]
[selmer.util :refer [without-escaping]]
[smeagol.configuration :refer [config]] [smeagol.configuration :refer [config]]
[smeagol.extensions.utils :refer :all] [smeagol.extensions.utils :refer :all]
[smeagol.util :refer [content-dir upload-dir]] [smeagol.util :refer [content-dir upload-dir]]
@ -41,31 +43,11 @@
"Process a specification for a photoswipe gallery, using a JSON "Process a specification for a photoswipe gallery, using a JSON
specification based on that documented on the Photoswipe website." specification based on that documented on the Photoswipe website."
[^String spec ^Integer index] [^String spec ^Integer index]
(str (without-escaping
"<div class='gallery'> (render
<div class=\"pswp\" id=\"pswp-"
index "\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\">\n"
(slurp (slurp
(str (io/resource-path) "html-includes/photoswipe-boilerplate.html")) (str (io/resource-path) "html-includes/photoswipe-boilerplate.html"))
"</div> {:spec spec :index index})))
<p><button id=\"open-gallery-" index "\" onclick=\"gallery" index
".init(); document.getElementById(`open-gallery-" index "`).style.display = 'none';\">Open the gallery</button></p>
<script>
\n//<![CDATA[\n
var pswpElement = document.getElementById('pswp-" index "');
var spec" index " = "
spec
";
var gallery" index
" = new PhotoSwipe( pswpElement, PhotoSwipeUI_Default, spec"
index ".slides, spec" index ".options);
if (spec" index ".openImmediately) {
document.getElementById(`open-gallery-" index "`).style.display = 'none';
gallery" index ".init();
}
\n//]]\n
</script>
</div>"))
(def simple-grammar (def simple-grammar

18
src/smeagol/history.clj
View file

@ -6,11 +6,17 @@
[clj-jgit.querying :as q] [clj-jgit.querying :as q]
[taoensso.timbre :as log]) [taoensso.timbre :as log])
(:import [org.eclipse.jgit.api Git] (:import [org.eclipse.jgit.api Git]
[org.eclipse.jgit.lib Repository ObjectId] [org.eclipse.jgit.lib
[org.eclipse.jgit.revwalk RevCommit RevTree RevWalk] ;; Repository
[org.eclipse.jgit.treewalk TreeWalk AbstractTreeIterator CanonicalTreeParser] ObjectId]
;; [org.eclipse.jgit.revwalk RevCommit RevTree RevWalk]
[org.eclipse.jgit.treewalk TreeWalk
;; AbstractTreeIterator
CanonicalTreeParser]
[org.eclipse.jgit.treewalk.filter PathFilter] [org.eclipse.jgit.treewalk.filter PathFilter]
[org.eclipse.jgit.diff DiffEntry DiffFormatter])) [org.eclipse.jgit.diff
;; DiffEntry
DiffFormatter]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; ;;;;
@ -55,9 +61,9 @@
(git/load-repo git-directory-path) (git/load-repo git-directory-path)
(catch java.io.FileNotFoundException fnf (catch java.io.FileNotFoundException fnf
(log/info "Initialising Git repository at" git-directory-path) (log/info "Initialising Git repository at" git-directory-path)
(git/git-init git-directory-path) (git/git-init :dir git-directory-path)
(let [repo (git/load-repo git-directory-path)] (let [repo (git/load-repo git-directory-path)]
(git/git-add-and-commit repo "Initial commit") (git/git-commit repo "Initial commit")
repo)))) repo))))

5
src/smeagol/repl.clj
View file

@ -45,7 +45,7 @@
(defn start-server (defn start-server
"used for starting the server in development mode from REPL" "used for starting the server in development mode from REPL"
[& [port]] [& [port]]
(let [port (if port (Integer/parseInt port) 3000)] (let [port (if port (Integer/parseInt (str port)) 3000)]
(reset! server (reset! server
(serve (get-handler) (serve (get-handler)
{:port port {:port port
@ -58,3 +58,6 @@
(defn stop-server [] (defn stop-server []
(.stop @server) (.stop @server)
(reset! server nil)) (reset! server nil))
;;(start-server 4444)

2
src/smeagol/routes/wiki.clj
View file

@ -75,7 +75,7 @@
(log/info (format "Saving %s's changes ('%s') to %s in file '%s'" user summary page file-path)) (log/info (format "Saving %s's changes ('%s') to %s in file '%s'" user summary page file-path))
(spit file-path source-text) (spit file-path source-text)
(git/git-add git-repo file-name) (git/git-add git-repo file-name)
(git/git-commit git-repo summary {:name user :email email}) (git/git-commit git-repo summary :name user :email email)
(response/redirect (response/redirect
(str (str
"/wiki?page=" "/wiki?page="

10
src/smeagol/util.clj
View file

@ -79,15 +79,15 @@
(cjio/file local-url-base file-path))] (cjio/file local-url-base file-path))]
(cond (cond
(cs/includes? file-path "..") (cs/includes? file-path "..")
(cs/join " " file-path (cs/join " " [file-path
"Attempts to ascend the file hierarchy are disallowed.") "Attempts to ascend the file hierarchy are disallowed."])
(not (cs/starts-with? path local-url-base)) (not (cs/starts-with? path local-url-base))
(cs/join " " [path "is not servable"]) (cs/join " " [path "is not servable"])
(not (fs/exists? path)) (not (fs/exists? path))
(cs/join " " [path "does not exist"]) (cs/join " " [path "does not exist"])
(not (fs/readable? path)) (not (fs/readable? path))
(cs/join " " [path "is not readable"]))) (cs/join " " [path "is not readable"])))
(catch Exception any (cs/join " " file-path "is not servable because" (.getMessage any))))) (catch Exception any (cs/join " " [file-path "is not servable because" (.getMessage any)]))))
;; (not-servable-reason "/home/simon/workspace/smeagol/resources/public/content/vendor/node_modules/photoswipe/dist/photoswipe.min.js") ;; (not-servable-reason "/home/simon/workspace/smeagol/resources/public/content/vendor/node_modules/photoswipe/dist/photoswipe.min.js")
@ -157,8 +157,10 @@
(defn get-servlet-context-path (defn get-servlet-context-path
"Return the servlet context path, if we're running as a servlet; if
not, return `nil`."
[request] [request]
(if-let [context (:servlet-context request)] (when-let [context (:servlet-context request)]
;; If we're not inside a serlvet environment (for ;; If we're not inside a serlvet environment (for
;; example when using mock requests), then ;; example when using mock requests), then
;; .getContextPath might not exist ;; .getContextPath might not exist