Merge pull request #135 from ukdtom/tommy-work

Intro Markers and some titles

Contents/Code/__init__.py

@@ -181,8 +181,16 @@ def sectionList():
         with io.open(prefsFile, 'wb') as outfile:
             json.dump(data, outfile, indent=4)
     except Exception, e:
-        with io.open(prefsFile, 'wb', encoding='utf8') as outfile:
-            json.dump(data, outfile, indent=4)
+        try:
+            Log.Debug('Exception handling due to %s', str(e))
+            with io.open(prefsFile, 'wb', encoding='utf8') as outfile:
+                json.dump(data, outfile, indent=4)
+            pass
+        except Exception, e:
+            Log.Debug('Exception handling due to %s', str(e))
+            with io.open(prefsFile, 'w', encoding='utf8') as outfile:
+                json.dump(data, outfile, indent=4)
+            pass
     restart()
     return
 
@@ -1081,7 +1089,8 @@ def scanShowDB(myMediaURL, outFile, level=None, key=None):
                                 strUrl = ''.join((
                                     misc.GetLoopBack(),
                                     '/library/metadata/',
-                                    misc.GetRegInfo(Episode, 'ratingKey')
+                                    misc.GetRegInfo(Episode, 'ratingKey'),
+                                    '?includeMarkers=1'
                                 ))
                                 myExtendedInfoURL = genParam(strUrl)
                                 Episode = XML.ElementFromURL(

Contents/Code/consts.py

@@ -4,7 +4,7 @@
 ########################################################################
 
 # APP specific stuff
-VERSION = ' V2.0.0.10'
+VERSION = ' V2.0.0.11'
 APPNAME = 'ExportTools'
 NAME = APPNAME + VERSION
 DESCRIPTION = 'Export Plex libraries to csv-files or xlsx-files'

Contents/Code/moviefields.py

@@ -17,7 +17,7 @@
 dateTimeFields = ['addedAt', 'updatedAt', 'lastViewedAt']
 
 # Fields that contains a timestamp and should return a time
-timeFields = ['duration']
+timeFields = ['duration', 'startTimeOffset', 'endTimeOffset']
 
 # Levels that only req. a single call towards PMS
 singleCall = ['Level 1', 'Level 2', 'PlayCount 1']

Contents/Code/tvfields.py

@@ -17,8 +17,8 @@
 dateTimeFields = ['addedAt', 'updatedAt',
                   'lastViewedAt', 'originallyAvailableAt']
 
-# Fields that contains a timestamp and should return a time
-timeFields = ['duration']
+# Fields that contains a timestamp and should return a time,
+# see moviefields
 
 # Levels that only req. a single call towards PMS
 singleCall = ['Level 1', 'Level 2', 'Level 3', 'PlayCount 1']
@@ -72,6 +72,8 @@
 ]
 
 Level_4 = [
+    ('Intro Start', 'Marker[@type="intro"]/@startTimeOffset'),
+    ('Intro Stop', 'Marker[@type="intro"]/@endTimeOffset'),
     ('MetaDB Link', '@guid'),
     ('MetaData Language', '@guid'),
     ('Part File Combined',
@@ -135,6 +137,9 @@
 ]
 
 Level_6 = [
+    ('Audio Stream Title', 'Media/Part/Stream[@streamType=2]/@title'),
+    ('Audio Stream Display Title',
+     'Media/Part/Stream[@streamType=2]/@displayTitle'),
     ('Audio Stream Selected', 'Media/Part/Stream[@streamType=2]/@selected'),
     ('Audio Stream Default', 'Media/Part/Stream[@streamType=2]/@default'),
     ('Audio Stream Codec', 'Media/Part/Stream[@streamType=2]/@codec'),

changelog.txt

@@ -1,3 +1,10 @@
+V2.0.0.11:
+	- New:
+		- #129 TV Series Export - Audio Title
+			- Added Audio stream title and Audio stream displayTitle to shows level 6
+		- #134 Consider export of Intro marker for episodes
+			- Added to Level 4 and above
+
 V2.0.0.10:
 	- New:
 		- #131 Additional device logging