From 5e2b02c13df6328361b04e6f0790232c80b30a6d Mon Sep 17 00:00:00 2001 From: Shahab Lashkari Date: Sun, 24 Jan 2016 12:40:46 -0800 Subject: [PATCH] Updated {progress_time} to use time format from settings --- data/interfaces/default/settings.html | 2 +- plexpy/helpers.py | 8 -------- plexpy/notification_handler.py | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index d6430744..466d516f 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -1146,7 +1146,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents() {progress_time} - The last reported offset (in HH:MM:SS) for the item. + The last reported offset (in time format) for the item. {progress_percent} diff --git a/plexpy/helpers.py b/plexpy/helpers.py index 33c31c67..cb11e87d 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -145,14 +145,6 @@ def today(): def now(): now = datetime.datetime.now() return now.strftime("%Y-%m-%d %H:%M:%S") - -def human_progress(ms): - hp = '' - if str(ms).isdigit(): - seconds = float(ms)/1000 - gmtime = time.gmtime(seconds) - hp = time.strftime("%H:%M:%S", gmtime) - return hp def human_duration(s, sig='dhms'): diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index cf3bfe5e..063746cb 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -484,7 +484,6 @@ def build_notify_text(session=None, timeline=None, state=None): stream_duration = int((time.time() - helpers.cast_to_float(session['started'])) / 60) view_offset = helpers.convert_milliseconds_to_minutes(session['view_offset']) - progress_time = helpers.human_progress(session['view_offset']) user = session['friendly_name'] platform = session['platform'] player = session['player'] @@ -507,6 +506,7 @@ def build_notify_text(session=None, timeline=None, state=None): transcode_audio_channels = session['transcode_audio_channels'] progress_percent = helpers.get_percent(view_offset, duration) + progress_time = arrow.get(helpers.cast_to_int(session['view_offset'])/1000).format(plexpy.CONFIG.TIME_FORMAT.replace('zz','').replace('a','').replace('A','').replace('h','')) # Fix metadata params for notify recently added grandparent if state == 'created' and plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: