Merge lp:~dobey/rhythmbox-ubuntuone/update-from-trunk into lp:rhythmbox-ubuntuone/stable-3-0

[dobey]

There Can Be Only One library path location
Remove the unnecessary symlink logic and only use U1LIBRARYPATH
Ensure plug-in is removed/added correctly when disabled and re-enabled

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~dobey/rhythmbox-ubuntuone/update-from-trunk]

114. By dobey on 2012-03-20

There Can Be Only One library path location
Remove the unnecessary symlink logic and only use U1LIBRARYPATH
Ensure plug-in is removed/added correctly when disabled and re-enabled

=== modified file 'ubuntuone/MusicStoreWidget.py'
--- ubuntuone/MusicStoreWidget.py	2012-03-06 20:51:27 +0000
+++ ubuntuone/MusicStoreWidget.py	2012-03-20 18:41:31 +0000
@@ -24,7 +24,6 @@
 from gi.repository.UbuntuOneUI import MusicStore as U1MusicStore
 # pylint: enable=E0611,F0401
 
-from dirspec import basedir
 from gettext import lgettext as _
 
 gettext.bindtextdomain("rhythmbox-ubuntuone", "/usr/share/locale")
@@ -56,7 +55,6 @@
         self.db = None
         self.shell = None
         self.source = None
-        self.u1_library_symlink = None
         self.entry_type = U1EntryType()
 
     def activate(self, shell):
@@ -86,15 +84,10 @@
         self.source.props.query_model = RB.RhythmDBQueryModel.new_empty(
             self.db)
 
-        # Do these every time
-        self.add_u1_library()
-
     def deactivate(self, shell):
         """Plugin shutdown."""
         # remove source
-        # FIXME?: This API changed, but doesn't seem entirely necessary.
-        #         It's not entirely clear which API to use for this now.
-        #self.source.delete_thyself()
+        self.source.delete_thyself()
         # delete held references
         del self.db
         del self.source
@@ -108,22 +101,17 @@
             pass
 
     def _udf_path_to_library_uri(self, path):
-        """Calculate the path in the library.
-        Since the library is accessed via the created symlink, but the path
-        passed to us is to a file in the actual music store UDF, we need to
-        work out the path inside the library, i.e., what the path to that file
-        is via the symlink."""
+        """Build a URI from the path for the song in the library."""
         if path.startswith(U1LIBRARYPATH):
-            subpath = path[len(U1LIBRARYPATH):]
+            library_path = path
         else:
             subpath = path
-        if subpath.startswith("/"):
-            subpath = subpath[1:]
-        library_path = os.path.join(self.u1_library_symlink, subpath)
+            if subpath.startswith("/"):
+                subpath = subpath[1:]
+            library_path = os.path.join(U1LIBRARYPATH, subpath)
         # convert path to URI. Don't use urllib for this; Python and
         # glib escape URLs differently. gio does it the glib way.
-        library_uri = Gio.File.new_for_path(library_path).get_uri()
-        return library_uri
+        return Gio.File.new_for_path(library_path).get_uri()
 
     def download_finished(self, source, path):
         """A file is finished downloading"""
@@ -160,34 +148,7 @@
         player = self.shell.get_property('shell-player')
         player.stop()
         player.play_entry(entry, self.source)
-
-    def add_u1_library(self):
-        """Add the U1 library if not listed in RB and re-add if changed."""
-        u1_library_path_folder = basedir.save_data_path("ubuntuone")
-        # Ensure that we can write to the folder, because syncdaemon creates it
-        # with no write permissions
-        os.chmod(u1_library_path_folder,
-            os.stat(u1_library_path_folder)[stat.ST_MODE] | stat.S_IWUSR)
-        # Translators: this is the name under Music for U1 music in Rhythmbox
-        u1_library_path = os.path.join(u1_library_path_folder,
-                                       _("Purchased from Ubuntu One"))
-        if not os.path.islink(u1_library_path):
-            if not os.path.exists(u1_library_path):
-                print "Attempting to symlink %s to %s" % (U1LIBRARYPATH,
-                                                          u1_library_path)
-                os.symlink(U1LIBRARYPATH, u1_library_path)
-            else:
-                # something that isn't a symlink already exists. That's not
-                # supposed to happen.
-                # Write a warning and carry on.
-                print ("Warning: library location %s existed. It should have "
-                    "been a symlink to %s, and it wasn't. This isn't supposed "
-                    "to happen. Carrying on anyway, on the assumption that "
-                    "you know what you're doing. If this is a problem, then "
-                    "delete or rename %s.") % (u1_library_path, U1LIBRARYPATH,
-                    u1_library_path)
-        self.u1_library_symlink = u1_library_path
-
+        
 
 class U1Source(RB.Source):
     """A Rhythmbox source widget for the U1 Music Store."""
@@ -248,7 +209,10 @@
     def add_music_store_widget(self):
         """Display the music store widget in Rhythmbox."""
         # pylint: disable=E1101
-        self.add(self.browser)
+        if self.browser.get_property('parent') is None:
+            self.add(self.browser)
+        else:
+            self.browser.reparent(self)
         self.browser.show()
         self.show()
         self.browser.set_property("visible", True)

=== modified file 'ubuntuone/ubuntuone.py'
--- ubuntuone/ubuntuone.py	2012-01-27 22:34:42 +0000
+++ ubuntuone/ubuntuone.py	2012-03-20 18:41:31 +0000
@@ -14,14 +14,13 @@
 # <http://www.gnu.org/licenses/>.
 """The Ubuntu One Rhythmbox plugin."""
 
-import os
-
+from dirspec.basedir import xdg_config_home
 # pylint: disable=E0611
-from gi.repository import Gio, GLib, GObject, Peas
+from gi.repository import Gio, GObject, Peas
 # pylint: enable=E0611
 
 # pylint: disable=W0403
-from MusicStoreWidget import U1MusicStoreWidget
+from MusicStoreWidget import U1MusicStoreWidget, U1LIBRARYPATH
 # pylint: enable=W0403
 
 
@@ -33,11 +32,6 @@
     def __init__(self):
         GObject.GObject.__init__(self)
 
-        # The folder where files get stored
-        self.u1_library_path_url = 'file://{0}'.format(
-            os.path.join(GLib.get_home_dir(),
-                         '.ubuntuone',
-                         'Purchased from Ubuntu One'))
         # RhythmDB settings so we can handle changes
         self.rdbconf = Gio.Settings('org.gnome.rhythmbox.rhythmdb')
         self.rdbconf.connect('changed::locations', self._locations_changed)
@@ -48,8 +42,8 @@
     def _locations_changed(self, *args, **kwargs):
         """Handle the locations setting being changed."""
         libraries = self.rdbconf.get_strv('locations')
-        if self.u1_library_path_url not in libraries:
-            libraries.append(self.u1_library_path_url)
+        if U1LIBRARYPATH not in libraries:
+            libraries.append(U1LIBRARYPATH)
             self.rdbconf.set_strv('locations', libraries)
 
     def do_activate(self):