Merge lp:~linkinpark342/exaile/fullurl into lp:exaile/0.3.3

[Abhishek Mukherjee]

[Abhishek Mukherjee (linkinpark342)]

Forces exaile to only keep full absolute URI's internally.

Because of the unicode issue, tracks store a "file:///path" in unicode with no escaped characters, rather than a properly urlencoded one. This is so that we can look up the unicode os path again later. The player has to deal with any issues that come out of that when passing to gstreamer. All paths also become absolute rather than relative since absolute uri's are by definition absolute.

This branch will cause all users to have to delete their database and, more likely, nuke their ~/.local/share/exaile folder. This was discussed as acceptable on IRC since we are still in Alpha

[Abhishek Mukherjee (linkinpark342)]

Set the status to work in progress. I found a bug with unicode filenames. I'm going to hunt it down after my exams end.

[Abhishek Mukherjee (linkinpark342)]

Bug fixed, just a ~8 character change.

[Adam Olsen (arolsen)]

review: Approve

=== modified file 'xl/collection.py'
--- xl/collection.py	2009-03-18 21:59:28 +0000
+++ xl/collection.py	2009-04-13 21:34:43 +0000
@@ -28,6 +28,7 @@
 
 import os, time, os.path, shutil, logging
 import gobject
+import urllib
 
 logger = logging.getLogger(__name__)
 
@@ -504,23 +505,24 @@
         ccheck = {} # compilations dict
 
         count = 0
-        for folder in os.walk(self.location):
-            basepath = folder[0]
-            for filename in folder[2]:
+        for basepath, dirnames, filenames in os.walk(self.location):
+            for filename in filenames:
                 if self.collection:
                     if self.collection._scan_stopped: 
                         self.scanning = False
                         return False
                 count += 1
-                fullpath = os.path.join(basepath, filename)
+                path = os.path.abspath(os.path.join(basepath, filename))
+                fullpath = "file://" + path
 
                 try:
                     trmtime = db.get_track_attr(fullpath, "modified")
-                    mtime = os.path.getmtime(fullpath)
+                except:
+                    pass
+                else:
+                    mtime = os.path.getmtime(path)
                     if mtime == trmtime:
                         continue
-                except:
-                    pass
 
                 tr = db.get_track_by_loc(fullpath)
                 if tr:
@@ -553,6 +555,7 @@
             if not os.path.exists(f):
                 removals.append(db.get_track_by_loc(f))
         for tr in removals:
+            logging.info(u"Removing " + unicode(tr))
             db.remove(tr)
 
         self.scanning = False
@@ -625,8 +628,9 @@
         tr = self.collection.get_track_by_loc(loc)
         if tr:
             self.collection.remove(tr)
+            path = common.local_file_from_url(tr.get_loc_for_io())
             try:
-                os.unlink(tr.get_loc_for_io())
+                os.unlink(path)
             except OSError: # file not found?
                 pass
             except:

=== modified file 'xl/common.py'
--- xl/common.py	2008-12-28 17:58:55 +0000
+++ xl/common.py	2009-04-13 20:21:28 +0000
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-import locale, os, time, threading, urllib, re, random, string
+import locale, os, time, threading, urllib, re, random, string, urlparse
 import traceback
 import logging
 
@@ -155,17 +155,12 @@
         text = text.replace(old, new)
     return text
 
