diff --git a/resources/lib/itemtypes.py b/resources/lib/itemtypes.py index 3f0ad3e0..987d70f1 100644 --- a/resources/lib/itemtypes.py +++ b/resources/lib/itemtypes.py @@ -262,13 +262,12 @@ class Items(object): # If the playback was stopped, check whether we need to increment the # playcount. PMS won't tell us the playcount via websockets if item['state'] in ('stopped', 'ended'): - complete = float(item['viewOffset']) / float(item['duration'])*100 + markPlayed = 0.90 + complete = float(item['viewOffset']) / float(item['duration']) self.logMsg('Item %s stopped with completion rate %s percent.' 'Mark item played at %s percent.' - % (item['ratingKey'], - str(complete), - utils.settings('markPlayed')), 1) - if complete >= float(utils.settings('markPlayed')): + % (item['ratingKey'], str(complete), markPlayed), 1) + if complete >= markPlayed: self.logMsg('Marking as completely watched in Kodi', 1) try: item['viewCount'] += 1 diff --git a/resources/lib/player.py b/resources/lib/player.py index 1f4ed70f..db02a649 100644 --- a/resources/lib/player.py +++ b/resources/lib/player.py @@ -510,11 +510,11 @@ class Player(xbmc.Player): except ZeroDivisionError: # Runtime is 0. percentComplete = 0 - - markPlayedAt = float(settings('markPlayed')) / 100 + + markPlayed = 0.90 self.logMsg("Percent complete: %s Mark played at: %s" - % (percentComplete, markPlayedAt), 1) - if percentComplete >= markPlayedAt: + % (percentComplete, markPlayed), 1) + if percentComplete >= markPlayed: # Tell Kodi that we've finished watching (Plex knows) if (data['fileid'] is not None and data['itemType'] in ('movie', 'episode')): @@ -539,7 +539,7 @@ class Player(xbmc.Player): # Plex: never delete offerDelete = False - if percentComplete >= markPlayedAt and offerDelete: + if percentComplete >= markPlayed and offerDelete: resp = xbmcgui.Dialog().yesno( lang(30091), lang(33015), diff --git a/resources/lib/userclient.py b/resources/lib/userclient.py index 916f3ac3..fd60175f 100644 --- a/resources/lib/userclient.py +++ b/resources/lib/userclient.py @@ -114,8 +114,6 @@ class UserClient(threading.Thread): # url = "{server}/emby/System/Configuration?format=json" # result = doUtils.downloadUrl(url) - # utils.settings('markPlayed', value=str(result['MaxResumePct'])) - def hasAccess(self): # Plex: always return True for now return True diff --git a/resources/settings.xml b/resources/settings.xml index eef098bf..51bf226d 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -95,7 +95,6 @@ -