From 23b6a0212ea322ac8756f5b844cdea14e4559c29 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Tue, 5 Feb 2008 23:29:33 -0500
Subject: [PATCH] Add the GUID to the UniqueId -- allows accessing the same
 directories from different computers without confusing the Tivo. I may be the
 only one who needs this, but anyway.

---
 plugins/video/templates/container.tmpl | 4 ++--
 plugins/video/video.py                 | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/video/templates/container.tmpl b/plugins/video/templates/container.tmpl
index 2a37159..18caa5c 100644
--- a/plugins/video/templates/container.tmpl
+++ b/plugins/video/templates/container.tmpl
@@ -7,7 +7,7 @@
         <ContentType>x-container/tivo-videos</ContentType>
         <SourceFormat>x-container/folder</SourceFormat>
         <TotalItems>$total</TotalItems>
-        <UniqueId>$crc($name)</UniqueId>
+        <UniqueId>$crc($guid + $name)</UniqueId>
     </Details>
     #for $video in $videos
     #if $video.is_dir
@@ -16,7 +16,7 @@
             <Title>$escape($video.title)</Title>
             <ContentType>x-container/folder</ContentType>
             <SourceFormat>x-tivo-container/tivo-dvr</SourceFormat>
-            <UniqueId>$crc($video.small_path)</UniqueId>
+            <UniqueId>$crc($guid + $video.small_path)</UniqueId>
         </Details>
         <Links>
             <Content>
diff --git a/plugins/video/video.py b/plugins/video/video.py
index b0483ad..f798bff 100644
--- a/plugins/video/video.py
+++ b/plugins/video/video.py
@@ -175,8 +175,9 @@ class Video(Plugin):
         t.start = start
         t.videos = videos
         t.quote = quote
-        t.crc = zlib.crc32
         t.escape = escape
+        t.crc = zlib.crc32
+        t.guid = config.getGUID()
         handler.wfile.write(t)
 
     def TVBusQuery(self, handler, query):
-- 
2.11.4.GIT