I-am-PUID-0
diff --git a/‎CHANGELOG.md
+36-2 b/‎CHANGELOG.md
+36-2
diff --git a/‎Dockerfile
+1-1 b/‎Dockerfile
+1-1
diff --git a/‎README.md
+42-23 b/‎README.md
+42-23
diff --git a/‎base/__init__.py
+13-2 b/‎base/__init__.py
+13-2
diff --git a/‎cleanup/__init__.py b/‎cleanup/__init__.py
diff --git a/‎healthcheck.py
+3-3 b/‎healthcheck.py
+3-3
@@ -7,6 +7,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## Version [2.0.0] - 2024-25-07
+
+### Breaking Changes
+
+- Riven: Directory structure has changed to allow for split riven instances - backend and frontend - please update your compose file volumes accordingly
+- RIVEN_BRANCH: Is now split into RIVEN_FRONTEND_BRANCH and RIVEN_BACKEND_BRANCH
+- RIVEN_ENABLED: Environment variable will enable the Riven backend and frontend without the need to set the RIVEN_FRONTEND_ENABLED and RIVEN_BACKEND_ENABLED variables
+- RIVEN_UPDATE: Environment variable to update the Riven backend and frontend; Default is false
+
+### Added
+
+- RIVEN_BACKEND_ENABLED: Environment variable to enable the Riven backend; Default is false
+- RIVEN_FRONTEND_ENABLED: Environment variable to enable the Riven frontend; Default is false
+- RIVEN_BACKEND_BRANCH: Environment variable to set the Riven backend branch; Default is main
+- RIVEN_FRONTEND_BRANCH: Environment variable to set the Riven frontend branch; Default is main
+- RIVEN_BACKEND_UPDATE: Environment variable to update the Riven backend; Default is false
+- RIVEN_FRONTEND_UPDATE: Environment variable to update the Riven frontend; Default is false
+- RIVEN_BACKEND_VERSION: Environment variable to set the Riven backend version; Default is latest
+- RIVEN_FRONTEND_VERSION: Environment variable to set the Riven frontend version; Default is latest
+- BACKEND_URL: Environment variable to set the Riven backend URL; Default is http://127.0.0.1:8080
+- RIVEN_DATABASE_HOST: Environment variable to set the Riven database host; Default is sqlite:////riven/backend/data/media.db
+- COLOR_LOG_ENABLED: Environment variable to enable color logging; Default is false
+- ffmpeg: Added ffmpeg to the Dockerfile for Zurg use of ffprobe to extract media information from files, enhancing media metadata accuracy.
+
+
+### Notes
+
+- **Delete all Riven files and directories within the data directory before starting the new version of Riven!**
+- **Automatic updates for Riven backend and frontend are not funtioal yet; will be fixed in a follow-on release.**
+- **Other features may also not be functional yet; will be fixed in a follow-on release.**
+- This release resolves [Issue #19](https://github.com/I-am-PUID-0/DMB/issues/19), [Issue #20](https://github.com/I-am-PUID-0/DMB/issues/20), and [Issue #10](https://github.com/I-am-PUID-0/DMB/issues/10)
+
+
+
 ## Version [1.2.0] - 2024-19-07
 
 ### Added
@@ -53,7 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- [Issue #5](https://github.com/I-am-PUID-0/DMB/issues/5): Added intital sleep time to allow for services to start
+- [Issue #5](https://github.com/I-am-PUID-0/DMB/issues/5): Added initial sleep time to allow for services to start
 - [Issue #6](https://github.com/I-am-PUID-0/DMB/issues/6): Disabled Zurg plex_update.sh - not needed
 - [Issue #7](https://github.com/I-am-PUID-0/DMB/issues/7): Cleanup Riven logging
 
@@ -64,7 +98,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- [Issue #3](https://github.com/I-am-PUID-0/DMB/issues/3): Removed Jellyfin enviornement variables
+- [Issue #3](https://github.com/I-am-PUID-0/DMB/issues/3): Removed Jellyfin environment variables
 - [Issue #2](https://github.com/I-am-PUID-0/DMB/issues/2): Removed PLEX_REFRESH environment variable
 
 
 
@@ -13,7 +13,7 @@ ENV \
   TERM=xterm
 
 RUN \
-  apk add --update --no-cache gcompat libstdc++ libxml2-utils curl tzdata nano ca-certificates wget fuse3 build-base linux-headers py3-cffi libffi-dev rust cargo openssl openssl-dev pkgconfig git npm && \
+  apk add --update --no-cache gcompat libstdc++ libxml2-utils curl tzdata nano ca-certificates wget fuse3 build-base linux-headers py3-cffi libffi-dev rust cargo openssl openssl-dev pkgconfig git npm ffmpeg && \
   mkdir /log && \
   python3 -m venv /venv && \
   source /venv/bin/activate && \
 
@@ -49,8 +49,8 @@ services:
       - /DMB/Zurg/AD:/zurg/AD   
       ## Location for rclone mount to host
       - /DMB/Zurg/mnt:/data:shared  
-      ## Location for Riven data
-      - /DMB/Riven/data:/riven/data
+      ## Location for Riven backend data
+      - /DMB/Riven/data:/riven/backend/data
       ## Location for Riven symlinks
       - /DMB/Riven/mnt:/mnt
     environment:
@@ -80,16 +80,24 @@ services:
      # - RCLONE_VFS_CACHE_MAX_SIZE=100G
      # - RCLONE_BUFFER_SIZE=32M
      # - RCLONE_VFS_CACHE_MAX_AGE=4h
-      ## Riven Required Settings
-      - RIVEN_ENABLED=true
+      ## Riven Backend Required Settings
+      - RIVEN_BACKEND_ENABLED=true
+      ## Riven Frontend Required Settings
+      - RIVEN_FRONTEND_ENABLED=true
       - ORIGIN=http://0.0.0.0:3000 # See Riven documentation for more details
-      - BACKEND_URL=http://127.0.0.1:8080 # Required to be left as is
       ## Riven Optional Settings
+     # - RIVEN_ENABLED=true
+     # - RIVEN_BACKEND_BRANCH=main
+     # - RIVEN_FRONTEND_BRANCH=main
+     # - RIVEN_BACKEND_VERSION=v0.8.4
+     # - RIVEN_FRONTEND_VERSION=v0.2.5
+     # - RIVEN_BACKEND_UPDATE=true
+     # - RIVEN_FRONTEND_UPDATE=true
+     # - RIVEN_LOG_LEVEL=DEBUG
+     # - BACKEND_URL=http://127.0.0.1:8080 # Default is http://127.0.0.1:8080 when not enabled
+     # - RIVEN_DATABASE_HOST=sqlite:////riven/backend/data/media.db # Default is sqlite:////riven/backend/data/media.db when not enabled
      # - PLEX_TOKEN=
      # - PLEX_ADDRESS=
-     # - RIVEN_UPDATE=true 
-     # - RIVEN_BRANCH=main
-     # - RIVEN_LOG_LEVEL=DEBUG
      # - SEERR_API_KEY=
      # - SEERR_ADDRESS=
       ## Special Features
@@ -99,6 +107,7 @@ services:
      # - DMB_LOG_LEVEL=DEBUG  # Master log level for all program logs in DMB
      # - DMB_LOG_COUNT=2
      # - DMB_LOG_SIZE=10M
+     # - COLOR_LOG_ENABLED=true
     # Example to attach to gluetun vpn container if realdebrid blocks IP address 
     # network_mode: container:gluetun  
     ports:
@@ -151,35 +160,45 @@ of this parameter has the format `<VARIABLE_NAME>=<VALUE>`.
 | Variable       | Description                                  | Default | Used w/ rclone| Used w/ Riven| Used w/ zurg|
 |----------------|----------------------------------------------|---------|:-:|:-:|:-:|
 |`TZ`| [TimeZone](http://en.wikipedia.org/wiki/List_of_tz_database_time_zones) used by the container |  |
-|`RD_API_KEY`| [RealDebrid API key](https://real-debrid.com/apitoken) |  | | :heavy_check_mark:| :heavy_check_mark:|
-|`AD_API_KEY`| [AllDebrid API key](https://alldebrid.com/apikeys/) |  | | :heavy_check_mark:| :heavy_check_mark:|
-|`RCLONE_MOUNT_NAME`| A name for the rclone mount |  | :heavy_check_mark:|
+|`RD_API_KEY`| [RealDebrid API key](https://real-debrid.com/apitoken) | `none` | | :heavy_check_mark:| :heavy_check_mark:|
+|`AD_API_KEY`| [AllDebrid API key](https://alldebrid.com/apikeys/) | `none` | | :heavy_check_mark:| :heavy_check_mark:|
+|`RCLONE_MOUNT_NAME`| A name for the rclone mount | `none` | :heavy_check_mark:|
 |`RCLONE_LOG_LEVEL`| [Log level](https://rclone.org/docs/#log-level-level) for rclone | `NOTICE` | :heavy_check_mark:|
-|`RCLONE_LOG_FILE`| [Log file](https://rclone.org/docs/#log-file-file) for rclone |  | :heavy_check_mark: |
+|`RCLONE_LOG_FILE`| [Log file](https://rclone.org/docs/#log-file-file) for rclone |`none`  | :heavy_check_mark: |
 |`RCLONE_DIR_CACHE_TIME`| [How long a directory should be considered up to date and not refreshed from the backend](https://rclone.org/commands/rclone_mount/#vfs-directory-cache) #optional, but recommended is 10s. | `10s` | :heavy_check_mark:|
-|`RCLONE_CACHE_DIR`| [Directory used for caching](https://rclone.org/docs/#cache-dir-dir). |  | :heavy_check_mark:|
-|`RCLONE_VFS_CACHE_MODE`| [Cache mode for VFS](https://rclone.org/commands/rclone_mount/#vfs-file-caching) |  | :heavy_check_mark:|
-|`RCLONE_VFS_CACHE_MAX_SIZE`| [Max size of the VFS cache](https://rclone.org/commands/rclone_mount/#vfs-file-caching) | | :heavy_check_mark:|
-|`RCLONE_VFS_CACHE_MAX_AGE`| [Max age of the VFS cache](https://rclone.org/commands/rclone_mount/#vfs-file-caching) |  | :heavy_check_mark:|
-|`PLEX_TOKEN`| The [Plex Token](https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/) associated with your Plex user |  || :heavy_check_mark:|
-|`PLEX_ADDRESS`| The URL of your Plex server. Example: http://192.168.0.100:32400 or http://plex:32400 - format must include ```http://``` or ```https://``` and have no trailing characters after the port number (32400). E.g., ```/``` ||| :heavy_check_mark:|
-|`RIVEN_ENABLED`| Set the value "true" to enable the Riven process | `false ` | | :heavy_check_mark: | |
-|`RIVEN_BRANCH`| Set the value to the appropriate branch  | `main` | | :heavy_check_mark: | |
+|`RCLONE_CACHE_DIR`| [Directory used for caching](https://rclone.org/docs/#cache-dir-dir). |`none`  | :heavy_check_mark:|
+|`RCLONE_VFS_CACHE_MODE`| [Cache mode for VFS](https://rclone.org/commands/rclone_mount/#vfs-file-caching) |`none`  | :heavy_check_mark:|
+|`RCLONE_VFS_CACHE_MAX_SIZE`| [Max size of the VFS cache](https://rclone.org/commands/rclone_mount/#vfs-file-caching) |`none` | :heavy_check_mark:|
+|`RCLONE_VFS_CACHE_MAX_AGE`| [Max age of the VFS cache](https://rclone.org/commands/rclone_mount/#vfs-file-caching) |`none`  | :heavy_check_mark:|
+|`PLEX_TOKEN`| The [Plex Token](https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/) associated with your Plex user |`none`  || :heavy_check_mark:|
+|`PLEX_ADDRESS`| The URL of your Plex server. Example: http://192.168.0.100:32400 or http://plex:32400 - format must include ```http://``` or ```https://``` and have no trailing characters after the port number (32400). E.g., ```/``` |`none`|| :heavy_check_mark:|
+|`RIVEN_ENABLED`| Set the value "true" to enable the Riven backend and frontend processes | `false ` | | :heavy_check_mark: | |
+|`RIVEN_BACKEND_ENABLED`| Set the value "true" to enable the Riven backend process | `false ` | | :heavy_check_mark: | |
+|`RIVEN_FRONTEND_ENABLED`| Set the value "true" to enable the Riven frontend process | `false ` | | :heavy_check_mark: | |
+|`RIVEN_BACKEND_BRANCH`| Set the value to the appropriate branch  | `main` | | :heavy_check_mark: | |
+|`RIVEN_FRONTEND_BRANCH`| Set the value to the appropriate branch  | `main` | | :heavy_check_mark: | |
+|`RIVEN_BACKEND_VERSION`| The version of Riven backend to use. If enabled, the value should contain v0.8.x format | `latest` | | :heavy_check_mark: | |
+|`RIVEN_FRONTEND_VERSION`| The version of Riven frontend to use. If enabled, the value should contain v0.8.x format | `latest` | | :heavy_check_mark: | |
 |`RIVEN_LOGFILE`| Log file for Riven. The log file will appear in the ```/config``` as ```Riven.log```. If used, the value must be ```true``` or ```false``` | `false` || :heavy_check_mark:| |
-|`RIVEN_UPDATE`| Enable automatic updates of Riven. Adding this variable will enable automatic updates to the latest version of Riven locally within the container.| `false` || :heavy_check_mark:|
+|`RIVEN_BACKEND_UPDATE`| Enable automatic updates of the Riven backend. Adding this variable will enable automatic updates to the latest version of Riven locally within the container.| `false` || :heavy_check_mark:|
+|`RIVEN_FRONTEND_UPDATE`| Enable automatic updates of the Riven frontend. Adding this variable will enable automatic updates to the latest version of Riven locally within the container.| `false` || :heavy_check_mark:|
+|`ORIGIN`| The origin URL for the Riven frontend | http://0.0.0.0:3000 | | :heavy_check_mark: | |
+|`BACKEND_URL`| The URL for the Riven backend | http://127.0.0.1:8080 | | :heavy_check_mark: | |
+|`RIVEN_DATABASE_HOST`| The database host for Riven | `sqlite:////riven/backend/data/media.db` | | :heavy_check_mark: | |
 |`AUTO_UPDATE_INTERVAL`| Interval between automatic update checks in hours. Vaules can be any positive [whole](https://www.oxfordlearnersdictionaries.com/us/definition/english/whole-number) or [decimal](https://www.oxfordreference.com/display/10.1093/oi/authority.20110803095705740;jsessionid=3FDC96CC0D79CCE69702661D025B9E9B#:~:text=The%20separator%20used%20between%20the,number%20expressed%20in%20decimal%20representation.) point based number. Ex. a value of .5 would yield thirty minutes, and 1.5 would yield one and a half hours | `24` || :heavy_check_mark:| :heavy_check_mark:|
 |`DUPLICATE_CLEANUP`| Automated cleanup of duplicate content in Plex.  | `false` |
 |`CLEANUP_INTERVAL`| Interval between duplicate cleanup in hours. Values can be any positive [whole](https://www.oxfordlearnersdictionaries.com/us/definition/english/whole-number) or [decimal](https://www.oxfordreference.com/display/10.1093/oi/authority.20110803095705740;jsessionid=3FDC96CC0D79CCE69702661D025B9E9B#:~:text=The%20separator%20used%20between%20the,number%20expressed%20in%20decimal%20representation.) point based number. Ex. a value of .5 would yield thirty minutes and 1.5 would yield one and a half hours | `24` || :heavy_check_mark: | :heavy_check_mark:|
 |`DMB_LOG_LEVEL`| The level at which logs should be captured. See the python [Logging Levels](https://docs.python.org/3/library/logging.html#logging-levels) documentation for more details  | `INFO` |
 |`DMB_LOG_COUNT`| The number logs to retain. Result will be value + current log  | `2` |
 |`DMB_LOG_SIZE`| The size of the log file before it is rotated. Valid options are 'K' (kilobytes), 'M' (megabytes), and 'G' (gigabytes)  | `10M` |
+|`COLOR_LOG_ENABLED`| Enable color logging for DMB.  | `false` | | | |
 |`ZURG_ENABLED`| Set the value "true" to enable the Zurg process | `false ` | | | :heavy_check_mark:|
 |`GITHUB_TOKEN`| GitHub Personal Token for use with Zurg private repo. Requires Zurg [sponsorship](https://github.com/sponsors/debridmediamanager) | `false ` | | | :heavy_check_mark:|
 |`ZURG_VERSION`| The version of Zurg to use. If enabled, the value should contain v0.9.x or v0.9.x-hotfix.x format | `latest` | | | :heavy_check_mark: |
 |`ZURG_UPDATE`| Enable automatic updates of Zurg. Adding this variable will enable automatic updates to the latest version of Zurg locally within the container. | `false` | | | :heavy_check_mark:|
 |`ZURG_LOG_LEVEL`| Set the log level for Zurg | `INFO` | | | :heavy_check_mark:|
-|`SEERR_API_KEY`| The Overseerr API Key ||| :heavy_check_mark:||
-|`SEERR_ADDRESS`| The URL of your Overseerr server. Example: http://192.168.0.102:5055 or http://Overseerr:5055 - format must include ```http://``` or ```https://``` and have no trailing characters after the port number (5055). E.g., ```/``` || | :heavy_check_mark:|
+|`SEERR_API_KEY`| The Overseerr API Key |`none`|| :heavy_check_mark:||
+|`SEERR_ADDRESS`| The URL of your Overseerr server. Example: http://192.168.0.102:5055 or http://Overseerr:5055 - format must include ```http://``` or ```https://``` and have no trailing characters after the port number (5055). E.g., ```/``` |`none`| | :heavy_check_mark:|
 |`ZURG_USER`| The username to be used for protecting the Zurg endpoints.  | `none `| | | :heavy_check_mark: |
 |`ZURG_PASS`| The password to be used for protecting the Zurg endpoints.  | `none `  | | | :heavy_check_mark: |
 |`ZURG_PORT`| The port to be used for the Zurg server | `random ` | | | :heavy_check_mark: |
 
@@ -22,6 +22,8 @@
 import random
 import zipfile
 import platform
+import fnmatch
+from colorlog import ColoredFormatter
 from ruamel.yaml import YAML
 
 
@@ -42,7 +44,7 @@ def load_secret_or_env(secret_name, default=None):
 ADAPIKEY = load_secret_or_env('ad_api_key')
 ZURGUSER = load_secret_or_env('zurg_user')
 ZURGPASS = load_secret_or_env('zurg_pass')
-GHTOKEN = load_secret_or_env('GITHUB_TOKEN')
+GHTOKEN = load_secret_or_env('github_token')
 SEERRAPIKEY = load_secret_or_env('seerr_api_key')
 SEERRADD = load_secret_or_env('seerr_address')
 DUPECLEAN = os.getenv('DUPLICATE_CLEANUP')
@@ -55,6 +57,15 @@ def load_secret_or_env(secret_name, default=None):
 NFSMOUNT = os.getenv('NFS_ENABLED')
 NFSPORT = os.getenv('NFS_PORT')
 ZURGPORT = os.getenv('ZURG_PORT')
+RIVENBACKEND = os.getenv("RIVEN_BACKEND_ENABLED")
+RIVENFRONTEND = os.getenv("RIVEN_FRONTEND_ENABLED")
 RIVEN = os.getenv("RIVEN_ENABLED")
 RUPDATE = os.getenv('RIVEN_UPDATE')
-RBRANCH = os.getenv('RIVEN_BRANCH')
+BACKENDURL = os.getenv('BACKEND_URL')
+RIVENDATABASEHOST = os.getenv('RIVEN_DATABASE_HOST')
+RBBRANCH = os.getenv('RIVEN_BACKEND_BRANCH')
+RFBRANCH = os.getenv('RIVEN_FRONTEND_BRANCH')
+RBVERSION = os.getenv('RIVEN_BACKEND_VERSION')
+RFVERSION = os.getenv('RIVEN_FRONTEND_VERSION')
+RBUPDATE = os.getenv('RIVEN_BACKEND_UPDATE')
+RFUPDATE = os.getenv('RIVEN_FRONTEND_UPDATE')
@@ -40,12 +40,12 @@ def check_processes(process_info):
         "riven_frontend": {
             "regex": re.compile(r'node build'),
             "error_message": "The Riven frontend process is not running.",
-            "should_run": str(RIVEN).lower() == 'true' and os.path.exists(f'/data/{RCLONEMN}/__all__')
+            "should_run": str(RIVENFRONTEND).lower() == 'true' and os.path.exists(f'/data/{RCLONEMN}/__all__')
         },
         "riven_backend": {
-            "regex": re.compile(r'/venv/bin/python backend/main.py'),
+            "regex": re.compile(r'/venv/bin/python src/main.py'),
             "error_message": "The Riven backend process is not running.",
-            "should_run": str(RIVEN).lower() == 'true' and os.path.exists(f'/data/{RCLONEMN}/__all__')
+            "should_run": str(RIVENBACKEND).lower() == 'true' and os.path.exists(f'/data/{RCLONEMN}/__all__')
         },
         "rclonemn_rd": {
             "regex": re.compile(rf'rclone {mount_type} {re.escape(RCLONEMN_RD)}:'),