From 1a63a69b6d42760d4b022d4c0789b2f255250d26 Mon Sep 17 00:00:00 2001
From: Jason Michalski <armooo@armooo.net>
Date: Thu, 22 Nov 2007 00:53:42 -0600
Subject: [PATCH] Looks like the titles are working now

---
 plugins/video/templates/TvBus.tmpl     | 10 ++++++----
 plugins/video/templates/container.tmpl | 14 +++++++-------
 plugins/video/video.py                 | 17 ++++++++++++-----
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/plugins/video/templates/TvBus.tmpl b/plugins/video/templates/TvBus.tmpl
index 9919256..5eb5c4d 100644
--- a/plugins/video/templates/TvBus.tmpl
+++ b/plugins/video/templates/TvBus.tmpl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TvBusMarshalledStruct:TvBusEnvelope xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xmlns:TvBusMarshalledStruct="http://tivo.com/developer/xml/idl/TvBusMarshalledStruct" xmlns:TvPgdRecording="http://tivo.com/developer/xml/idl/TvPgdRecording" xmlns:TvBusDuration="http://tivo.com/developer/xml/idl/TvBusDuration" xmlns:TvPgdShowing="http://tivo.com/developer/xml/idl/TvPgdShowing" xmlns:TvDbShowingBit="http://tivo.com/developer/xml/idl/TvDbShowingBit" xmlns:TvBusDateTime="http://tivo.com/developer/xml/idl/TvBusDateTime" xmlns:TvPgdProgram="http://tivo.com/developer/xml/idl/TvPgdProgram" xmlns:TvDbColorCode="http://tivo.com/developer/xml/idl/TvDbColorCode" xmlns:TvPgdSeries="http://tivo.com/developer/xml/idl/TvPgdSeries" xmlns:TvDbShowType="http://tivo.com/developer/xml/idl/TvDbShowType" xmlns:TvPgdChannel="http://tivo.com/developer/xml/idl/TvPgdChannel" xmlns:TvDbTvRating="http://tivo.com/developer/xml/idl/TvDbTvRating" xmlns:TvDbRecordQuality="http://tivo.com/developer/xml/idl/TvDbRecordQuality" xmlns:TvDbBitstreamFormat="http://tivo.com/developer/xml/idl/TvDbBitstreamFormat" xs:schemaLocation="http://tivo.com/developer/xml/idl/TvBusMarshalledStruct TvBusMarshalledStruct.xsd http://tivo.com/developer/xml/idl/TvPgdRecording TvPgdRecording.xsd http://tivo.com/developer/xml/idl/TvBusDuration TvBusDuration.xsd http://tivo.com/developer/xml/idl/TvPgdShowing TvPgdShowing.xsd http://tivo.com/developer/xml/idl/TvDbShowingBit TvDbShowingBit.xsd http://tivo.com/developer/xml/idl/TvBusDateTime TvBusDateTime.xsd http://tivo.com/developer/xml/idl/TvPgdProgram TvPgdProgram.xsd http://tivo.com/developer/xml/idl/TvDbColorCode TvDbColorCode.xsd http://tivo.com/developer/xml/idl/TvPgdSeries TvPgdSeries.xsd http://tivo.com/developer/xml/idl/TvDbShowType TvDbShowType.xsd http://tivo.com/developer/xml/idl/TvPgdChannel TvPgdChannel.xsd http://tivo.com/developer/xml/idl/TvDbTvRating TvDbTvRating.xsd http://tivo.com/developer/xml/idl/TvDbRecordQuality TvDbRecordQuality.xsd http://tivo.com/developer/xml/idl/TvDbBitstreamFormat TvDbBitstreamFormat.xsd" xs:type="TvPgdRecording:TvPgdRecording">
-  <recordedDuration>PT00M</recordedDuration>
+  <recordedDuration>$video.iso_durarion</recordedDuration>
   <vActualShowing>
     <element>
         <showingBits value="$video.showingBits"/>
@@ -27,6 +27,7 @@
                 #end for
         </vDirector>
           <episodeNumber>$video.episodeNumber</episodeNumber>
+          <episodeTitle>$video.title</episodeTitle>
           <vExecProducer>
                 #for $element in $video.vExecProducer
                 <element>$element</element>
