From 30f787395d436900b99ff446f2d9f1f8e39cd9e1 Mon Sep 17 00:00:00 2001 From: bullmoose20 Date: Wed, 4 Oct 2023 06:36:36 -0400 Subject: [PATCH 1/4] Update separators.md --- docs/defaults/separators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/defaults/separators.md b/docs/defaults/separators.md index ae2d0279..f9a80527 100644 --- a/docs/defaults/separators.md +++ b/docs/defaults/separators.md @@ -98,7 +98,7 @@ The available styles available are: | Amethyst | `amethyst` | | Aqua | `aqua` | | Blue | `blue` | -| Forest | `green` | +| Forest | `forest` | | Fuchsia | `fuchsia` | | Gold | `gold` | | Gray | `gray` | From 55ffc8411ad133311706423fd40ad05e3f85fa1e Mon Sep 17 00:00:00 2001 From: Chaz Larson Date: Wed, 4 Oct 2023 16:40:43 -0500 Subject: [PATCH 2/4] more words about PLEX_PATH and docker --- docs/home/scripts/image-cleanup.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/home/scripts/image-cleanup.md b/docs/home/scripts/image-cleanup.md index 429290a8..843157f5 100644 --- a/docs/home/scripts/image-cleanup.md +++ b/docs/home/scripts/image-cleanup.md @@ -165,6 +165,23 @@ IMPORTANT: If you are running this in Docker, remember that these settings are b The only required Option is the `Plex Path` Option which is the Plex Config Folder containing the servers Metadata including `Cache`, `Metadata`, and `Plug-in Support`. +IMPORTANT: This path has to be valid in the context where the script is running. If you are running it on the host, it will be a direct path like `/opt/plex/Library/Application\ Support/Plex\ Media\ Server` or `X:\Plex Media Server`. If you are running the script in docker, the script cannot see anything on the host, so you will have to map that path into the the container and then enter the mapped path into the env file. + +For instance, in the example above: +``` +docker run -v "X:\Media\Plex Image Cleanup\config:/config:rw" -v "X:\Plex Media Server:/plex:rw" meisnate12/plex-image-cleanup +``` +The `.env` would contain: +``` +PLEX_PATH=/plex # pointing to mapped path *inside the container* +``` +NOT +``` +PLEX_PATH=X:\Plex Media Server # wrong because the script cannot see *outside the container* +``` + +This is not specific to Plex Image Cleanup; it's standard Docker behavior. + To set the `Plex Path` for the run: * **Environment Variable:** `PLEX_PATH=C:\Plex Media Server` * **Shell Command:** `-p "C:\Plex Media Server"` or `--plex "C:\Plex Media Server"` From 8b72d4d5621aba59a8a994e149b8b8dc6a72bc74 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Fri, 6 Oct 2023 11:33:19 -0400 Subject: [PATCH 3/4] [6] allow file_poster to override url_poster in the defaults --- VERSION | 2 +- defaults/templates.yml | 6 ++++++ requirements.txt | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index bac20614..2b182978 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop5 +1.19.1-develop6 diff --git a/defaults/templates.yml b/defaults/templates.yml index a3cd0485..a51b62d8 100644 --- a/defaults/templates.yml +++ b/defaults/templates.yml @@ -59,6 +59,11 @@ templates: - dynamic: true key.not: other value: <> + url_poster_<>: + conditions: + - file_poster_<>.exists: false + file_poster.exists: false + value: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/<>.jpg default: collection_section: "00" key: <> @@ -96,6 +101,7 @@ templates: - name_format - key_name - translation_key + - url_poster - file_poster - url_background - file_background diff --git a/requirements.txt b/requirements.txt index b79de7bd..28a260c3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ arrapi==1.4.3 -GitPython==3.1.36 +GitPython==3.1.37 lxml==4.9.3 num2words==0.5.12 pathvalidate==3.2.0 pillow==10.0.1 -PlexAPI==4.15.3 +PlexAPI==4.15.4 psutil==5.9.5 python-dotenv==1.0.0 requests==2.31.0 retrying==1.3.4 -ruamel.yaml==0.17.33 +ruamel.yaml==0.17.35 schedule==1.2.1 tmdbapis==1.2.0 \ No newline at end of file From c01df04dcadb01919909ca5db7c8c6606cc18259 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Fri, 6 Oct 2023 11:41:44 -0400 Subject: [PATCH 4/4] [7] fix 404 reason --- VERSION | 2 +- modules/builder.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2b182978..4c453351 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop6 +1.19.1-develop7 diff --git a/modules/builder.py b/modules/builder.py index b8e8435b..67abae7d 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -1121,7 +1121,7 @@ class CollectionBuilder: if self.obj and check_url != self.library.smart_filter(self.obj): self.library.update_smart_collection(self.obj, check_url) logger.info(f"Detail: Smart Collection updated to {check_url}") - self.beginning_count = len(self.library.fetchItems(check_url)) + self.beginning_count = len(self.library.fetchItems(check_url)) if self.obj: self.exists = True if self.sync or self.playlist: