From e3305765dad70730bbbaa5e0208fd3e068b981b1 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Mon, 11 Mar 2019 21:36:32 -0400 Subject: [PATCH 1/8] Stage for next version 1.6.7 --- varken/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/varken/__init__.py b/varken/__init__.py index 4877873..5f7316d 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ -VERSION = "1.6.6" -BRANCH = 'master' +VERSION = "1.6.7" +BRANCH = 'develop' From 02c1e7acd865746945b9d5b685161c4db129d144 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Wed, 13 Mar 2019 14:35:49 -0400 Subject: [PATCH 2/8] Skip over invalid sonarr queue entries. Fixes #117 --- varken/sonarr.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/varken/sonarr.py b/varken/sonarr.py index b90dad9..48ef4c8 100644 --- a/varken/sonarr.py +++ b/varken/sonarr.py @@ -143,7 +143,13 @@ class SonarrAPI(object): return for show in download_queue: - sxe = f"S{show.episode['seasonNumber']:0>2}E{show.episode['episodeNumber']:0>2}" + try: + sxe = f"S{show.episode['seasonNumber']:0>2}E{show.episode['episodeNumber']:0>2}" + except TypeError as e: + self.logger.error('TypeError has occurred : %s while processing the sonarr queue. \ + Remove invalid queue entries.', e) + continue + if show.protocol.upper() == 'USENET': protocol_id = 1 else: From 048fc938a9446cbab599fa68f6d8725ab1d35e8d Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Fri, 22 Mar 2019 16:37:40 -0400 Subject: [PATCH 3/8] Update develop readme for proper build status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f7e31f..04e4d6e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

-[![Build Status](https://jenkins.cajun.pro/buildStatus/icon?job=Varken/master)](https://jenkins.cajun.pro/job/Varken/job/master/) +[![Build Status](https://jenkins.cajun.pro/buildStatus/icon?job=Varken/develop)](https://jenkins.cajun.pro/job/Varken/job/develop/) [![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) [![Docker-Layers](https://images.microbadger.com/badges/image/boerderij/varken.svg)](https://microbadger.com/images/boerderij/varken) From 4fc39f75c3055a8d496f9f9c721b83c4ee272419 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Tue, 26 Mar 2019 11:37:27 -0400 Subject: [PATCH 4/8] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 04e4d6e..d3b0719 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,11 @@ Key features: ## Installation Guides Varken Installation guides can be found in the [wiki](https://github.com/Boerderij/Varken/wiki/Installation). +## Support +Please read [Asking for Support](https://github.com/Boerderij/Varken/wiki/Asking-for-Support) before seeking support. + +[Click here for quick access to discord support](http://cyborg.decreator.dev/channels/518970285773422592/530424560504537105/). No app or account needed! + ### InfluxDB [InfluxDB Installation Documentation](https://docs.influxdata.com/influxdb/v1.7/introduction/installation/) From f9f0953657ce9d6a63a8637c6bcf6b7b43c5d7b5 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Fri, 29 Mar 2019 21:49:52 -0700 Subject: [PATCH 5/8] Cleanup unknown locations --- varken/tautulli.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/varken/tautulli.py b/varken/tautulli.py index 7dea8a4..4eac352 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -80,6 +80,11 @@ class TautulliAPI(object): latitude = geodata.location.latitude longitude = geodata.location.longitude + if not geodata.city.name: + location = '👽' + else: + location = geodata.city.name + decision = session.transcode_decision if decision == 'copy': decision = 'direct stream' @@ -134,7 +139,7 @@ class TautulliAPI(object): "quality_profile": session.quality_profile, "progress_percent": session.progress_percent, "region_code": geodata.subdivisions.most_specific.iso_code, - "location": geodata.city.name, + "location": location, "full_location": f'{geodata.subdivisions.most_specific.name} - {geodata.city.name}', "latitude": latitude, "longitude": longitude, From 1ae4383b56776c7324b3d91b484758d420f6fc8f Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 10:17:37 -0500 Subject: [PATCH 6/8] more accounting for bad ombi output. Addresses #119 --- varken/ombi.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/varken/ombi.py b/varken/ombi.py index 86f8e33..f82bc2f 100644 --- a/varken/ombi.py +++ b/varken/ombi.py @@ -102,13 +102,13 @@ class OmbiAPI(object): hash_id = hashit(f'{show.id}{show.tvDbId}{show.title}') # Denied = 0, Approved = 1, Completed = 2, Pending = 3 - if show.childRequests[0]['denied']: + if show.childRequests[0].get('denied'): status = 0 - elif show.childRequests[0]['approved'] and show.childRequests[0]['available']: + elif show.childRequests[0].get('approved') and show.childRequests[0].get('available'): status = 2 - elif show.childRequests[0]['approved']: + elif show.childRequests[0].get('approved'): status = 1 else: From d255dab321bef99a7d84cb1967059747b6be599d Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 10:29:49 -0500 Subject: [PATCH 7/8] to master 1.6.7 --- CHANGELOG.md | 16 ++++++++++++++-- varken/__init__.py | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df8c9e1..a05c17a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,19 @@ # Change Log -## [v1.6.6](https://github.com/Boerderij/Varken/tree/v1.6.6) (2019-03-11) -[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.5...v1.6.6) +## [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) + +**Implemented enhancements:** + +- \[BUG\] Ombi null childRequest output [\#119](https://github.com/Boerderij/Varken/issues/119) +- \[ENHANCEMENT\] Invalid entries in Sonarr's queue leaves varken unable to process the rest of the queue [\#117](https://github.com/Boerderij/Varken/issues/117) + +**Merged pull requests:** + +- v1.6.7 Merge [\#120](https://github.com/Boerderij/Varken/pull/120) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) + +## [1.6.6](https://github.com/Boerderij/Varken/tree/1.6.6) (2019-03-12) +[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.5...1.6.6) **Fixed bugs:** diff --git a/varken/__init__.py b/varken/__init__.py index 5f7316d..29d8440 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ VERSION = "1.6.7" -BRANCH = 'develop' +BRANCH = 'master' From 5631e8b1ad4988c0dac8a89c7409b7dfea72479d Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Thu, 18 Apr 2019 10:31:52 -0500 Subject: [PATCH 8/8] build status to master --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3b0719..24245ff 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

-[![Build Status](https://jenkins.cajun.pro/buildStatus/icon?job=Varken/develop)](https://jenkins.cajun.pro/job/Varken/job/develop/) +[![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) [![Docker-Layers](https://images.microbadger.com/badges/image/boerderij/varken.svg)](https://microbadger.com/images/boerderij/varken)