From 0a7e58c509681c8f1b19541ab65779bcad417a20 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 4877873e..5f7316de 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 0c678a6b714316d037f24d55d2a11874abcd2735 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 b90dad9d..48ef4c89 100644 --- a/varken/sonarr.py +++ b/varken/sonarr.py @@ -143,7 +143,13 @@ def get_queue(self): 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 4aebd3e522600ed5628fc0ebeceb2abed7682143 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 8f7e31f3..04e4d6eb 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 e401c3ed94955fe390e9418d45461449eab92be3 Mon Sep 17 00:00:00 2001 From: samwiseg0 <2241731+samwiseg0@users.noreply.github.com> 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 04e4d6eb..d3b07197 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 bd98b3cb6ca88de66fc6cea2b83bc1c23b8bcd28 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 7dea8a4b..4eac352a 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -80,6 +80,11 @@ def get_activity(self): 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 @@ def get_activity(self): "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 8a9fff1a2fcbb1167cabb37e36badd0285cc8b3c 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 86f8e339..f82bc2ff 100644 --- a/varken/ombi.py +++ b/varken/ombi.py @@ -102,13 +102,13 @@ def get_all_requests(self): 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 7d20df1e0b9399eb921a1616dcf4907e7cfe1312 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 df8c9e1b..a05c17a3 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 5f7316de..29d84409 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ VERSION = "1.6.7" -BRANCH = 'develop' +BRANCH = 'master' From 5cdf7801740aeb076dfdfb436086287cce99169b 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 d3b07197..24245fff 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)