diff --git a/_web_server/server/index.html b/_web_server/server/index.html index 7c867a9..bfda875 100644 --- a/_web_server/server/index.html +++ b/_web_server/server/index.html @@ -132,7 +132,6 @@
- Sim: diff --git a/_web_server/server/playground-server.scm b/_web_server/server/playground-server.scm index 4c8c85f..cf40fd4 100755 --- a/_web_server/server/playground-server.scm +++ b/_web_server/server/playground-server.scm @@ -38,7 +38,6 @@ (define URI-IVERILOG "iverilog") (define URI-VERILATOR "verilator") (define URI-SAVE-CODE "save") -(define URI-SAVEAS-CODE "saveas") (define LOG-DBG 3) (define LOG-VERBOSE 2) @@ -776,14 +775,12 @@ (iverilog-path (append root-path `(,URI-IVERILOG))) (verilator-path (append root-path `(,URI-VERILATOR))) (savecode-path (append root-path `(,URI-SAVE-CODE))) - (saveas-path (append root-path `(,URI-SAVEAS-CODE))) (index-html (read-template-text index-file `(("IVERILOGPOSTURI" ,(encode-and-join-uri-path iverilog-path)) ("VERILATORPOSTURI" ,(encode-and-join-uri-path verilator-path)) ("SAVECODEURI" ,(encode-and-join-uri-path savecode-path)) - ("SAVEASURI" ,(encode-and-join-uri-path saveas-path)) ("HELPSTRING", (string-concatenate (insert-between @@ -812,15 +809,6 @@ (uri-path (request-uri request)))) - ;; Snippet dir path relative to stor-base - (ref-stor-dir - (let ((ref (assoc 'referer (request-headers request)))) - (and ref - (let ((p (get-storage-dir (cdr ref) root))) - (and (storage-dir-valid? p) - (storage-path-exists? (path+ stor-base p)) - p))))) - ;; Body of the POST request (code (if request-body @@ -840,10 +828,6 @@ (logger LOG-VERBOSE "Request ~a:~a" (request-method request) path) (logger LOG-VERBOSE "Request query:~a" query) - (logger LOG-DBG " stor:'~a' len:~a/~a" - ref-stor-dir - (request-content-length request) - (string-length code)) (cond ;; @@ -900,10 +884,6 @@ 'verilator))) (logger LOG-DBG "Request ~a simulation" (symbol->string simulator)) - - (when ref-stor-dir - (save-to-storage (path+ stor-base ref-stor-dir) code)) - (let-values (((log vcd) (exec-sim simulator @@ -927,27 +907,21 @@ #:content-type 'text/plain))))) ;; Save snippet - ((or (equal? path savecode-path) - (equal? path saveas-path)) - (let ((saveas (equal? path saveas-path))) - (logger LOG-DBG "Request code saving~a" - (if saveas " as new snippet" "")) - (let ((stor-dir - (if (or saveas - (not ref-stor-dir)) - (basename - (mkdtemp - (path+ - stor-base - (if USE-TIME-IN-SAVE-URL - (format "~a-XXXXXX" (current-time)) - "XXXXXX")))) - ref-stor-dir))) - (save-to-storage (path+ stor-base stor-dir) code) - (make-response - (encode-and-join-uri-path - (append root-path `(,stor-dir))) - #:content-type 'text/plain)))) + ((or (equal? path savecode-path)) + (logger LOG-DBG "Request code saving") + (let ((stor-dir + (basename + (mkdtemp + (path+ + stor-base + (if USE-TIME-IN-SAVE-URL + (format "~a-XXXXXX" (current-time)) + "XXXXXX")))))) + (save-to-storage (path+ stor-base stor-dir) code) + (make-response + (encode-and-join-uri-path + (append root-path `(,stor-dir))) + #:content-type 'text/plain))) ;; Wrong POST request (else