diff --git a/VERSION b/VERSION
index 40add566..c9d00351 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.18.0-develop2
+1.18.0-develop3
diff --git a/docs/home/kb.md b/docs/home/kb.md
index 60315b41..bc827cc8 100644
--- a/docs/home/kb.md
+++ b/docs/home/kb.md
@@ -11,6 +11,7 @@ This sections aims to answer the most commonly asked questions that users have.
[type this into your terminal]
````{tab} OS X/Linux
+
```
cd /Users/mroche/Plex-Meta-Manager
@@ -19,8 +20,11 @@ source pmm-venv/bin/activate
python -m pip install -r requirements.txt
```
+
````
````{tab} Windows:
+
+
```
cd C:\Users\mroche\Plex-Meta-Manager
git pull
@@ -28,12 +32,16 @@ git pull
python -m pip install -r requirements.txt
```
+
````
````{tab} Docker:
+
+
```
docker pull meisnate12/plex-meta-manager
```
+
````
### "How do I switch to the develop branch?"
@@ -41,6 +49,7 @@ docker pull meisnate12/plex-meta-manager
[type this into your terminal]
````{tab} OS X/Linux
+
```
cd /Users/mroche/Plex-Meta-Manager
@@ -50,8 +59,11 @@ source pmm-venv/bin/activate
python -m pip install -r requirements.txt
```
+
````
````{tab} Windows:
+
+
```
cd C:\Users\mroche\Plex-Meta-Manager
git checkout develop
@@ -60,6 +72,7 @@ git pull
python -m pip install -r requirements.txt
```
+
````
### "How do I switch to the nightly branch"
@@ -67,6 +80,7 @@ python -m pip install -r requirements.txt
[type this into your terminal]
````{tab} OS X/Linux
+
```
cd /Users/mroche/Plex-Meta-Manager
@@ -76,8 +90,11 @@ source pmm-venv/bin/activate
python -m pip install -r requirements.txt
```
+
````
````{tab} Windows:
+
+
```
cd C:\Users\mroche\Plex-Meta-Manager
git checkout nightly
@@ -86,6 +103,7 @@ git pull
python -m pip install -r requirements.txt
```
+
````
### "How do I switch back to the master branch?"
@@ -93,6 +111,7 @@ python -m pip install -r requirements.txt
[type this into your terminal]
````{tab} OS X/Linux
+
```
cd /Users/mroche/Plex-Meta-Manager
@@ -102,8 +121,11 @@ source pmm-venv/bin/activate
python -m pip install -r requirements.txt
```
+
````
````{tab} Windows:
+
+
```
cd C:\Users\mroche\Plex-Meta-Manager
git checkout master
@@ -112,6 +134,7 @@ git pull
python -m pip install -r requirements.txt
```
+
````
## Knowledgebase
@@ -135,16 +158,18 @@ In all cases, the first step is to open the [`meta.log`](#locating-log-files) wi
2. When scanning your meta.log file, search for `[CRITICAL]` items first as these will definitely need to be fixed
3. Scan your meta.log file for `[ERROR]` and make a note of the content of the full line to start your search below on how to resolve
-
### Checking Plex Meta Manager Version
Checking the version: You will find that in your [`meta.log`](#locating-log-files) around the 8th-10th line and will look something like this:
+
```
| |
| Version: 1.17.1-develop10 |
|=================================|
```
+
If you are not on the latest version of your branch, you will see Newest Version: X.X.X below this. Ensure you upgrade to the latest version of Plex Meta Manager.
+
```
| |
| Version: 1.17.1-develop10 |
@@ -170,6 +195,7 @@ There are five main event types that you need to be aware of when understanding
This section aims to explain some commonly seen event messages that are produced in the logs.
#### CRITICAL
+
This table details examples of the most commonly-seen `[CRITICAL]` events and what they mean for the user.
| Type | Short Info | Description | Recommendation |
@@ -178,6 +204,8 @@ This table details examples of the most commonly-seen `[CRITICAL]` events and wh
#### ERROR
+This table details examples of the most commonly-seen `[ERROR]` events and what they mean for the user.
+
| Type | Short Info | Description | Recommendation |
|:----------:|:------------------------------------------------------------------|:---------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `[ERROR]` | `Playlist Error: Library: XYZ not defined` | Plex library XYZ is not found | Ensure that your config file has defined the proper library name as found in Plex |
@@ -191,6 +219,7 @@ This table details examples of the most commonly-seen `[CRITICAL]` events and wh
| `[ERROR]` | `Collection Error: trakt_list requires Trakt to be configured` | You are using a builder that has not been configured yet. | Review the meta.log for more information on what went wrong. Refer to the wiki for details on how to set this up (in this case Trakt) |
#### WARNING
+
This table details examples of the most commonly-seen `[WARNING]` events and what they mean for the user.
| Type | Short Info | Description | Recommendation |
diff --git a/modules/overlays.py b/modules/overlays.py
index d7ec00b4..2e9fafdc 100644
--- a/modules/overlays.py
+++ b/modules/overlays.py
@@ -159,18 +159,19 @@ class Overlays:
has_original = os.path.join(self.library.overlay_backup, f"{item.ratingKey}.png")
elif os.path.exists(os.path.join(self.library.overlay_backup, f"{item.ratingKey}.jpg")):
has_original = os.path.join(self.library.overlay_backup, f"{item.ratingKey}.jpg")
- if self.library.reset_overlays is not None or has_original is None:
- if self.library.reset_overlays == "tmdb":
- try:
- new_backup = self.find_poster_url(item)
- except Failed as e:
- logger.error(e)
+ if self.library.reset_overlays == "plex" or (has_original is None and self.library.reset_overlays is None):
+ temp_poster = next((p for p in item.posters() if p.provider == "local"), None)
+ if temp_poster:
+ new_backup = f"{self.library.url}{temp_poster.key}&X-Plex-Token={self.library.token}"
else:
- temp_poster = next((p for p in item.posters() if p.provider == "local"), None)
- if temp_poster:
- new_backup = f"{self.library.url}{temp_poster.key}&X-Plex-Token={self.library.token}"
- if not new_backup:
- logger.error("Overlay Error: Reset Failed")
+ logger.trace("Plex Error: Plex Poster Download Failed")
+ if self.library.reset_overlays == "tmdb" or (has_original is None and new_backup is None and self.library.reset_overlays is None):
+ try:
+ new_backup = self.find_poster_url(item)
+ except Failed as e:
+ logger.trace(e)
+ if not new_backup and self.library.reset_overlays is not None:
+ logger.error("Overlay Error: Reset Failed")
else:
new_backup = item.posterUrl
if new_backup: