Merge pull request #6 from linuxserver/rework

Author: thespad

Dockerfile

@@ -24,7 +24,7 @@ RUN \
     libzen-dev \
     python3-dev && \
   apk add  -U --update --no-cache \
-    curl \
+    grep \
     libjpeg \
     libxslt \
     python3 \
@@ -61,3 +61,5 @@ COPY root/ /
 
 # ports and volumes
 VOLUME /config
+
+ENTRYPOINT ["/init-pmm"]

Dockerfile.aarch64

@@ -24,7 +24,7 @@ RUN \
     libzen-dev \
     python3-dev && \
   apk add  -U --update --no-cache \
-    curl \
+    grep \
     libjpeg \
     libxslt \    
     python3 \
@@ -61,3 +61,5 @@ COPY root/ /
 
 # ports and volumes
 VOLUME /config
+
+ENTRYPOINT ["/init-pmm"]

Dockerfile.armhf

@@ -24,7 +24,7 @@ RUN \
     libzen-dev \
     python3-dev && \
   apk add  -U --update --no-cache \
-    curl \
+    grep \
     libjpeg \
     libxslt \    
     python3 \
@@ -61,3 +61,5 @@ COPY root/ /
 
 # ports and volumes
 VOLUME /config
+
+ENTRYPOINT ["/init-pmm"]

README.md

@@ -60,13 +60,13 @@ The architectures supported by this image are:
 
 ## Application Setup
 
