[rhythmbox] plugins: lyrics: fix getting of cached lyrics
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] plugins: lyrics: fix getting of cached lyrics
- Date: Mon, 19 Dec 2011 09:42:08 +0000 (UTC)
commit d0647aacc9072b73aba0d56bdaf20efe59c3f26f
Author: Thiago Santos <thiago sousa santos collabora com>
Date: Tue Dec 13 11:13:24 2011 -0300
plugins: lyrics: fix getting of cached lyrics
Put the file:// prefix for cached lyrics uri.
Avoids getting an 'Operation not supported' due to gvfs not
identifying the protocol to use to open the resource.
plugins/lyrics/lyrics.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/plugins/lyrics/lyrics.py b/plugins/lyrics/lyrics.py
index 1bced69..add1659 100644
--- a/plugins/lyrics/lyrics.py
+++ b/plugins/lyrics/lyrics.py
@@ -27,6 +27,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
import os, re
+import urllib
import rb
from gi.repository import Gtk, Gio, GObject, Peas
@@ -158,7 +159,7 @@ class LyricGrabber(object):
if status:
l = rb.Loader()
- l.get_url(self.cache_path, callback)
+ l.get_url('file://' + urllib.pathname2url(self.cache_path), callback)
elif cache_only:
self.callback(_("No lyrics found"))
elif self.artist == "" and self.title == "":
@@ -419,7 +420,8 @@ class LyricsDisplayPlugin(GObject.Object, Peas.Activatable):
def lyrics_request (self, db, entry):
def lyrics_results(text):
- db.emit_entry_extra_metadata_notify (entry, 'rb:lyrics', text)
+ if text:
+ db.emit_entry_extra_metadata_notify (entry, 'rb:lyrics', text)
lyrics_grabber = LyricGrabber(db, entry)
lyrics_grabber.search_lyrics(lyrics_results)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]