new hoster and download location fix

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2020-11-01
+- Hoster changed
+- Fixed download folder location (hopefully permanently)
+
 ## 2020-09-10
 - added support for deezloader ui by environment variable "DEEZUI"
 

Dockerfile

@@ -18,6 +18,7 @@ RUN \
     python3-dev \
     git \
     curl \
+    jq \
     make && \
  echo "**** install packages ****" && \
  apk add --no-cache \
@@ -25,10 +26,10 @@ RUN \
     python3 && \
  echo "**** setup directories ****" && \
  mkdir /deem && \
+ mkdir /downloads && \
  chown abc:abc /deem && \
  rm -R /config && \
  ln -sf /deem/.config/deemix /config && \
- ln -sf /downloads /deem/deemix\ Music && \
  echo "**** clean up ****" && \
  rm -rf \
 	/root/.cache \

Dockerfile.arm32v7

@@ -28,6 +28,7 @@ RUN \
     python3-dev \
     git \
     curl \
+    jq \
     make && \
  echo "**** install packages ****" && \
  apk add --no-cache \
@@ -35,10 +36,10 @@ RUN \
     python3 && \
  echo "**** setup directories ****" && \
  mkdir /deem && \
+ mkdir /downloads && \
  chown abc:abc /deem && \
  rm -R /config && \
  ln -sf /deem/.config/deemix /config && \
- ln -sf /downloads /deem/deemix\ Music && \
  echo "**** clean up ****" && \
  rm -rf \
 	/root/.cache \

Dockerfile.arm64v8

@@ -29,6 +29,7 @@ RUN \
     python3-dev \
     git \
     curl \
+    jq \
     make && \
  echo "**** install packages ****" && \
  apk add --no-cache \
@@ -36,10 +37,10 @@ RUN \
     python3 && \
  echo "**** setup directories ****" && \
  mkdir /deem && \
+ mkdir /downloads && \
  chown abc:abc /deem && \
  rm -R /config && \
  ln -sf /deem/.config/deemix /config && \
- ln -sf /downloads /deem/deemix\ Music && \
  echo "**** clean up ****" && \
  rm -rf \
 	/root/.cache \

README.md

@@ -94,8 +94,6 @@ I am in no way affiliated with the Deemix project (or any other Deezloader-like
 
 Gitlab link for this container: https://gitlab.com/Bockiii/deemix-docker
 
-Repo for Deemix: https://codeberg.org/RemixDev/deemix
-
 Issue Tracker for this Docker: https://gitlab.com/Bockiii/deemix-docker/-/issues
 
 

root/etc/cont-init.d/20-download

@@ -1,25 +1,24 @@
 #!/usr/bin/with-contenv bash
 
 # download and unpack
-
 echo "[cont-init.d] Downloading and unpacking"
 
 if [ ! -f "/deemix/server.py" ]; then
     echo "[cont-init.d] First start, cloning repo"
     if [[ "${DEEZUI}" == "true" ]]; then
         echo "[cont-init.d] Using Deezloader UI"
-        git clone https://codeberg.org/RemixDev/deemix-pyweb.git /deemix
-        git clone https://codeberg.org/RemixDev/deezloader-deemix.git /deemix/webui
+        git clone https://git.fuwafuwa.moe/RemixDev/deemix-pyweb.git /deemix
+        git clone https://git.fuwafuwa.moe/RemixDev/deezloader-deemix.git /deemix/webui
         touch /deemix/updated
     else
         echo "[cont-init.d] Using Deemix UI"
-        git clone --recurse-submodules https://codeberg.org/RemixDev/deemix-pyweb.git /deemix
+        git clone --recurse-submodules https://git.fuwafuwa.moe/RemixDev/deemix-pyweb.git /deemix
         touch /deemix/updated
     fi
 else
     cd /deemix
     localv=$(git rev-parse HEAD)
-    remotev=$(git ls-remote https://codeberg.org/RemixDev/deemix-pyweb.git refs/heads/main | cut -c1-40)
+    remotev=$(git ls-remote https://git.fuwafuwa.moe/RemixDev/deemix-pyweb.git refs/heads/main | cut -c1-40)
     if [ $localv = $remotev ]; then
         echo -e "[cont-init.d] Latest Version. No update needed"
     else

root/etc/cont-init.d/40-install

@@ -21,4 +21,7 @@ if [ ${#ARL} -gt 10 ]; then
         echo "[cont-init.d] !!! Please update your ARL in the variable instead of the webinterface or remove the ARL from the container call. !!!"
         printf $ARL > /config/.arl
     fi
-fi
+fi
+
+# Fix misconfigured download locations. The container's download map is always /downloads.
+jq '.downloadLocation = "/downloads"' /config/config.json > tmp.$$.json && mv tmp.$$.json /config/config.json