-There is a [walkthrough](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Docker-Walkthrough#setting-up-the-initial-config-file) available to help get you up and running.
+There is a [walkthrough](https://metamanager.wiki/en/latest/home/guides/docker.html#setting-up-the-initial-config-file) available to help get you up and running.
 
-This image supports all of the environment variables listed [here](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Run-Commands-&-Environmental-Variables)
+This image supports all of the environment variables listed [here](https://metamanager.wiki/en/latest/home/environmental.html)
 
 To perform a one-time run use `docker run` (or `docker-compose run`) with the `--rm` and `-e PMM_RUN=True` arguments. This will cause the container to process your config immediately instead of waiting for the scheduled time, and delete the old container after completion.
 
-For more information see the [official wiki](https://github.com/meisnate12/Plex-Meta-Manager/wiki).
+For more information see the [official wiki](https://metamanager.wiki).
 
 ## Usage
 
@@ -238,5 +238,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.10.22:** - Support commandline args and relative paths.
 * **03.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.
 * **30.01.22:** - Initial Release.

readme-vars.yml

@@ -48,15 +48,16 @@ optional_block_1: false
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  There is a [walkthrough](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Docker-Walkthrough#setting-up-the-initial-config-file) available to help get you up and running.
+  There is a [walkthrough](https://metamanager.wiki/en/latest/home/guides/docker.html#setting-up-the-initial-config-file) available to help get you up and running.
 
-  This image supports all of the environment variables listed [here](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Run-Commands-&-Environmental-Variables)
+  This image supports all of the environment variables listed [here](https://metamanager.wiki/en/latest/home/environmental.html)
 
   To perform a one-time run use `docker run` (or `docker-compose run`) with the `--rm` and `-e PMM_RUN=True` arguments. This will cause the container to process your config immediately instead of waiting for the scheduled time, and delete the old container after completion.
 
-  For more information see the [official wiki](https://github.com/meisnate12/Plex-Meta-Manager/wiki).
+  For more information see the [official wiki](https://metamanager.wiki).
 
 # changelog
 changelogs:
+  - { date: "25.10.22:", desc: "Support commandline args and relative paths." }
   - { date: "03.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }
   - { date: "30.01.22:", desc: "Initial Release." }

root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run

@@ -1,11 +1,30 @@
 #!/usr/bin/with-contenv bash
 
+IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
+
+cd / || exit 1
+
 # halt startup if no config file is found
-if [ ! -e "${PMM_CONFIG:-/config/config.yml}" ]; then
-    echo "No config file found at ${PMM_CONFIG:-/config/config.yml}, halting init."
-    s6-rc -bad change
+if [[ -n "${PMM_CONFIG}" ]]; then
+    CONFIG_FILE="${PMM_CONFIG}"
+elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then
+    CONFIG_FILE=$(echo "${CLI_OPTIONS[@]}" | grep -Po '([\s]|^)(--config|-c)([\s])\K(.+\/[^\/]+)\.(yml|yaml)')
+else
+    CONFIG_FILE="/config/config.yml"
 fi
 
-cd / || exit 1
+if [[ -n "${CONFIG_FILE}" ]] && [[ ! -e "${CONFIG_FILE}" ]]; then
+    echo "No config file found at ${CONFIG_FILE}, halting init."
+    echo "[ls.io-init] done."
+    s6-rc -bad change
+fi
 
-s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${PMM_CONFIG:-/config/config.yml}" --run
+if { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--run|-r)([\s]|$)'; } && { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; }; then
+    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py "${CLI_OPTIONS[@]}"
+elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--run|-r)([\s]|$)'; then
+    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}"
+elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then
+    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --run "${CLI_OPTIONS[@]}"
+else
+    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --run --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}"
+fi

root/etc/s6-overlay/s6-rc.d/svc-pmm/run

@@ -1,12 +1,33 @@
 #!/usr/bin/with-contenv bash
 
+IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
+
+cd / || exit 1
+
 # halt startup if no config file is found
-if [ ! -e "${PMM_CONFIG:-/config/config.yml}" ]; then
-    echo "No config file found at ${PMM_CONFIG:-/config/config.yml}, halting init."
-    s6-rc -bad change
+if [[ -n "${PMM_CONFIG}" ]]; then
+    CONFIG_FILE="${PMM_CONFIG}"
+elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then
+    CONFIG_FILE=$(echo "${CLI_OPTIONS[@]}" | grep -Po '([\s]|^)(--config|-c)([\s])\K(.+\/[^\/]+)\.(yml|yaml)')
+else
+    CONFIG_FILE="/config/config.yml"
 fi
 
-cd / || exit 1
+if [[ -n "${CONFIG_FILE}" ]] && [[ ! -e "${CONFIG_FILE}" ]]; then
+    echo "No config file found at ${CONFIG_FILE}, halting init."
+    s6-rc -bad change
+fi
 
-exec \
-    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${PMM_CONFIG:-/config/config.yml}" --time "${PMM_TIME:-03:00}"
+if { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--time|-t)([\s])'; } && { echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; }; then
+    exec \
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py "${CLI_OPTIONS[@]}"
+elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--time|-t)([\s])'; then
+    exec \
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" "${CLI_OPTIONS[@]}"
+elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then
+    exec \
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --time "${PMM_TIME:-03:00}" "${CLI_OPTIONS[@]}"
+else
+    exec \
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" --time "${PMM_TIME:-03:00}" "${CLI_OPTIONS[@]}"
+fi

root/init-hook

@@ -1,6 +1,8 @@
 #!/usr/bin/with-contenv bash
 
-if [[ $(tr "[:upper:]" "[:lower:]" <<<"${PMM_RUN}") = "true" ]]; then
+IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
+
+if [[ $(tr "[:upper:]" "[:lower:]" <<<"${PMM_RUN}") = "true" ]] || echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--run|--tests|--run-tests|--run-collections|--run-libraries|--run-metadata-files|--resume|-r|-rm|-rl|-rc|-rt|re)([\s]|$)'; then
     rm -rf /etc/s6-overlay/s6-rc.d/svc-pmm
     rm -rf /etc/s6-overlay/s6-rc.d/user/contents.d/svc-pmm
     rm -rf /etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-pmm-config

root/init-pmm

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "${1:0:1}" = '-' ]; then
+  export CLI_OPTIONS_STRING=$(printf "%s|" "$@")
+  set --
+fi
+exec /init "$@"