v2.0.22

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.0.22 (2018-03-10)
+
+* Tautulli v2 release!
+
+
 ## v2.0.22-beta (2018-03-09)
 
 * Notifications:

Tautulli.py

@@ -186,7 +186,8 @@ def main():
     plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
 
     # Move 'plexpy.db' to 'tautulli.db'
-    if os.path.isfile(os.path.join(plexpy.DATA_DIR, 'plexpy.db')):
+    if os.path.isfile(os.path.join(plexpy.DATA_DIR, 'plexpy.db')) and \
+            not os.path.isfile(os.path.join(plexpy.DATA_DIR, plexpy.DB_FILE)):
         os.rename(os.path.join(plexpy.DATA_DIR, 'plexpy.db'), plexpy.DB_FILE)
 
     if plexpy.DAEMON:

data/interfaces/default/js/script.js

@@ -292,7 +292,11 @@ function millisecondsToMinutes(ms, roundToMinute) {
     if (ms > 0) {
       var minutes = Math.floor(ms / 60000);
       var seconds = ((ms % 60000) / 1000).toFixed(0);
+      if (roundToMinute) {
+          return (seconds >= 30 ? (minutes + 1) : minutes);
+      } else {
           return (seconds == 60 ? (minutes + 1) + ":00" : minutes + ":" + (seconds < 10 ? "0" : "") + seconds);
+      }
     } else {
         if (roundToMinute) {
             return '0';

plexpy/pmsconnect.py

@@ -666,6 +666,11 @@ class PmsConnect(object):
                         }
 
         elif metadata_type == 'show':
+            # Workaround for for duration sometimes reported in minutes for a show
+            duration = helpers.get_xml_attr(metadata_main, 'duration')
+            if duration.isdigit() and int(duration) < 1000:
+                duration = unicode(int(duration) * 60 * 1000)
+
             metadata = {'media_type': metadata_type,
                         'section_id': section_id,
                         'library_name': library_name,
@@ -685,7 +690,7 @@ class PmsConnect(object):
                         'rating': helpers.get_xml_attr(metadata_main, 'rating'),
                         'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
                         'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'duration': duration,
                         'year': helpers.get_xml_attr(metadata_main, 'year'),
                         'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
                         'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),

plexpy/version.py

@@ -1,2 +1,2 @@
-PLEXPY_BRANCH = "beta"
+PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "v2.0.22-beta"
+PLEXPY_RELEASE_VERSION = "v2.0.22"