Skip to content

Commit

Permalink
v1.7.5
Browse files Browse the repository at this point in the history
v1.7.5
  • Loading branch information
dirtycajunrice authored Dec 11, 2019
2 parents 86ba4f2 + 7ebf3bb commit 7b71a8a
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ github:
stage: release
script:
- apk add git
- git remote set-url origin "https://$GITHUB_USER:[email protected]/$CI_PROJECT_PATH".git"
- git remote set-url origin "https://$GITHUB_USER:[email protected]/$CI_PROJECT_PATH.git"
- git tag $TAG
- git push --tags
19 changes: 16 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# Change Log

## [v1.7.4](https:/Boerderij/Varken/tree/v1.7.4) (2019-10-07)
[Full Changelog](https:/Boerderij/Varken/compare/1.7.3...v1.7.4)
## [v1.7.5](https:/Boerderij/Varken/tree/v1.7.5) (2019-12-11)
[Full Changelog](https:/Boerderij/Varken/compare/1.7.4...v1.7.5)

**Merged pull requests:**

- v1.7.5 Merge [\#162](https:/Boerderij/Varken/pull/162) ([DirtyCajunRice](https:/DirtyCajunRice))
- Add helper itemgetter function for TautulliStream fields [\#157](https:/Boerderij/Varken/pull/157) ([JonnyWong16](https:/JonnyWong16))
- Fix to only use NamedTuple fields from TautulliStream [\#156](https:/Boerderij/Varken/pull/156) ([JonnyWong16](https:/JonnyWong16))

## [1.7.4](https:/Boerderij/Varken/tree/1.7.4) (2019-10-07)
[Full Changelog](https:/Boerderij/Varken/compare/1.7.3...1.7.4)

**Implemented enhancements:**

Expand All @@ -24,6 +33,10 @@
- \[BUG\] Varken Crashes when ini is read only [\#146](https:/Boerderij/Varken/issues/146)
- \[BUG\] Missing Available Movies/TV Shows does not take Monitored status into account [\#141](https:/Boerderij/Varken/issues/141)

**Closed issues:**

- \[Feature Request\] Medusa Support [\#148](https:/Boerderij/Varken/issues/148)

**Merged pull requests:**

- v1.7.3 Merge [\#149](https:/Boerderij/Varken/pull/149) ([DirtyCajunRice](https:/DirtyCajunRice))
Expand Down Expand Up @@ -323,4 +336,4 @@
- Create crontabs [\#6](https:/Boerderij/Varken/pull/6) ([ghost](https:/ghost))
- update plex\_dashboard.json [\#5](https:/Boerderij/Varken/pull/5) ([ghost](https:/ghost))
- Update README.md [\#4](https:/Boerderij/Varken/pull/4) ([ghost](https:/ghost))
- added sickrage portion [\#3](https:/Boerderij/Varken/pull/3) ([ghost](https:/ghost))
- added sickrage portion [\#3](https:/Boerderij/Varken/pull/3) ([ghost](https:/ghost))
2 changes: 1 addition & 1 deletion varken/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VERSION = "1.7.4"
VERSION = "1.7.5"
BRANCH = 'master'
4 changes: 4 additions & 0 deletions varken/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,3 +203,7 @@ def boolcheck(var):
return True
else:
return False


def itemgetter_with_default(**defaults):
return lambda obj: tuple(obj.get(k, v) for k, v in defaults.items())
10 changes: 3 additions & 7 deletions varken/tautulli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from influxdb.exceptions import InfluxDBClientError

from varken.structures import TautulliStream
from varken.helpers import hashit, connection_handler
from varken.helpers import hashit, connection_handler, itemgetter_with_default


class TautulliAPI(object):
Expand Down Expand Up @@ -34,14 +34,10 @@ def get_activity(self):
return

get = g['response']['data']

# Remove erroneous key from sessions
for session in get['sessions']:
if session.get('_cache_time'):
del session['_cache_time']
fields = itemgetter_with_default(**TautulliStream._field_defaults)

try:
sessions = [TautulliStream(**session) for session in get['sessions']]
sessions = [TautulliStream(*fields(session)) for session in get['sessions']]
except TypeError as e:
self.logger.error('TypeError has occurred : %s while creating TautulliStream structure', e)
return
Expand Down

0 comments on commit 7b71a8a

Please sign in to comment.