Changeset a0bb213a2bf17582d50549a14fabeeca44ab24dc

Timestamp:

12/30/07 00:27:01 (1 year ago)

Author:

William McBrine <wmcbrine@gmail.com>

git-committer:

William McBrine <wmcbrine@gmail.com> 1198996021 -0500

git-parent:

[22be2e4c19ddc2ad9e8edce0a31a274421a66c3d]

git-author:

William McBrine <wmcbrine@gmail.com> 1198996021 -0500

Message:

Unified item_count()

Files:

• plugin.py (modified) (2 diffs)
• plugins/music/music.py (modified) (1 diff)
• plugins/photo/photo.py (modified) (1 diff)

plugin.py

@@ -61 +61 @@
-    def item_count(self, handler, query, cname, files):
-        """Return only the desired portion of the list, as specified by 
-
+
+
-        """
-        totalFiles = len(files)
@@ -80 +81 @@
-                anchor = os.path.normpath(anchor)
-
+                if type(files[0]) == str:
+                    filenames = files
+                else:
+                    filenames = [x.name for x in files]
-                try:
-
+name
-                except ValueError:
-                    print 'Anchor not found:', anchor  # just use index = 0

plugins/music/music.py

@@ -171 +171 @@
-        handler.end_headers()
-        handler.wfile.write(page)
-
-    def item_count(self, handler, query, cname, files):
-        """Return only the desired portion of the list, as specified by 
-           ItemCount, AnchorItem and AnchorOffset
-        """
-        totalFiles = len(files)
-        index = 0
-
-        if query.has_key('ItemCount'):
-            count = int(query['ItemCount'][0])
-
-            if query.has_key('AnchorItem'):
-                bs = '/TiVoConnect?Command=QueryContainer&Container='
-                local_base_path = self.get_local_base_path(handler, query)
-
-                anchor = query['AnchorItem'][0]
-                if anchor.startswith(bs):
-                    anchor = anchor.replace(bs, '/')
-                anchor = unquote(anchor)
-                anchor = anchor.replace(os.path.sep + cname, local_base_path)
-                anchor = os.path.normpath(anchor)
-
-                filenames = [x.name for x in files]
-                try:
-                    index = filenames.index(anchor)
-                except ValueError:
-                    print 'Anchor not found:', anchor  # just use index = 0
-
-                if count > 0:
-                    index += 1
-
-                if query.has_key('AnchorOffset'):
-                    index += int(query['AnchorOffset'][0])
-
-                #foward count
-                if count > 0:
-                    files = files[index:index + count]
-                #backwards count
-                elif count < 0:
-                    if index + count < 0:
-                        count = -index
-                    files = files[index + count:index]
-                    index += count
-
-            else:  # No AnchorItem
-
-                if count >= 0:
-                    files = files[:count]
-                elif count < 0:
-                    index = count % len(files)
-                    files = files[count:]
-
-        return files, totalFiles, index
-
-    def get_files(self, handler, query, filterFunction=None):

plugins/photo/photo.py

@@ -305 +305 @@
-        handler.wfile.write(page)
-
-    def item_count(self, handler, query, cname, files):
-        """Return only the desired portion of the list, as specified by 
-           ItemCount, AnchorItem and AnchorOffset
-        """
-        totalFiles = len(files)
-        index = 0
-
-        if query.has_key('ItemCount'):
-            count = int(query['ItemCount'][0])
-
-            if query.has_key('AnchorItem'):
-                bs = '/TiVoConnect?Command=QueryContainer&Container='
-                local_base_path = self.get_local_base_path(handler, query)
-
-                anchor = query['AnchorItem'][0]
-                if anchor.startswith(bs):
-                    anchor = anchor.replace(bs, '/')
-                anchor = unquote(anchor)
-                anchor = anchor.replace(os.path.sep + cname, local_base_path)
-                anchor = os.path.normpath(anchor)
-
-                filenames = [x.name for x in files]
-                try:
-                    index = filenames.index(anchor)
-                except ValueError:
-                    pass  # anchor not found, just use index = 0
-
-                if count > 0:
-                    index += 1
-
-                if query.has_key('AnchorOffset'):
-                    index += int(query['AnchorOffset'][0])
-
-                #foward count
-                if count > 0:
-                    files = files[index:index + count]
-                #backwards count
-                elif count < 0:
-                    if index + count < 0:
-                        count = -index
-                    files = files[index + count:index]
-                    index += count
-
-            else:  # No AnchorItem
-
-                if count >= 0:
-                    files = files[:count]
-                elif count < 0:
-                    index = count % len(files)
-                    files = files[count:]
-
-        return files, totalFiles, index
-
-    def get_files(self, handler, query, filterFunction):
-