Version [5.4.0]

Author: I-am-PUID-0

CHANGELOG.md

@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## Version [5.4.0] - 2024-10-25 🚀
+
+### Fixed 🛠️
+
+- [Issue #14](https://github.com/I-am-PUID-0/DMB/issues/14) Add Riven build process to Dockerfile ✨ 
+- [Issue #65](https://github.com/I-am-PUID-0/DMB/issues/65) Zilean Enabled when ZILEAN_ENABLED=false 🐛
+- [Issue #66](https://github.com/I-am-PUID-0/DMB/issues/66) Dockerfile pulls from Riven Frontend main branch vs. latest release 🐛
+- [Issue #67](https://github.com/I-am-PUID-0/DMB/issues/67) Future releases for Riven Frontend and Backend will require an API Key 🐛
+
+### Added ✨
+
+- Riven Backend: Added the Riven backend build process to the Dockerfile 📦
+- Riven Frontend: Added the server-config.json to the be saved in /config and transferred to the Riven Frontend when using the API key 📦
+- Zilean: Added the Zilean build process to the Dockerfile 📦
+
+### Changed 🔄
+
+- Riven Backend: Settings are now loaded with or without the API key depending on the version of Riven used 🔄
+- Refactor: Refactored the utils and version checks 🔄
+- Utils: Added description to reaped processes 🔄
+- Logging: Added thread lock to rollover 🔄
+
+
+### Notes 📝
+
+- Future releases for Riven Frontend and Backend will require an API Key to be set 🚨
+- With these changes, you can now use the latest development versions of Riven Frontend and Backend 🌙
+- Use the RIVEN_BACKEND_BRANCH=release-please--branches--main and RIVEN_FRONTEND_BRANCH=release-please--branches--main environment variables to test the current development versions of Riven 🌙
+
+
 ## Version [5.3.2] - 2024-10-18 🚀
 
 ### Fixed 🛠️

Dockerfile

@@ -34,7 +34,7 @@ LABEL name="DMB" \
     url="https://github.com/I-am-PUID-0/DMB"
 
 RUN apk add --update --no-cache gcompat libstdc++ libxml2-utils curl tzdata nano ca-certificates wget fuse3 build-base \
-  boost-filesystem boost-thread linux-headers py3-cffi libffi-dev rust cargo openssl openssl-dev pkgconfig git npm \
+  boost-filesystem boost-thread linux-headers py3-cffi libffi-dev rust cargo jq openssl openssl-dev pkgconfig git npm \
   ffmpeg postgresql-dev postgresql-client postgresql dotnet-sdk-8.0 postgresql-contrib postgresql-client postgresql \
   dotnet-sdk-8.0 postgresql-contrib
 
@@ -48,27 +48,79 @@ WORKDIR /
 
 ADD https://raw.githubusercontent.com/debridmediamanager/zurg-testing/main/config.yml /zurg/
 ADD https://raw.githubusercontent.com/debridmediamanager/zurg-testing/main/plex_update.sh /zurg/
-ADD https://github.com/rivenmedia/riven-frontend/archive/refs/heads/main.zip /riven-frontend-main.zip
+
+RUN RELEASE_TAG=$(curl -s https://api.github.com/repos/rivenmedia/riven-frontend/releases/latest | jq -r .tag_name) && \
+  curl -L https://github.com/rivenmedia/riven-frontend/archive/refs/tags/$RELEASE_TAG.zip -o /riven-frontend-latest.zip
 
 RUN \
-  mkdir -p /log /riven /riven/frontend /pgadmin/venv /pgadmin/data && \
-  if [ -f /riven-frontend-main.zip ]; then echo "File exists"; else echo "File does not exist"; fi && \
-  unzip /riven-frontend-main.zip -d /riven && \
-  mv /riven/riven-frontend-main/* /riven/frontend && \
-  rm -rf /riven/riven-frontend-main
+  mkdir -p /log /config /riven /riven/frontend /riven/backend /zilean /pgadmin/venv /pgadmin/data && \
+  if [ -f /riven-frontend-latest.zip ]; then echo "File exists"; else echo "File does not exist"; fi && \
+  unzip /riven-frontend-latest.zip -d /riven && \
+  mv /riven/riven-frontend-*/* /riven/frontend && \
+  rm -rf /riven/riven-frontend-* && \
+  rm -rf /riven-frontend-latest.zip
 
 RUN sed -i '/export default defineConfig({/a\    build: {\n        minify: false\n    },' /riven/frontend/vite.config.ts
-
 RUN sed -i "s#/riven/version.txt#/riven/frontend/version.txt#g" /riven/frontend/src/routes/settings/about/+page.server.ts
 RUN sed -i "s/export const prerender = true;/export const prerender = false;/g" /riven/frontend/src/routes/settings/about/+page.server.ts
 
-
 WORKDIR /riven/frontend
 
 RUN npm install -g pnpm && pnpm install && pnpm run build && pnpm prune --prod
 
 WORKDIR /
 
+RUN RELEASE_TAG=$(curl -s https://api.github.com/repos/rivenmedia/riven/releases/latest | jq -r .tag_name) && \
+  curl -L https://github.com/rivenmedia/riven/archive/refs/tags/$RELEASE_TAG.zip -o /riven-latest.zip
+
+RUN \
+  if [ -f /riven-latest.zip ]; then echo "File exists"; else echo "File does not exist"; fi && \
+  unzip /riven-latest.zip -d /riven && \
+  mv /riven/riven-*/* /riven/backend && \
+  rm -rf /riven/riven-* && \
+  rm -rf /riven-latest.zip
+
+WORKDIR /riven/backend
+
+RUN python3 -m venv /riven/backend/venv && \
+    source /riven/backend/venv/bin/activate && \
+    pip install --upgrade pip && \
+    pip install poetry && \
+    poetry config virtualenvs.create false && \
+    poetry install --no-root --without dev 
+
+WORKDIR /
+
+RUN RELEASE_TAG=$(curl -s https://api.github.com/repos/iPromKnight/zilean/releases/latest | jq -r .tag_name) && \
+  curl -L https://github.com/iPromKnight/zilean/archive/refs/tags/$RELEASE_TAG.zip -o /zilean-latest.zip && \
+  echo $RELEASE_TAG > /zilean/version.txt
+
+
+RUN \
+  if [ -f /zilean-latest.zip ]; then echo "File exists"; else echo "File does not exist"; fi && \
+  unzip /zilean-latest.zip && \
+  mv zilean-*/* /zilean/ && \
+  rm -rf zilean-* /zilean-latest.zip
+
+WORKDIR /zilean
+
+RUN \
+  python3 -m venv /zilean/venv && \
+  source /zilean/venv/bin/activate && \
+  pip install --upgrade pip && \
+  pip install -r /zilean/requirements.txt && \
+  dotnet restore
+
+WORKDIR /zilean/src/Zilean.ApiService
+
+RUN dotnet publish -c Release --no-restore -o /zilean/app/
+
+WORKDIR /zilean/src/Zilean.DmmScraper
+
+RUN dotnet publish -c Release --no-restore -o /zilean/app/
+
+WORKDIR /
+
 COPY . /./
 
 RUN \
@@ -88,6 +140,7 @@ ENV \
   XDG_CONFIG_HOME=/config \
   TERM=xterm 
 
+
 HEALTHCHECK --interval=60s --timeout=10s \
   CMD ["/bin/sh", "-c", "source /venv/bin/activate && python /healthcheck.py"]
 

main.py

@@ -12,52 +12,9 @@
 process_handler = ProcessHandler(logger)
 
 
-def shutdown(signum=None, frame=None, exit_code=0):
-    logger.info("Shutdown signal received. Cleaning up...")
-
-    def stop_process(process_name):
-        try:
-            process_handler.stop_process(process_name)
-        except Exception as e:
-            logger.error(f"Exception occurred while stopping {process_name}: {str(e)}")
-
-    def unmount_all():
-        for mount_point in os.listdir(f"{RCLONEDIR}"):
-            full_path = os.path.join(f"{RCLONEDIR}", mount_point)
-            if os.path.ismount(full_path):
-                logger.info(f"Unmounting {full_path}...")
-                umount = subprocess.run(
-                    ["umount", full_path], capture_output=True, text=True
-                )
-                if umount.returncode == 0:
-                    logger.info(f"Successfully unmounted {full_path}")
-                else:
-                    logger.error(
-                        f"Failed to unmount {full_path}: {umount.stderr.strip()}"
-                    )
-
-    processes = [
-        "riven_frontend",
-        "riven_backend",
-        "Zilean",
-        "PostgreSQL",
-        "Zurg",
-        "rclone",
-        "pgAdmin",
-        "pgAgent",
-    ]
-    for process in processes:
-        stop_process(process)
-
-    unmount_all()
-
-    logger.info("Shutdown complete.")
-    sys.exit(exit_code)
-
-
 def main():
 
-    version = "5.3.2"
+    version = "5.4.0"
 
     ascii_art = f"""
                                                                        
@@ -78,7 +35,6 @@ def main():
 D::::::::::::DDD     M::::::M               M::::::MB::::::::::::::::B  
 DDDDDDDDDDDDD        MMMMMMMM               MMMMMMMMBBBBBBBBBBBBBBBBB   
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-
                               Version: {version}                                    
 """
 
@@ -106,7 +62,7 @@ def healthcheck():
         user_management.create_system_user()
     except Exception as e:
         logger.error(f"An error occurred while creating system user: {e}")
-        shutdown(exit_code=1)
+        process_handler.shutdown(exit_code=1)
 
     try:
         if ZURG is None or str(ZURG).lower() == "false":
@@ -144,10 +100,10 @@ def healthcheck():
                     raise MissingAPIKeyException()
             except Exception as e:
                 logger.error(f"An error occurred in the Zurg setup: {e}")
-                shutdown(exit_code=1)
+                process_handler.shutdown(exit_code=1)
     except Exception as e:
         logger.error(e)
-        shutdown(exit_code=1)
+        process_handler.shutdown(exit_code=1)
 
     try:
         if (RIVENBACKEND is not None and str(RIVENBACKEND).lower() == "true") or (
@@ -157,9 +113,9 @@ def healthcheck():
                 postgres.postgres_setup(process_handler)
             except Exception as e:
                 logger.error(f"An error occurred in the PostgreSQL setup: {e}")
-                shutdown(exit_code=1)
+                process_handler.shutdown(exit_code=1)
             try:
-                if ZILEAN is not None or str(ZILEAN).lower() == "true":
+                if ZILEAN is not None and str(ZILEAN).lower() == "true":
                     try:
                         zilean.setup.zilean_setup(process_handler, "Zilean")
                     except Exception as e:
@@ -176,7 +132,7 @@ def healthcheck():
                         zilean_updater.auto_update("Zilean", False)
             except Exception as e:
                 logger.error(f"An error occurred in the Zilean setup: {e}")
-                shutdown(exit_code=1)
+                process_handler.shutdown(exit_code=1)
             try:
                 try:
                     r.setup.riven_setup(process_handler, "riven_backend")
@@ -190,10 +146,10 @@ def healthcheck():
                     r_updater.auto_update("riven_backend", False)
             except Exception as e:
                 logger.error(f"An error occurred in the Riven backend setup: {e}")
-                shutdown(exit_code=1)
+                process_handler.shutdown(exit_code=1)
     except Exception as e:
         logger.error(e)
-        shutdown(exit_code=1)
+        process_handler.shutdown(exit_code=1)
 
     try:
         if (RIVENFRONTEND is not None and str(RIVENFRONTEND).lower() == "true") or (
@@ -213,7 +169,7 @@ def healthcheck():
                 r_updater.auto_update("riven_frontend", False)
     except Exception as e:
         logger.error(f"An error occurred in the Riven frontend setup: {e}")
-        shutdown(exit_code=1)
+        process_handler.shutdown(exit_code=1)
 
     def perpetual_wait():
         stop_event = threading.Event()
@@ -223,6 +179,4 @@ def perpetual_wait():
 
 
 if __name__ == "__main__":
-    signal.signal(signal.SIGTERM, shutdown)
-    signal.signal(signal.SIGINT, shutdown)
     main()