From 07f1eb489ddcf6e9c1e48837a19665904ffda6e2 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 10:38:35 -0500 Subject: [PATCH 1/6] stage 1.6.8 --- varken/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/varken/__init__.py b/varken/__init__.py index 29d8440..474da3d 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ -VERSION = "1.6.7" -BRANCH = 'master' +VERSION = "1.6.8" +BRANCH = 'develop' From d8d7bdef32d7e732c20dc67e070e80c673b54d51 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 17:42:28 -0500 Subject: [PATCH 2/6] BuyMeACoffee -> Ko-fi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 24245ff..5650519 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Build Status](https://jenkins.cajun.pro/buildStatus/icon?job=Varken/master)](https://jenkins.cajun.pro/job/Varken/job/master/) [![Discord](https://img.shields.io/discord/518970285773422592.svg?colorB=7289DA&label=Discord&logo=Discord&logoColor=7289DA&style=flat-square)](https://discord.gg/VjZ6qSM) -[![BuyMeACoffee](https://img.shields.io/badge/BuyMeACoffee-Donate-ff813f.svg?logo=CoffeeScript&style=flat-square)](https://www.buymeacoffee.com/varken) +[![ko-fi](https://img.shields.io/badge/Buy%20Us%20A%20Coffee-Donate-ff813f.svg?logo=CoffeeScript&style=flat-square)](https://ko-fi.com/varken) [![Docker-Layers](https://images.microbadger.com/badges/image/boerderij/varken.svg)](https://microbadger.com/images/boerderij/varken) [![Release](https://img.shields.io/github/release/boerderij/varken.svg?style=flat-square)](https://microbadger.com/images/boerderij/varken) [![Docker Pulls](https://img.shields.io/docker/pulls/boerderij/varken.svg)](https://hub.docker.com/r/boerderij/varken/) From 95f348f1fef91cb9315d0c42d1de7878e93689bb Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 21:19:51 -0500 Subject: [PATCH 3/6] delete users + grafana.ini --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 51d5e61..52db973 100644 --- a/docker-compose.yml +++ b/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 From 68b7542bcbcd8acd950e053c9ca005b24155cdc9 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 21:25:23 -0500 Subject: [PATCH 4/6] change iteration to only drop the bad shows. Will get more specific after we get a data dump of a bad example --- varken/sonarr.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/varken/sonarr.py b/varken/sonarr.py index 48ef4c8..0e010f4 100644 --- a/varken/sonarr.py +++ b/varken/sonarr.py @@ -35,10 +35,14 @@ class SonarrAPI(object): return # Iteratively create a list of SonarrTVShow Objects from response json - try: - tv_shows = [SonarrTVShow(**show) for show in get] - except TypeError as e: - self.logger.error('TypeError has occurred : %s while creating SonarrTVShow structure', e) + tv_shows = [] + for show in get: + try: + 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 From bcc8b05517d6eab0f52da7be27d437ccfe2e1b9a Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 21:28:23 -0500 Subject: [PATCH 5/6] change iteration to only drop the bad shows. Will get more specific after we get a data dump of a bad example --- varken/sonarr.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/varken/sonarr.py b/varken/sonarr.py index 0e010f4..eea265f 100644 --- a/varken/sonarr.py +++ b/varken/sonarr.py @@ -90,10 +90,14 @@ class SonarrAPI(object): if not get: return - try: - tv_shows = [SonarrTVShow(**show) for show in get] - except TypeError as e: - self.logger.error('TypeError has occurred : %s while creating SonarrTVShow structure', e) + tv_shows = [] + for show in get: + try: + 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: @@ -140,10 +144,14 @@ class SonarrAPI(object): if not get: return - try: - download_queue = [Queue(**show) for show in get] - except TypeError as e: - self.logger.error('TypeError has occurred : %s while creating Queue structure', e) + download_queue = [] + for show in get: + try: + 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: From b16408be235fa05dc396e9b71b3d907e1a11b304 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 21:32:43 -0500 Subject: [PATCH 6/6] v1.6.8 --- CHANGELOG.md | 15 +++++++++++++-- varken/__init__.py | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a05c17a..c92b35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,18 @@ # Change Log -## [v1.6.7](https://github.com/Boerderij/Varken/tree/v1.6.7) (2019-04-18) -[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.6...v1.6.7) +## [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.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:** diff --git a/varken/__init__.py b/varken/__init__.py index 474da3d..086d49b 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ VERSION = "1.6.8" -BRANCH = 'develop' +BRANCH = 'master'