Merge pull request #30 from TopixIM/refine-filekey

refine file key for better download experience

.github/workflows/upload.yaml

@@ -19,15 +19,15 @@ jobs:
 
     - uses: supplypike/setup-bin@v3
       with:
-        uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.3/cr'
+        uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/cr'
         name: 'cr'
-        version: '0.8.3'
+        version: '0.8.9'
 
     - uses: supplypike/setup-bin@v3
       with:
-        uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.3/caps'
+        uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/caps'
         name: 'caps'
-        version: '0.8.3'
+        version: '0.8.9'
 
     - run: caps --ci && cr --entry server --emit-ir -1
 

compact.cirru

@@ -59,7 +59,7 @@
               read-from-clipboard!
         |mount-target $ %{} :CodeEntry (:doc |)
           :code $ quote
-            def mount-target $ .querySelector js/document |.app
+            def mount-target $ js/document.querySelector |.app
         |on-server-data $ %{} :CodeEntry (:doc |)
           :code $ quote
             defn on-server-data (data)
@@ -687,6 +687,14 @@
                       <> $ str "\"uploading: "
                         .round $ * 100 up
                         , "\"%"
+        |decorate-name $ %{} :CodeEntry (:doc "|`paste` event uses default name `image.png` as the file name, need to overwrite that.\n\nalso spaces in filekey causes problems of inline CSS, need to replace that.")
+          :code $ quote
+            defn decorate-name (img-name)
+              if (= "\"image.png" img-name)
+                str "\"pasted-"
+                  .!toISOString $ new js/Date
+                  , "\".png"
+                .replace img-name "\" " "\"-"
         |style-hidden-input $ %{} :CodeEntry (:doc |)
           :code $ quote
             defstyle style-hidden-input $ {}
@@ -697,7 +705,7 @@
               let
                   hash $ js-await (load-md5 file)
                   file-key $ str hash "\"/"
-                    either (.-name file) "\"clipboard.jpg"
+                    decorate-name $ either (.-name file) "\"clipboard.jpg"
                   res $ js-await
                     .!post axios "\"https://cp.topix.im/token"
                       format-cirru-edn $ {}

package.json

@@ -15,7 +15,7 @@
   "author": "jiyinyiyong",
   "license": "MIT",
   "dependencies": {
-    "@calcit/procs": "^0.8.3",
+    "@calcit/procs": "^0.8.9",
     "axios": "^1.5.1",
     "mime": "^3.0.0",
     "shortid": "^2.2.16"
@@ -26,6 +26,6 @@
     "feather-icons": "^4.29.1",
     "spark-md5": "^3.0.2",
     "url-parse": "^1.5.10",
-    "vite": "^4.4.9"
+    "vite": "^4.5.0"
   }
 }