rhythmbox r5727 - in trunk: . plugins/artdisplay/artdisplay

[jmatthew svn gnome org]

Author: jmatthew
Date: Sun Jun  8 08:55:55 2008
New Revision: 5727
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5727&view=rev

Log:
2008-06-08  Jonathan Matthew  <jonathan d14n org>

	patch by:  Andreas Henriksson  <andreas fatal se>

	* plugins/artdisplay/artdisplay/CoverArtDatabase.py:
	Move cover art cache directory to $XDG_CACHE_HOME.  From #502006.


Modified:
   trunk/ChangeLog
   trunk/plugins/artdisplay/artdisplay/CoverArtDatabase.py

Modified: trunk/plugins/artdisplay/artdisplay/CoverArtDatabase.py
==============================================================================
--- trunk/plugins/artdisplay/artdisplay/CoverArtDatabase.py	(original)
+++ trunk/plugins/artdisplay/artdisplay/CoverArtDatabase.py	Sun Jun  8 08:55:55 2008
@@ -39,7 +39,12 @@
 
 ART_SEARCHES_LOCAL = [LocalCoverArtSearch]
 ART_SEARCHES_REMOTE = [PodcastCoverArtSearch, AmazonCoverArtSearch]
-ART_FOLDER = '~/.gnome2/rhythmbox/covers'
+OLD_ART_FOLDER = '~/.gnome2/rhythmbox/covers'
+# complicated way of saying ~/.cache/rhythmbox/covers
+ART_FOLDER = os.path.join(os.environ.get('XDG_CACHE_HOME',
+		os.path.join(os.environ.get('XDG_HOME_DIR',
+				os.environ.get('HOME','~')),
+				'.cache')), 'rhythmbox/covers')
 ART_CACHE_EXTENSION_JPG = 'jpg'
 ART_CACHE_EXTENSION_PNG = 'png'
 ART_CACHE_FORMAT_JPG = 'jpeg'
@@ -93,8 +98,14 @@
 		artist = db.entry_get (entry, rhythmdb.PROP_ARTIST)
 		album = db.entry_get (entry, rhythmdb.PROP_ALBUM)
 		art_folder = os.path.expanduser (ART_FOLDER)
+		old_art_folder = os.path.expanduser (OLD_ART_FOLDER)
+		if not os.path.exists (art_folder) and os.path.exists (old_art_folder):
+			parent = os.path.dirname(os.path.abspath(art_folder))
+			if not os.path.exists (parent):
+				os.makedirs (parent)
+			os.rename (old_art_folder, art_folder)
 		if not os.path.exists (art_folder):
-			os.mkdir (art_folder)
+			os.makedirs (art_folder)
 
 		# FIXME: the following block of code is messy and needs to be redone ASAP
 		return art_folder + '/%s - %s.%s' % (artist.replace ('/', '-'), album.replace ('/', '-'), extension)