Ticket #784: fix.patch

src/widget/webinfo/lyrics.py

@@ -251 +251 @@
                 os.unlink(song.lyric_uri)
             vfs.makedirs( song.lyric_uri[:self.song.lyric_uri.rfind("/")] )
             try:
-                f = file(vfs.get_local_path_from_uri(song.lyric_uri),"w")
+                f = file(vfs.get_path_from_uri(song.lyric_uri),"w")
             except:pass
             else:
                 f.write( html )

src/song.py

@@ -773 +773 @@
     Some filename manipulation
     """
     def get_path(self):
-        try: return vfs.get_local_path_from_uri(self.get("uri"))
+        try: return vfs.get_path_from_uri(self.get("uri"))
         except : return ""
 
     def get_scheme(self):

src/vfs/vfsutils.py

@@ -51 +51 @@
 
 def islocaldir(uri):
     if not get_scheme(uri) == "file": return False
-    else: return os.path.isdir(get_local_path_from_uri(uri))
+    else: return os.path.isdir(get_path_from_uri(uri))
 
 def get_mime_type(uri):
     # Minimum mime_type support for webradio
@@ -65 +65 @@
 def read_entire_file(uri):
     data = ""
     if get_scheme(uri) == "file":
-        f = file(get_local_path_from_uri(uri),"r")
+        f = file(get_path_from_uri(uri),"r")
         data = f.read()
         f.close()
     else:
@@ -86 +86 @@
         return "file://"+pathname2url(os.path.abspath(os.path.expanduser(arg)))
 
 def get_name(value):
-    value = re.sub("^([A-Za-z]+):///+", "\\1:///", value)
-    return urlparse(value)[2].split("/")[-1]
+    return get_path_from_uri(value).split("/")[-1]
 
-def get_local_path_from_uri(value):
-    value = re.sub("^([A-Za-z]+):///+", "\\1:///", value)
+def get_path_from_uri(value):
+    if get_scheme(value) == "file":
+        # escape "#" otherwise it will be interpreted as a url fragment by urlparse
+        value = value.replace("#", "%23")
     return unquote(urlparse(value)[2])
 
 def unescape_string_for_display(value):
@@ -99 +100 @@
 def unlink(uri):
     if get_scheme(uri) != "file": return True
     else:
-        path = get_local_path_from_uri(uri)
+        path = get_path_from_uri(uri)
         return os.unlink(path)
 
 def exists(uri):
     if get_scheme(uri) != "file": return True
     else:
-        path = get_local_path_from_uri(uri)
+        path = get_path_from_uri(uri)
         return os.path.exists(path)
 
 def makedirs(uri,mode=0755):
@@ -162 +163 @@
 """ Return all folder in a folder excepted hidden one """
 def get_folder_in_folder(dir):
     dirs = set()
-    alldirs = [ get_local_path_from_uri(dir) ]
+    alldirs = [ get_path_from_uri(dir) ]
     for mdir in alldirs:
         for dirpath, dirs, names in os.walk(mdir):
             [ dirs.remove(dir) for dir in dirs if dir[0] == "." ]
@@ -173 +174 @@
 
 """ Return all uri in a folder excepted hidden one """
 def parse_folder(dir):
-    dir = get_local_path_from_uri(dir)
+    dir = get_path_from_uri(dir)
     uris = [ "file://"+os.path.join(dir,name) for name in os.listdir(dir) if name[0] != "." and os.path.isfile(os.path.join(dir,name)) ]
     print "W:Utils:ParseFolder:",len(uris),"founds"
     return uris
@@ -287 +288 @@
     return parse_uris(uris,True,True,func_cb,*param)
 
 def move_to_trash(uri):
-    path = get_local_path_from_uri(uri)
+    path = get_path_from_uri(uri)
     path = os.path.realpath(os.path.expanduser(path))
     if not os.path.exists(path): return False
     #find the trash folder

src/source/local.py

@@ -167 +167 @@
         added = []
         db_uris = set(ListenDB.get_all_uris())
 
-        alldirs = [ vfs.get_local_path_from_uri(dir) for dir in dirs ]
+        alldirs = [ vfs.get_path_from_uri(dir) for dir in dirs ]
         last_estimated = estimated = 0 
         total_dirs = len(alldirs)
         parsed_dirs = 0

src/source/ipod.py

@@ -142 +142 @@
                 track.remember_playback_position = 0x00
                 track.flag4 = 0x00 # Show Title/Album/Artist on the 'Now Playing' page
 
-            filename = str(vfs.get_local_path_from_uri(tmp_uri))
+            filename = str(vfs.get_path_from_uri(tmp_uri))
 
             for ltag,itag in IPOD_IDS.iteritems():
                 real_itag = itag.replace("@","").replace("#","")
@@ -205 +205 @@
             self.__current_transcode.stop()
         self.__current_transcode = None
         if self.uri_convert:
-            try: os.unlink(vfs.get_local_path_from_uri(self.uri_convert))
+            try: os.unlink(vfs.get_path_from_uri(self.uri_convert))
             except: pass
         self.cond.acquire()
         self.loginfo("%d song deleted from queue",len(self.__transfer_list))

src/source/podcast.py

@@ -360 +360 @@
                 if self.debug: print "I:PodcastDownloadJob:Start download:",uri
                 proxy = discover_http_proxy()
                 handle_read = urllib.urlopen(uri,None,proxy)
-                handle_write = file(vfs.get_local_path_from_uri(new_uri),"w")
+                handle_write = file(vfs.get_path_from_uri(new_uri),"w")
                 info = handle_read.info()
             
                 try: totalsize = int(info.getheader("content-length"))