Changeset e4fd983ab5272a9c6a78640f7734bd0f9b856416

Timestamp:

11/27/06 23:18:11 (2 years ago)

Author:

Jason Michalski <armooo@armooo.net>

git-committer:

Jason Michalski <armooo@armooo.net> 1164691091 +0000

git-parent:

[c96c0f8877f7062e6b90a42710f8afa79b8a2d85]

git-author:

Jason Michalski <armooo@armooo.net> 1164691091 +0000

Message:

pyTivo
- Added some custom sorting (still don't sort how the tivo asks)

Files:

• httpserver.py (modified) (2 diffs)

httpserver.py

@@ -1 @@
-shutil, os.path
+re
-from urllib import unquote_plus, quote, unquote
-from urlparse import urlparse
@@ -101 +101 @@
-        totalFiles = len(files)
-
+        def dir_sort(x, y):
+            xdir = os.path.isdir(os.path.join(path, x))
+            ydir = os.path.isdir(os.path.join(path, y))
+
+            if xdir and ydir:
+                return name_sort(x, y)
+            elif xdir:
+                return -1
+            elif ydir:
+                return 1
+            else:
+                return name_sort(x, y)
+
+        def name_sort(x, y):
+            numbername = re.compile(r'(\d*)(.*)')
+            m = numbername.match(x)
+            xNumber = m.group(1)
+            xStr = m.group(2)
+            m = numbername.match(y)
+            yNumber = m.group(1)
+            yStr = m.group(2)
+            
+            print xNumber, ':', xStr
+
+            if xNumber and yNumber:
+                xNumber, yNumber = int(xNumber), int(yNumber)
+                if xNumber == yNumber:
+                    return cmp(xStr, yStr)
+                else:
+                    return cmp(xNumber, yNumber)
+            elif xNumber:
+                return -1
+            elif yNumber:
+                return 1
+            else:
+                return cmp(xStr, yStr)
+
+        files.sort(dir_sort)
+
-        index = 0
-        if query.has_key('ItemCount'):