-def to_url(path):
-    """
-        Converts filesystem path to URL. Returns the input unchanged if it's not
-        an FS path (i.e. a URL or something invalid).
-    """
-    if re.search(r'^[\w]+://', path):
-        return path
-    try:
-        return 'file://' + urllib.pathname2url(path)
-    except IOError:
-        return path
+def local_file_from_url(url):
+    """
+        Returns a local file path based on a url
+    """
+    split = urlparse.urlsplit(url)
+    return urlparse.urlunsplit(('', '') + split[2:])
 
 class idict(dict): 
     """

=== modified file 'xl/cover.py'
--- xl/cover.py	2009-03-24 23:16:10 +0000
+++ xl/cover.py	2009-04-13 21:42:40 +0000
@@ -456,7 +456,7 @@
     def find_covers(self, track, limit=-1):
         covers = []
         try:
-            search_dir = os.path.dirname(track.get_loc())
+            search_dir = os.path.dirname(track.local_file_name())
         except AttributeError:
             raise NoCoverFoundException()
 

=== modified file 'xl/metadata/__init__.py'
--- xl/metadata/__init__.py	2009-03-15 04:05:49 +0000
+++ xl/metadata/__init__.py	2009-04-13 18:38:41 +0000
@@ -16,6 +16,7 @@
 
 # do this so formats can inherit from stuff in _base
 from _base import *
+import urlparse
 
 import asf, flac, mod, mp3, mp4, mpc, ogg, sid, speex, tta, wav, wv
 

=== modified file 'xl/metadata/_base.py'
--- xl/metadata/_base.py	2009-01-13 20:22:25 +0000
+++ xl/metadata/_base.py	2009-04-18 06:01:50 +0000
@@ -14,6 +14,9 @@
 
 import os
 from xl import common
+import urlparse
+import urllib
+import urllib2
 
 import logging
 logger = logging.getLogger(__name__)
@@ -42,14 +45,22 @@
         """
             Loads the tags from the file.
         """
-        if self.MutagenType:
-            try:
-                self.mutagen = self.MutagenType(self.loc)
-            except:
-                logger.error("Couldn't read tags from possibly corrupt " \
-                        "file %s" % self.loc)
-                #common.log_exception(logger)
-                raise NotReadable
+        try:
+            self.url = urllib2.urlopen(self.loc)
+        except urllib2.URLError, urllib2.HTTPError:
+            logger.error("Couldn't open url to file %s" % self.loc)
+            raise NotReadable
+        loc = urlparse.urlsplit(self.loc)
+        if loc[0] == "file":
+            if self.MutagenType:
+                file_loc = common.local_file_from_url(self.loc)
+                try:
+                    self.mutagen = self.MutagenType(file_loc)
+                except:
+                    logger.error("Couldn't read tags from possibly corrupt " \
+                            "file %s" % file_loc)
+                    #common.log_exception(logger)
+                    raise NotReadable
 
     def save(self):
         """
@@ -62,7 +73,8 @@
         if self.MutagenType:
             return self.mutagen            
         else:
-            return {'title':os.path.split(self.loc)[-1]}
+            path = common.local_file_from_url(self.loc)
+            return {'title':os.path.split(path)[-1]}
 
     def _get_tag(self, raw, tag):
         try:

=== modified file 'xl/player.py'
--- xl/player.py	2009-04-14 18:39:32 +0000
+++ xl/player.py	2009-04-18 06:01:50 +0000
@@ -22,7 +22,7 @@
 
 from xl import common, event, playlist, settings
 import random, time, os, logging, urllib
-from urlparse import urlparse
+import urlparse
 
 
 try:
@@ -446,10 +446,13 @@
 
     def _get_track_uri(self, track):
         uri = track.get_loc_for_io()
-        parsed = urlparse(uri)
-        if parsed[0] == "":
-            uri = "file://" + urllib.pathname2url(uri)
-        uri = uri.encode(common.get_default_encoding())
+        split = urlparse.urlsplit(uri)
+        assert split[0] != "", _("Exaile now uses absolute URI's, please "
+                                 "delete/rename your %s directory") \
+                                         % xdg.data_home
+        path = common.local_file_from_url(uri)
+        path = urllib.pathname2url(path)
+        uri = urlparse.urlunsplit(split[0:2] + (path, '', ''))
         return uri
 
     def __notify_source(self, *args):
@@ -478,7 +481,7 @@
 
         # make sure the file exists if this is supposed to be a local track
         if track.is_local():
-            if not os.path.exists(track.get_loc()):
+            if not track.exists():
                 logger.error(_("File does not exist: %s") % 
                     track.get_loc())
                 return False
@@ -490,7 +493,7 @@
         self.reset_playtime_stamp()
 
         self.playbin.set_property("uri", uri)
-        if uri.startswith("cdda://"):
+        if urlparse.urlsplit(uri)[0] == "cdda":
             self.notify_id = self.playbin.connect('notify::source',
                     self.__notify_source)
 

=== modified file 'xl/playlist.py'
--- xl/playlist.py	2009-04-14 17:34:36 +0000
+++ xl/playlist.py	2009-04-14 23:33:28 +0000
@@ -40,7 +40,7 @@
     except ImportError:
         import elementtree as ETree
 
