github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-10 23:42:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
Tim 2015-09-29 22:32:16 +02:00
commit c65d8a1ec6
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,5 +1,10 @@
# Changelog # Changelog
## v1.2.1 (2015-09-29)
* Fix for possible issue when paused_counter is null.
## v1.2.0 (2015-09-29) ## v1.2.0 (2015-09-29)
* Added option to group consecutive plays in the history tables. * Added option to group consecutive plays in the history tables.

5
plexpy/activity_processor.py
View file

@ -354,7 +354,10 @@ class ActivityProcessor(object):
for session in result: for session in result:
if session['last_paused']: if session['last_paused']:
paused_offset = int(time.time()) - int(session['last_paused']) paused_offset = int(time.time()) - int(session['last_paused'])
paused_counter = int(session['paused_counter']) + int(paused_offset) if session['paused_counter']:
paused_counter = int(session['paused_counter']) + int(paused_offset)
else:
paused_counter = int(paused_offset)
values = {'state': 'playing', values = {'state': 'playing',
'last_paused': timestamp 'last_paused': timestamp

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master" PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.2.0" PLEXPY_RELEASE_VERSION = "1.2.1"