anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix progress percent in grouping logic

Browse Source
This commit is contained in:
JonnyWong16
2018-05-31 08:34:58 -07:00
parent 95e56f5ea5
commit 22a2ad4bc7
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plexpy/activity_processor.py
View File

@@ -15,18 +15,13 @@
from collections import defaultdict from collections import defaultdict
import json import json
import threading
import time import time
import re
import plexpy import plexpy
import database import database
import datafactory import helpers
import libraries import libraries
import log_reader
import logger import logger
import notification_handler
import notifiers
import pmsconnect import pmsconnect
import users import users
@@ -301,6 +296,7 @@ class ActivityProcessor(object):
'episode': plexpy.CONFIG.TV_WATCHED_PERCENT, 'episode': plexpy.CONFIG.TV_WATCHED_PERCENT,
'track': plexpy.CONFIG.MUSIC_WATCHED_PERCENT 'track': plexpy.CONFIG.MUSIC_WATCHED_PERCENT
} }
prev_progress_percent = helpers.get_percent(prev_session['view_offset'], session['duration'])
# If previous session view offset less than watched percent, # If previous session view offset less than watched percent,
# and new session view offset is greater, # and new session view offset is greater,
@@ -308,7 +304,7 @@ class ActivityProcessor(object):
# else set the reference_id to the new id # else set the reference_id to the new id
if prev_session is None and new_session is None: if prev_session is None and new_session is None:
args = [last_id, last_id] args = [last_id, last_id]
elif prev_session['view_offset'] < watched_percent.get(session['media_type'], 0) and \ elif prev_progress_percent < watched_percent.get(session['media_type'], 0) and \
prev_session['view_offset'] <= new_session['view_offset']: prev_session['view_offset'] <= new_session['view_offset']:
args = [prev_session['reference_id'], new_session['id']] args = [prev_session['reference_id'], new_session['id']]
else: else: