From 44f2b63e4396a4f0737ef2ece76266558ad23bd8 Mon Sep 17 00:00:00 2001
From: ed
Date: Tue, 1 Oct 2024 18:27:42 +0000
Subject: [PATCH] partyfuse: embed fuse.py into sfx
---
.gitignore | 1 +
copyparty/web/svcs.html | 1 +
scripts/deps-docker/Dockerfile | 14 ++++++++++++++
scripts/deps-docker/Makefile | 4 +++-
scripts/make-sfx.sh | 2 +-
scripts/sfx.ls | 1 +
6 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index cb967f45..b7b533b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ copyparty/res/COPYING.txt
copyparty/web/deps/
srv/
scripts/docker/i/
+scripts/deps-docker/uncomment.py
contrib/package/arch/pkg/
contrib/package/arch/src/
diff --git a/copyparty/web/svcs.html b/copyparty/web/svcs.html
index ef8847e9..65038deb 100644
--- a/copyparty/web/svcs.html
+++ b/copyparty/web/svcs.html
@@ -192,6 +192,7 @@
partyfuse
partyfuse.py -- fast, read-only, + needs fuse.py in the same folder, needs winfsp doesn't need root
diff --git a/scripts/deps-docker/Dockerfile b/scripts/deps-docker/Dockerfile index a59c15a5..a66191ee 100644 --- a/scripts/deps-docker/Dockerfile +++ b/scripts/deps-docker/Dockerfile @@ -37,6 +37,7 @@ RUN mkdir -p /z/dist/no-pk \ && wget https://github.com/google/zopfli/archive/zopfli-$ver_zopfli.tar.gz -O zopfli.tgz \ && wget https://github.com/Daninet/hash-wasm/releases/download/v$ver_hashwasm/hash-wasm@$ver_hashwasm.zip -O hash-wasm.zip \ && wget https://github.com/PrismJS/prism/archive/refs/tags/v$ver_prism.tar.gz -O prism.tgz \ + && wget https://files.pythonhosted.org/packages/04/0b/4506cb2e831cea4b0214d3625430e921faaa05a7fb520458c75a2dbd2152/fusepy-3.0.1.tar.gz -O fusepy.tgz \ && (mkdir hash-wasm \ && cd hash-wasm \ && unzip ../hash-wasm.zip) \ @@ -56,6 +57,7 @@ RUN mkdir -p /z/dist/no-pk \ && npm i gulp-cli -g ) \ && tar -xf dompurify.tgz \ && tar -xf prism.tgz \ + && tar -xf fusepy.tgz \ && unzip fontawesome.zip \ && tar -xf zopfli.tgz @@ -158,6 +160,18 @@ RUN cd /z/dist \ && rmdir no-pk +# build fusepy +COPY uncomment.py /z +RUN mv /z/fusepy-3.0.1/fuse.py /z/dist/f1 \ + && cd /z/dist \ + && python3 /z/uncomment.py f1 \ + && sed -ri '/self.__critical_exception = e/d' f1 \ + && awk '/^log =/{s=0} !s; /^from traceback im/{s=1;print"from functools import partial";print"basestring = str"}'