From: Clifton Palmer <clifton.james.palmer@protonmail.com>
Date: Tue, 6 Aug 2024 08:18:23 +0000 (-0500)
Subject: Updated to 1.3.0
X-Git-Tag: 1.3.0
X-Git-Url: http://git.purplebirdman.com/public.git/commitdiff_plain/169fadc6aa8d6fb70672235805af45365d80a3be?ds=inline

Updated to 1.3.0

* Handle spaces in pattern names
---

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 6ecf001..d3846c1 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -9,7 +9,7 @@ networks:
         external: true
 services:
     web:
-        image: cjpalmer/public:1.2.3
+        image: cjpalmer/public:1.3.0
         volumes:
         - ${LOCAL_ROOT_DIR}:/storage
         - ${LOCAL_LINK_DIR}:/usr/local/apache2/htdocs
diff --git a/docker-compose.yml b/docker-compose.yml
index ac2dc3d..7310822 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     web:
         build: .
-        image: cjpalmer/public:1.2.3
+        image: cjpalmer/public:1.3.0
         volumes:
         - ${LOCAL_ROOT_DIR}:/storage
         - public_data:/usr/local/apache2/htdocs
diff --git a/lua/publish.lua b/lua/publish.lua
index c0a4ff7..afe2fed 100644
--- a/lua/publish.lua
+++ b/lua/publish.lua
@@ -1,7 +1,7 @@
 require "apache2"
 
 function publish(dir, pattern)
-    local cmd = ("%s/publish.sh %s"):format(dir, pattern)
+    local cmd = ("%s/publish.sh '%s'"):format(dir, pattern)
     local handle = io.popen(cmd)
     local output = handle:read('*a')
     handle:close()
@@ -21,7 +21,7 @@ function handle(r)
     r.content_type = "text/html"
 
     local args = r:parseargs()
-    local pattern = args.pattern 
+    local pattern = string.gsub(args.pattern, '+', ' ')
 
     if pattern then
         local nonce = publish(r.context_document_root, pattern)
diff --git a/lua/publish.sh b/lua/publish.sh
index 3371126..9c2a3a1 100755
--- a/lua/publish.sh
+++ b/lua/publish.sh
@@ -15,7 +15,8 @@ symlink_dir=$PUBLIC_LINK_DIR/$nonce
 find $PUBLIC_ROOT_DIR -type f -name "*$1*" | while read fname
 do
     [[ -d $symlink_dir ]] || mkdir -p $symlink_dir
-    ln -s $fname $symlink_dir/$(echo $fname | sed 's|^.*/||')
+    new_fname=$symlink_dir/$(echo $fname | sed 's|^.*/||')
+    ln -s "$fname" "$new_fname"
 done
 
 # if nonce directory has been created,