From 06bdd4a777667ba2d8d2afc3f3f8ed38390495f8 Mon Sep 17 00:00:00 2001
From: Rico Schulte <ricoschulte@users.schwerkraft.elitedvb.net>
Date: Sun, 24 Jun 2007 10:05:17 +0000
Subject: [PATCH] add Movietag List avaible with http://dm7025/web/movietags

---
 .../src/WebComponents/Sources/Movie.py        | 38 ++++++++++---------
 webinterface/src/web/movietags.xml            |  5 +++
 webinterface/src/webif.py                     |  1 +
 3 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100755 webinterface/src/web/movietags.xml

diff --git a/webinterface/src/WebComponents/Sources/Movie.py b/webinterface/src/WebComponents/Sources/Movie.py
index 3914ba97..0d14d957 100644
--- a/webinterface/src/WebComponents/Sources/Movie.py
+++ b/webinterface/src/WebComponents/Sources/Movie.py
@@ -11,6 +11,7 @@ import os
 class Movie( Source):
     LIST = 0
     DEL = 1
+    TAGS = 2
     
     def __init__(self, session,func = LIST):
         Source.__init__(self)
@@ -25,7 +26,8 @@ class Movie( Source):
             self.result = self.delMovieFiles(cmd)
         else:
             self.result = False,"unknown command"
-        
+
+           
     def delMovieFiles(self,param):
         print "delMovieFiles:",param
         
@@ -49,11 +51,6 @@ class Movie( Source):
                 os.system('rm -f "%s.eit"' % param)
         except OSError:
             return False,"OSErrorSome error occurred while deleting file"
-#        except:
-#             print sys.exc_info()[0]
-#             print sys.exc_info()[1]
-#             print traceback.extract_tb(sys.exc_info()[2])
-
         
         if os.path.exists(param):
             return False,"Some error occurred while deleting file"
@@ -85,21 +82,26 @@ class Movie( Source):
             filename = "/"+"/".join(serviceref.toString().split("/")[1:])
             movie.append(filename)
             list.append(movie)
-        print "tags",self.movielist.tags
         return list
 
     def getText(self):
-        print self.result
-        (result,text) = self.result
-        xml  = "<e2simplexmlresult>\n"
-        if result:
-            xml += "<e2state>True</e2state>\n"
-        else:
-            xml += "<e2state>False</e2state>\n"            
-        xml += "<e2statetext>%s</e2statetext>\n" % text
-        xml += "</e2simplexmlresult>\n"
-        return xml
-    
+        if self.func is self.DEL: 
+            (result,text) = self.result
+            xml  = "<e2simplexmlresult>\n"
+            if result:
+                xml += "<e2state>True</e2state>\n"
+            else:
+                xml += "<e2state>False</e2state>\n"            
+            xml += "<e2statetext>%s</e2statetext>\n" % text
+            xml += "</e2simplexmlresult>\n"
+            return xml
+        elif self.func is self.TAGS:
+            xml = "<e2movietags>\n"
+            for tag in self.movielist.tags:
+                xml += "<e2movietag>%s</e2movietag>\n"%tag
+            xml += "</e2movietags>\n"
+            return xml
+            
     text = property(getText)        
     
     list = property(command)
diff --git a/webinterface/src/web/movietags.xml b/webinterface/src/web/movietags.xml
new file mode 100755
index 00000000..5d8e718b
--- /dev/null
+++ b/webinterface/src/web/movietags.xml
@@ -0,0 +1,5 @@
+<e2:screen name="TestScreen">
+	<e2:element source="MovieTags" >
+		<e2:convert type="web:TextToHTML" />
+	</e2:element>
+</e2:screen>
\ No newline at end of file
diff --git a/webinterface/src/webif.py b/webinterface/src/webif.py
index b2dc1348..2e6ba179 100644
--- a/webinterface/src/webif.py
+++ b/webinterface/src/webif.py
@@ -88,6 +88,7 @@ class TestScreen(InfoBarServiceName, InfoBarEvent,InfoBarTuner, WebScreen):
 		self["RecordNow"] = Timer(session,func = Timer.RECNOW)
 		self["MovieList"] = Movie(session,func = Movie.LIST)
 		self["MovieFileDel"] = Movie(session,func = Movie.DEL)
+		self["MovieTags"] = Movie(session,func = Movie.TAGS)
 		self["Volume"] = Volume(session)
 		self["Message"] = Message(session)
 		self["PowerState"] = PowerState(session)
-- 
2.20.1