v1.6.7 Merge

v1.6.7 Merge

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:**
 

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/)
 

varken/__init__.py

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

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:

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:

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,