Changeset 30e2af11384e52f526f8932a992d2bfe122f98ec

Timestamp:

01/03/08 02:39:10 (1 year ago)

Author:

William McBrine <wmcbrine@gmail.com>

git-committer:

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

git-parent:

[89da5bcdb8ef59361933355f425667d5a32bdb1e]

git-author:

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

Message:

Recurse through playlists.

Files:

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

plugin.py

@@ -79 +79 @@
-                anchor = unquote(anchor)
-                anchor = anchor.replace(os.path.sep + cname, local_base_path)
-
+
+
-
-                if type(files[0]) == str:

plugins/music/music.py

@@ -172 +172 @@
-        handler.wfile.write(page)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        try:
-subc
-subc
+list_
+list_
-            list_file = urllib.urlopen(list_name)
-        except:
-            list_name = self.get_local_path(handler, query)
-            list_file = open(list_name)
-            local_path = os.path.sep.join(list_name.split(os.path.sep)[:-1])
+
-        ext = os.path.splitext(list_name)[1].lower()
-
@@ -299 +248 @@
-                playlist[i].name = os.path.normpath(name)
-
+        if recurse:
+            newlist = []
+            for i in playlist:
+                if i.isplay:
+                    newlist.extend(self.parse_playlist(i.name, recurse))
+                else:
+                    newlist.append(i)
+
+            playlist = newlist
+
+        return playlist
+
+    def get_files(self, handler, query, filterFunction=None):
+
+        def build_recursive_list(path, recurse=True):
+            files = []
+            for f in os.listdir(path):
+                f = os.path.join(path, f)
+                isdir = os.path.isdir(f)
+                if recurse and isdir:
+                    files.extend(build_recursive_list(f))
+                else:
+                   fd = FileData(f, isdir)
+                   if recurse and fd.isplay:
+                       files.extend(self.parse_playlist(f, recurse))
+                   elif isdir or filterFunction(f, file_type):
+                       files.append(fd)
+            return files
+
+        def dir_sort(x, y):
+            if x.isdir == y.isdir:
+                if x.isplay == y.isplay:
+                    return name_sort(x, y)
+                else:
+                    return y.isplay - x.isplay
+            else:
+                return y.isdir - x.isdir
+
+        def name_sort(x, y):
+            return cmp(x.name, y.name)
+
+        subcname = query['Container'][0]
+        cname = subcname.split('/')[0]
+        path = self.get_local_path(handler, query)
+
+        file_type = query.get('Filter', [''])[0]
+
+        recurse = query.get('Recurse',['No'])[0] == 'Yes'
+        filelist = build_recursive_list(path, recurse)
+
+        # Sort
+        if query.get('SortOrder',['Normal'])[0] == 'Random':
+            seed = query.get('RandomSeed', ['1'])[0]
+            self.random_lock.acquire()
+            random.seed(seed)
+            random.shuffle(filelist)
+            self.random_lock.release()
+        else:
+            filelist.sort(dir_sort)
+
+        # Trim the list
+        return self.item_count(handler, query, cname, filelist)
+
+    def get_playlist(self, handler, query):
+        subcname = query['Container'][0]
+        cname = subcname.split('/')[0]
+
+        try:
+            url = subcname.index('http://')
+            list_name = subcname[url:]
+        except:
+            list_name = self.get_local_path(handler, query)
+
+        recurse = query.get('Recurse',['No'])[0] == 'Yes'
+        playlist = self.parse_playlist(list_name, recurse)
+
-        # Trim the list
-        return self.item_count(handler, query, cname, playlist)