rework defaults and support song-info - issue #18

.gitignore

@@ -7,6 +7,7 @@ dist
 build
 eggs
 parts
+.idea
 bin
 var
 sdist
@@ -25,3 +26,5 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+img/usericons/popups.xml

README.md

@@ -1,4 +1,4 @@
-coverart-search-providers v1.1
+coverart-search-providers v1.2
 =========================
 
 Drop in Rhythmbox replacement for the default CoverArt Search plugin to provide new and updated coverart search providers both local and by internet image hosts
@@ -52,6 +52,9 @@ v1.1
  - fix bug to carry on search after binning poor MusicBrainz image download
  - restructure rate-limits to ensure faster downloads whilst keeping to providers rate-limits
 
+v1.2
+ - support song-info dialog for Rhythmbox 3.2
+
 Recommended order for Search Providers
 
  - embedded coverart

coverart_search_providers.plugin

@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python
+Loader=python3
 Module=coverart_search_providers
 IAge=2
 Depends=rb

coverart_search_providers.plugin.in

@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python
+Loader=python3
 Module=coverart_search_providers
 IAge=2
 Depends=rb

coverart_search_providers.plugin2

@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python3
+Loader=python
 Module=coverart_search_providers
 IAge=2
 Depends=rb

coverart_search_providers.plugin2.in

@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python3
+Loader=python
 Module=coverart_search_providers
 IAge=2
 Depends=rb

coverart_search_providers.py

@@ -103,17 +103,17 @@ class CoverArtAlbumSearchPlugin(GObject.Object, Peas.Activatable):
         self.artist_req_id = self.artist_store.connect("request", self.artist_art_requested)
         
 
-        peas = Peas.Engine.get_default()
-        loaded_plugins = peas.get_loaded_plugins()
+        self.peas = Peas.Engine.get_default()
+        loaded_plugins = self.peas.get_loaded_plugins()
 
-        self.peas_id = peas.connect_after('load-plugin', self.deactivate_plugin)
+        self.peas_id = self.peas.connect_after('load-plugin', self.deactivate_plugin)
 
         if 'artsearch' in loaded_plugins:
-            artsearch_info = peas.get_plugin_info('artsearch')
-            self._unload_artsearch( peas, artsearch_info )
+            artsearch_info = self.peas.get_plugin_info('artsearch')
+            self._unload_artsearch( self.peas, artsearch_info )
+
+        self.csi_id = self.shell.connect("create_song_info", self.create_song_info)
 
-        self.peas = peas
-        
         print("CoverArtBrowser DEBUG - end do_activate")
 
     def deactivate_plugin(self, engine, info):
@@ -137,7 +137,9 @@ class CoverArtAlbumSearchPlugin(GObject.Object, Peas.Activatable):
         free all the resources used by the plugin.
         '''
         print("CoverArtBrowser DEBUG - do_deactivate")
-        
+
+        self.shell.disconnect(self.csi_id)
+        self.csi_id = 0
         del self.shell
         del self.db
         self.art_store.disconnect(self.req_id)
@@ -151,6 +153,19 @@ class CoverArtAlbumSearchPlugin(GObject.Object, Peas.Activatable):
         
         print("CoverArtBrowser DEBUG - end do_deactivate")
 
+    def create_song_info(self, shell, song_info, is_multiple):
+        if is_multiple is False:
+            # following only valid for rhythmbox 3.2
+            try:
+                import sys
+                artsearch_dir = self.peas.get_plugin_info('artsearch').get_module_dir()
+                sys.path.append(artsearch_dir)
+                from songinfo import AlbumArtPage
+
+                x = AlbumArtPage(shell, song_info)
+            except:
+                pass
+
     def album_art_requested(self, store, key, last_time):
         searches = []
         

install.sh

@@ -77,9 +77,9 @@ mkdir -p $PLUGIN_PATH
 cp -r "${SCRIPT_PATH}"* "$PLUGIN_PATH"
 
 #install the plugin; the install path depends on the install mode
-if [[ $RB == false ]]
+if [[ $RB == true ]]
 then
-    mv "$PLUGIN_PATH"coverart_search_providers.plugin3 "$PLUGIN_PATH"coverart_search_providers.plugin
+    mv "$PLUGIN_PATH"coverart_search_providers.plugin2 "$PLUGIN_PATH"coverart_search_providers.plugin
 fi
 
 #remove the install script from the dir (not needed)

po/ru.po

@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: coverartbrowser\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-10 19:47+0100\n"
 "PO-Revision-Date: 2015-01-23 06:32+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/update_all_po.sh

@@ -9,4 +9,4 @@ done
 echo "update plugin file"
 
 intltool-merge -d . ../coverart_search_providers.plugin.in ../coverart_search_providers.plugin
-intltool-merge -d . ../coverart_search_providers.plugin3.in ../coverart_search_providers.plugin3
+intltool-merge -d . ../coverart_search_providers.plugin2.in ../coverart_search_providers.plugin2