inc

bin/ffx/model/pattern.py

@@ -32,25 +32,20 @@ class Pattern(Base):
     media_tags = relationship('MediaTag', back_populates='pattern', cascade="all, delete")
 
 
-    # def getDescriptor(self):
-# 
-    #     descriptor = {}
-    #     descriptor['id'] = int(self.id)
-    #     descriptor['pattern'] = str(self.pattern)
-    #     descriptor['show_id'] = int(self.show_id)
-# 
-    #     descriptor['tags'] = {}
-    #     for t in self.media_tags:
-    #         descriptor['tags'][str(t.key)] = str(t.value)
-# 
-    #     return descriptor
+    def getId(self):
+        return int(self.id)
 
+    def getShowId(self):
+        return int(self.show_id)
 
-    def getShow(self):
-        pass
+    def getId(self):
+        return int(self.id)
 
-    def getTracks(self):
-        pass
+    def getPattern(self):
+        return str(self.pattern)
+
+    def getTags(self):
+        return {str(t.key):str(t.value) for t in self.media_tags}
 
 
     def getMediaDescriptor(self):
@@ -61,16 +56,3 @@ class Pattern(Base):
             md.appendTrack(t.getDescriptor())
 
         return md
-
-
-    def getId(self):
-        return int(self.id)
-
-    def getPattern(self):
-        return str(self.pattern)
-    
-    def getShowId(self):
-        return int(self.show_id)
-    
-    def getTags(self):
-        return {str(k.value):str(v.value) for (k,v) in self.media_tags}