← Back to branch summary

~timo-jyrinki/ubuntu/utopic/rhythmbox/enable_grilo_rhythmbox

« back to all changes in this revision

Viewing changes to plugins/lyrics/lyrics/__init__.py

Tags: upstream-0.11.99.1
Import upstream version 0.11.99.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/lyrics/lyrics/__init__.py
94
94
def build_cache_path(artist, title):
95
95
        folder = gconf.client_get_default().get_string(gconf_keys['folder'])
96
96
        if folder is None:
97
 
                folder = "~/.lyrics"
 
97
                folder = os.path.join(rb.user_cache_dir(), "lyrics")
98
98
 
99
99
        lyrics_folder = os.path.expanduser (folder)
100
100
        if not os.path.exists (lyrics_folder):
101
101
                os.mkdir (lyrics_folder)
102
102
 
103
 
        artist_folder = lyrics_folder + '/' + artist[:128]
 
103
        artist_folder = os.path.join(lyrics_folder, artist[:128])
104
104
        if not os.path.exists (artist_folder):
105
105
                os.mkdir (artist_folder)
106
106
 
107
 
        return artist_folder + '/' + title[:128] + '.lyric'
 
107
        return os.path.join(artist_folder, title[:128] + '.lyric')
108
108
 
109
109
class LyricGrabber(object):
110
110
        def __init__(self, db, entry):
111
 
                self.loader = rb.Loader ()
112
111
                self.db = db
113
112
                self.entry = entry
114
113
                
128
127
                status = self.verify_lyric()
129
128
                
130
129
                if status:
131
 
                        self.loader.get_url(self.cache_path, callback)
 
130
                        l = rb.Loader()
 
131
                        l.get_url(self.cache_path, callback)
132
132
                else:
133
133
                        if cache_only:
134
134
                                self.callback(_("No lyrics found"))