@@ -64,7 +65,7 @@
             <seriesTitle>$video.seriesTitle</seriesTitle>
           </series>
           <showType value="$video.showType[1]">$video.showType[0]</showType>
-          <title>$video.title</title>
+          <title>$video.seriesTitle</title>
           <vWriter>
                 #for $element in $video.vWriter
                 <element>$element</element>
@@ -106,6 +107,7 @@
             #end for
     </vDirector>
       <episodeNumber>$video.episodeNumber</episodeNumber>
+      <episodeTitle>$video.title</episodeTitle>
       <vExecProducer>
             #for $element in $video.vExecProducer
             <element>$element</element>
@@ -140,10 +142,10 @@
             <element>$element</element>
             #end for
         </vSeriesGenre>
-        <seriesTitle>$video.seriesTitle</seriesTitle>
+        <seriesTitle>$video.title</seriesTitle>
       </series>
       <showType value="$video.showType[1]">$video.showType[0]</showType>
-      <title>$video.title</title>
+      <title>$video.seriesTitle</title>
       <vWriter>
             #for $element in $video.vWriter
             <element>$element</element>
diff --git a/plugins/video/templates/container.tmpl b/plugins/video/templates/container.tmpl
index 368154c..67f9142 100644
--- a/plugins/video/templates/container.tmpl
+++ b/plugins/video/templates/container.tmpl
@@ -26,16 +26,16 @@
     #else
     <Item>
         <Details>
-            <Title>$video.title</Title>
+            <Title>$video.seriesTitle</Title>
             <ContentType>video/x-tivo-mpeg</ContentType>
             <SourceFormat>video/x-ms-wmv</SourceFormat>
             <SourceSize>$video.size</SourceSize>
-		<Duration>$video.duration</Duration>
-        <Description>$escape($video.description)</Description>
-        <EpisodeTitle>$escape($video.episodeTitle)</EpisodeTitle>
-        <SourceChannel>$escape($video.sourceChannel)</SourceChannel>
-        <SourceStation>$escape($video.sourceStation)</SourceStation>
-        <SeriesId>$video.seriesId</SeriesId>
+            <Duration>$video.duration</Duration>
+            <Description>$escape($video.description)</Description>
+            <EpisodeTitle>$escape($video.title)</EpisodeTitle>
+            <SourceChannel>$escape($video.sourceChannel)</SourceChannel>
+            <SourceStation>$escape($video.sourceStation)</SourceStation>
+            <SeriesId>$video.seriesId</SeriesId>
         </Details>
         <Links>
             <Content>
diff --git a/plugins/video/video.py b/plugins/video/video.py
index bf1324c..57eb04f 100644
--- a/plugins/video/video.py
+++ b/plugins/video/video.py
@@ -85,13 +85,22 @@ class Video(Plugin):
 
         metadata = {}
 
+        base_path, title = os.path.split(full_path)
+        metadata['title'] = '.'.join(title.split('.')[:-1])
+        metadata['seriesTitle'] = os.path.split(base_path)[1]
+
         metadata.update( self.__getMetadateFromTxt(full_path) )
         
         metadata['size'] = self.__est_size(full_path)
         metadata['duration'] = self.__duration(full_path)
         
         duration = timedelta(milliseconds = metadata['duration'])
-        metadata['iso_durarion'] = 'P' + str(duration.days) + 'DT' + str(duration.seconds) + 'S'
+
+        min = duration.seconds / 60
+        sec = duration.seconds % 60
+        hours = min / 60
+        min = min % 60
+        metadata['iso_durarion'] = 'P' + str(duration.days) + 'DT' + str(hours) + 'H' + str(min) + 'M' + str(sec) + 'S'
 
         return metadata
 
@@ -148,8 +157,6 @@ class Video(Plugin):
 
         
         file_info = VideoDetails()
-        file_info['seriesTitle'] = os.path.split(path)[-1]
-        file_info['title'] = '.'.join(file.split('.')[:-1])
         file_info.update(self.__metadata(file_path))
 
         print file_info
@@ -205,9 +212,9 @@ class VideoDetails(DictMixin):
         if key in defaults:
             return defaults[key]
         elif key.startswith('v'):
-            return ['Default']
+            return [key + '1', key + '2']
         else:
-            return 'Default'
+            return key
 
         
 # Parse a bitrate using the SI/IEEE suffix values as if by ffmpeg
-- 
2.11.4.GIT