v1.6.8 Merge

v1.6.8 Merge

CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [v1.6.7](https://github.com/Boerderij/Varken/tree/v1.6.7) (2019-04-18)
+## [v1.6.8](https://github.com/Boerderij/Varken/tree/v1.6.8) (2019-04-18)
-[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.6...v1.6.7)
+[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.7...v1.6.8)
+
+**Implemented enhancements:**
+
+- \[Enhancement\] Only drop the invalid episodes from sonarr [\#121](https://github.com/Boerderij/Varken/issues/121)
+
+**Merged pull requests:**
+
+- v1.6.8 Merge [\#122](https://github.com/Boerderij/Varken/pull/122) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
+
+## [1.6.7](https://github.com/Boerderij/Varken/tree/1.6.7) (2019-04-18)
+[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.6...1.6.7)
 
 **Implemented enhancements:**
 

docker-compose.yml

@@ -5,7 +5,6 @@ networks:
 services:
   influxdb:
     hostname: influxdb
-    user: auser
     image: influxdb
     networks:
       - internal
@@ -28,7 +27,6 @@ services:
     restart: unless-stopped
   grafana:
     hostname: grafana
-    user: auser
     image: grafana/grafana
     networks:
       - internal
@@ -40,7 +38,6 @@ services:
       - GF_PATHS_DATA=/config/data
       - GF_PATHS_LOGS=/config/logs
       - GF_PATHS_PLUGINS=/config/plugins
-      - GF_PATHS_CONFIG=/config/grafana.ini
       - GF_INSTALL_PLUGINS=grafana-piechart-panel,grafana-worldmap-panel
     depends_on:
       - influxdb

varken/__init__.py

@@ -1,2 +1,2 @@
-VERSION = "1.6.7"
+VERSION = "1.6.8"
 BRANCH = 'master'

varken/sonarr.py

@@ -35,10 +35,14 @@ class SonarrAPI(object):
             return
 
         # Iteratively create a list of SonarrTVShow Objects from response json
-        try:
+        tv_shows = []
-            tv_shows = [SonarrTVShow(**show) for show in get]
+        for show in get:
-        except TypeError as e:
+            try:
-            self.logger.error('TypeError has occurred : %s while creating SonarrTVShow structure', e)
+                show_tuple = SonarrTVShow(**show)
+                tv_shows.append(show_tuple)
+            except TypeError as e:
+                self.logger.error('TypeError has occurred : %s while creating SonarrTVShow structure for show', e)
+        if not tv_shows:
             return
 
         # Add show to missing list if file does not exist
@@ -86,10 +90,14 @@ class SonarrAPI(object):
         if not get:
             return
 
-        try:
+        tv_shows = []
-            tv_shows = [SonarrTVShow(**show) for show in get]
+        for show in get:
-        except TypeError as e:
+            try:
-            self.logger.error('TypeError has occurred : %s while creating SonarrTVShow structure', e)
+                show_tuple = SonarrTVShow(**show)
+                tv_shows.append(show_tuple)
+            except TypeError as e:
+                self.logger.error('TypeError has occurred : %s while creating SonarrTVShow structure for show', e)
+        if not tv_shows:
             return
 
         for show in tv_shows:
@@ -136,10 +144,14 @@ class SonarrAPI(object):
         if not get:
             return
 
-        try:
+        download_queue = []
-            download_queue = [Queue(**show) for show in get]
+        for show in get:
-        except TypeError as e:
+            try:
-            self.logger.error('TypeError has occurred : %s while creating Queue structure', e)
+                show_tuple = Queue(**show)
+                download_queue.append(show_tuple)
+            except TypeError as e:
+                self.logger.error('TypeError has occurred : %s while creating Queue structure', e)
+        if not download_queue:
             return
 
         for show in download_queue: