Merge pull request #25 from burkasaurusrex/master

Docker initial commit

Author: mza921

.dockerignore

@@ -0,0 +1,7 @@
+**/dist
+**/build
+*.spec
+**/__pycache__
+/.vscode
+README.md
+.gitignore

.gitignore

@@ -1,10 +1,6 @@
-/config.yml
-/dist/config.yml
-/venv/
-/.gitignore
-/.idea
-/build
-/plex_auto_collections.spec
-/__pycache__/
-/config-*
+config.yml
+**/dist
+**/build
+*.spec
+**/__pycache__
 /.vscode

Dockerfile

@@ -0,0 +1,24 @@
+FROM python:3.7-slim
+MAINTAINER burkasaurusrex
+VOLUME /config
+COPY /app/. /app
+COPY /config/. /config
+RUN \
+	echo "**** install system packages ****" && \
+		apt-get update && \
+		apt-get upgrade -y && \
+		apt-get install -y tzdata && \
+	echo "**** install python packages ****" && \
+		pip3 install --upgrade --requirement /app/requirements.txt && \
+	echo "**** install Plex-Auto-Collections ****" && \
+		chmod +x /app/plex_auto_collections.py && \
+	echo "**** cleanup ****" && \
+		apt-get autoremove -y && \
+		apt-get clean && \
+		rm -rf \
+			/app/requirements.txt \
+			/tmp/* \
+			/var/tmp/* \
+			/var/lib/apt/lists/*
+WORKDIR /app
+ENTRYPOINT ["python3", "plex_auto_collections.py", "--config_path", "/config/config.yml", "--update"]

README.md

@@ -1,12 +1,6 @@
 # Plex Auto Collections
 ![https://i.imgur.com/iHAYFIZ.png](https://i.imgur.com/iHAYFIZ.png)
-Plex Auto Collections is a Python 3 script/[standalone builds](https://github.com/vladimir-tutin/Plex-Auto-Collections/tree/master/dist) that 
-works off a configuration file to create/update Plex collection. Collection management with this tool can be automated 
-in a varying degree of customizability. Supports IMDB, TMDb, and Trakt lists as well as built in Plex 
-filters such as actors, genres, year, studio and more. For more filters refer to the 
-[plexapi.video.Movie](https://python-plexapi.readthedocs.io/en/latest/modules/video.html#plexapi.video.Movie) 
-documentation. Not everything has been tested, so results may vary based off the filter. A TMDb api key is required to 
-scan TMDb URLs.
+Plex Auto Collections is a Python 3 script that works off a configuration file to create/update Plex collection. Collection management with this tool can be automated in a varying degree of customizability. Supports IMDB, TMDb, and Trakt lists as well as built in Plex filters such as actors, genres, year, studio and more. For more filters refer to the [plexapi.video.Movie](https://python-plexapi.readthedocs.io/en/latest/modules/video.html#plexapi.video.Movie) documentation. Not everything has been tested, so results may vary based off the filter. A TMDb api key is required to scan TMDb URLs.
 
 When parsing IMDB or TMBd lists the script will create a list of movies that are missing from Plex. If an TMDb and 
 Radarr api-key are supplied then the option will be presented to pass the list of movies along to Radarr. Trakt lists will be matched against items in both a Movie and a TV library, each.
@@ -115,7 +109,17 @@ collections:
     details:
       summary: A collection of Pixar movies
   1990s:
-    year: [1990,1991,1992,1993,1994,1995,1996,1997,1998,1999]
+    year:
+      - 1990
+      - 1991
+      - 1992
+      - 1993
+      - 1994
+      - 1995
+      - 1996
+      - 1997
+      - 1998
+      - 1999
     details:
       summary: A collection of 1990s movies
 plex:
@@ -145,38 +149,19 @@ trakt:
     scope:
     created_at:
 image-server:
-  host: 192.168.1.41
+  host: 192.168.1.1
   port: 5000
+  poster-directory: /config/posters
 ```
 
 # Usage
-[Standalone binaries](https://github.com/vladimir-tutin/Plex-Auto-Collections/tree/master/dist) have been created for both Windows and Linux.
-
-If you would like to run from Python I have only tested this fully on Python 3.7.4. Dependencies must be installed by running
+Limited testing has been done only on Python 3.7. Dependencies must be installed by running
 
     pip install -r requirements.txt
 
-If there are issues installing PyYAML 1.5.4 try
+If there are issues installing PyYAML 1.5.4 or tmdbv3api 1.5.1 try
 
     pip install -r requirements.txt --ignore-installed
-    
-Make sure that plexapi is installed from the github source in requirements.txt. The one provided by pip contains a bug 
-that will cause certain movies to crash the script when processing IMDB lists. To ensure that you are running the of 
-plexapi check utils.py contains the following around line 172:
-
-    def toDatetime(value, format=None):
-    """ Returns a datetime object from the specified value.
-
-        Parameters:
-            value (str): value to return as a datetime
-            format (str): Format to pass strftime (optional; if value is a str).
-    """
-    if value and value is not None:
-        if format:
-            value = datetime.strptime(value, format)
-        else:
-            value = datetime.fromtimestamp(int(value))
-    return value
 
 To run the script in a terminal run
 

config_tools.py renamed to app/config_tools.py

@@ -3,6 +3,7 @@
 import yaml
 import requests
 import socket
+import urllib
 from plexapi.server import PlexServer
 from plexapi.video import Movie
 from plexapi.video import Show
@@ -23,12 +24,15 @@ def __init__(self, config_path):
         self.config_path = config_path
         with open(self.config_path, 'rt', encoding='utf-8') as yml:
             self.data = yaml.load(yml, Loader=yaml.FullLoader)
+        self.collections = self.data['collections']
         self.plex = self.data['plex']
         self.tmdb = self.data['tmdb']
         self.trakt = self.data['trakt']
         self.radarr = self.data['radarr']
-        self.collections = self.data['collections']
-        self.image_server = self.data['image-server']
+        if 'image-server' in self.data:
+            self.image_server = self.data['image-server']
+        else:
+            self.image_server = {}
 
 
 class Plex:
@@ -93,16 +97,44 @@ def __init__(self, config_path):
 
 
 class ImageServer:
-    def __init__(self, config_path):
+    def __init__(self, config_path, mode="server"):
         config = Config(config_path).image_server
-        try:
+        # Best defaults for "host" are 0.0.0.0 for server and 127.0.0.1 for client
+        # Set respective defaults in server and client
+        if 'host' in config:
             self.host = config['host']
-        except:
-            a = 1
-        try:
+        else:
+            if mode == "server":
+                self.host = "0.0.0.0"
+            else:
+                self.host = "127.0.0.1"
+        # Set default port
+        if 'port' in config:
             self.port = config['port']
-        except:
-            a = 1
+        else:
+            self.port = 5000
+        # Test and set default folder path
+        if mode == "server":
+            if 'poster-directory' in config:
+                self.posterdirectory = config['poster-directory']
+            else:
+                app_dir = os.path.dirname(os.path.realpath(__file__))
+
+                # Test separate config folder with nested 'posters' folder
+                if os.path.exists(os.path.join(app_dir, "..", "config", "posters")):
+                    self.posterdirectory = os.path.join("..", "config", "posters")
+                # Test separate config folder with nested 'images' folder
+                elif os.path.exists(os.path.join(app_dir, "..", "config", "images")):
+                    self.posterdirectory = os.path.join("..", "config", "images")            
+                # Test nested posters folder
+                elif os.path.exists(os.path.join(app_dir, "posters")):
+                    self.posterdirectory = "posters"
+                # Test nested images folder
+                elif os.path.exists(os.path.join(app_dir, "images")):
+                    self.posterdirectory = "images"
+                else:
+                    raise RuntimeError("Invalid poster-directory setting")
+
 
 def update_from_config(config_path, plex):
     config = Config(config_path)
@@ -209,19 +241,12 @@ def update_from_config(config_path, plex):
                 if not poster:
                     # try to pull image from image_server. File is Collection name.png
                     # Setup connection to image_server
-                    try:
-                        host = config.image_server["host"]
-                    except AttributeError:
-                        host = "127.0.0.1"
-                    try:
-                        port = config.image_server["port"]
-                    except AttributeError:
-                        port = "5000"
+                    config_client = ImageServer(config_path, "client")
 
-                    # Replace spaces in collection name with %20
-                    c_name = c.replace(" ", "%20")
+                    # Url encode collection name
+                    c_name = urllib.parse.quote(c, safe='')
                     # Create url to where image would be if exists
-                    poster = "http://" + host + ":" + str(port) + "/images/" + c_name
+                    poster = "http://" + config_client.host + ":" + str(config_client.port) + "/images/" + c_name
                     try:
                         r = requests.request("GET", poster)
                         if not r.status_code == 404:

app/image_server.py

@@ -0,0 +1,44 @@
+from flask import Flask
+from flask import send_from_directory
+from flask import abort
+from config_tools import ImageServer
+import requests
+import logging
+import os
+import time
+
+def check_running(config_path):
+    time.sleep(1)
+    config_client = ImageServer(config_path, "client")
+    try:
+        r = requests.get("http://" + config_client.host + ":" + str(config_client.port), verify=False, timeout=1)
+        return "IMAGE SERVER RUNNING ON http://{}:{}/images/".format(config_client.host, config_client.port)
+    except (requests.exceptions.ConnectTimeout, requests.exceptions.ConnectionError):
+        return "IMAGE SERVER NOT RUNNING"
+
+
+def start_srv(config_path):
+    config_server = ImageServer(config_path, "server")
+    server = Flask(__name__)
+    server.upload_folder = config_server.posterdirectory
+    log = logging.getLogger("werkzeug")
+    os.environ['WERKZEUG_RUN_MAIN'] = 'true'
+    log.setLevel(logging.ERROR)
+    @server.route('/images/<path:c_name>')
+    def send_file(c_name):
+        app_dir = os.path.dirname(os.path.realpath(__file__))
+        poster_dir = os.path.join(app_dir, config_server.posterdirectory)
+        posters = os.listdir(poster_dir)
+        for img in posters:
+            if (c_name + ".") in img:
+                return send_from_directory(server.upload_folder, img)
+        return abort(404)
+
+    try:
+        server.run(host=config_server.host, port=config_server.port)
+    except (OSError, TypeError) as e:
+        print(e)
+
+
+if __name__ == '__main__':
+    start_srv(config_path)

imdb_tools.py renamed to app/imdb_tools.py

@@ -210,7 +210,7 @@ def append_collection(config_path, config_update=None):
 
 if args.update:
     # sys.stdout = open("pac.log", "w")
-    update_from_config(config_path, plex, True)
+    update_from_config(config_path, plex)
     sys.exit(0)
 
 if input("Update Collections from Config? (y/n): ").upper() == "Y":