-from urlparse import urlparse
+import urlparse
 import logging
 logger = logging.getLogger(__name__)
 
@@ -209,7 +209,7 @@
     for track in playlist:
         handle.write("<entry>\n")
         handle.write("  <title>%s</title>\n" % track['title'])
-        handle.write("  <ref href=\"%s\" />\n" % urllib.quote(track.get_loc()))
+        handle.write("  <ref href=\"%s\" />\n" % track.get_loc())
         handle.write("</entry>\n")
     
     handle.write("</asx>")
@@ -222,7 +222,7 @@
     pl = Playlist(name=name)
     for t in tracks:
         tr = track.Track()
-        loc = urllib.unquote(t.find("ref").get("href"))
+        loc = t.find("ref").get("href")
         tr.set_loc(loc)
         tr['title'] = t.find("title").text.strip()
         tr.read_tags()
@@ -254,11 +254,8 @@
             if track[tag] == u"":
                 continue
             handle.write("      <%s>%s</%s>\n" % (xs, track[tag],xs) )
-        url = urllib.quote(track.get_loc())
-        if urlparse(track.get_loc())[0] == "":
-            handle.write("      <location>file://%s</location>\n" % url)
-        else:
-            handle.write("      <location>%s</location>\n" % url)
+        url = track.get_loc()
+        handle.write("      <location>%s</location>\n" % url)
         handle.write("    </track>\n")
     
     handle.write("  </trackList>\n")
@@ -274,7 +271,7 @@
     pl = Playlist(name=name)
     for t in tracks:
         tr = track.Track()
-        loc = urllib.unquote(t.find("%slocation"%ns).text.strip())
+        loc = t.find("%slocation"%ns).text.strip()
         tr.set_loc(loc)
         for xs, tag in XSPF_MAPPING.iteritems():
             try:
@@ -441,7 +438,7 @@
             track: the track to add [Track]
             location: the index to insert at [int]
         """
-        if os.path.exists(track.get_loc_for_io()) or not ignore_missing_files:
+        if track.exists() or not ignore_missing_files:
             self.add_tracks([track], location)
 
     def add_tracks(self, tracks, location=None, add_duplicates=True):

=== modified file 'xl/track.py'
--- xl/track.py	2009-03-24 23:16:10 +0000
+++ xl/track.py	2009-04-18 06:01:50 +0000
@@ -20,6 +20,9 @@
 import xl.metadata as metadata
 from xl.common import lstrip_special
 import logging, traceback
+import urlparse
+import urllib
+import urllib2
 logger = logging.getLogger(__name__)
 
 settings = settings.SettingsManager.settings
@@ -61,8 +64,10 @@
             
             loc: the location [string]
         """
-        if loc.startswith("file://"):
-            loc = loc[7:]
+        split = urlparse.urlsplit(loc)
+        if split[0] == "":
+            loc = os.path.abspath(loc)
+            loc = urlparse.urlunsplit(('file', split[1], loc, '', ''))
         self['loc'] = loc
        
     def get_loc(self):
@@ -77,6 +82,22 @@
         except:
             return self['loc']
 
+    def exists(self):
+        if self.is_local():
+            return os.path.exists(self.local_file_name())
+        else:
+            try:
+                urllib2.urlopen(self.get_loc_for_io())
+            except urllib2.URLError, urllib2.HTTPError:
+                return False
+            else:
+                return True
+
+    def local_file_name(self):
+        if not self.is_local():
+            return None
+        return common.local_file_from_url(self.get_loc_for_io())
+
     def get_loc_for_io(self):
         """
             Gets the location in its original form. should always be correct.
@@ -207,9 +228,11 @@
                 
 
             # fill out file specific items
-            mtime = os.path.getmtime(self.get_loc_for_io())
+            split = urlparse.urlsplit(self.get_loc_for_io())
+            path = self.local_file_name()
+            mtime = os.path.getmtime(path)
             self['modified'] = mtime
-            self['basedir'] = os.path.dirname(self.get_loc_for_io())
+            self['basedir'] = os.path.dirname(path)
             self._dirty = True
             return f
         except:
@@ -217,7 +240,7 @@
             return False
 
     def is_local(self):
-        return urlparse(self.get_loc())[0] == ""
+        return urlparse.urlsplit(self.get_loc()).scheme == "file"
 
     def get_track(self):
         """