Merge lp:~kiddo/recipe-manager/xdg-dirs into lp:recipe-manager

[Jeff Fortin Tam]

This implements saving the recipes into the user's home directory according to the XDG spec. I have tested this branch and it seems to work for me. Please test, check that the code makes sense, and merge it.

[Daniel G. Taylor (danielgtaylor)]

review: Approve

=== renamed file 'photos/default.jpg' => 'default_photo.jpg'
=== modified file 'librecipemanager/edit_dialog.py'
--- librecipemanager/edit_dialog.py	2010-09-21 14:48:47 +0000
+++ librecipemanager/edit_dialog.py	2010-09-29 03:38:39 +0000
@@ -30,7 +30,7 @@
 import gobject
 import gtk, gtk.glade, gtk.gdk
 
-from globals import GLADE_FILE, PHOTO_DIR, MEASURES
+from globals import GLADE_FILE, PHOTO_DIR, DEFAULT_PHOTO, MEASURES
 from recipe import Ingredient
 
 class RecipeEditDialog:
@@ -95,7 +95,10 @@
 		if recipe:
 			self.name.set_text(recipe.name)
 			self.desc.get_buffer().set_text(recipe.description)
-			self.photo.set_filename(os.path.join(PHOTO_DIR, recipe.photo))
+			if recipe.photo:
+				self.photo.set_filename(os.path.join(PHOTO_DIR, recipe.photo))
+			else:
+				self.photo.set_filename(DEFAULT_PHOTO)
 			self.cuisine.set_active(recipe.cuisine)
 			self.course.set_active(recipe.course)
 			self.servings.set_value(recipe.servings)

=== modified file 'librecipemanager/globals.py'
--- librecipemanager/globals.py	2010-09-21 14:48:47 +0000
+++ librecipemanager/globals.py	2010-09-29 03:38:39 +0000
@@ -27,15 +27,23 @@
 
 import os, os.path
 import sys
+import xdg.BaseDirectory as xdg_dirs  # Freedesktop directories spec
 
 # The main directory where e.g. interface files are stored
 DATA_DIR = os.path.abspath(os.path.dirname(sys.argv[0]))
 
 # The directory where recipe photos are stored
-PHOTO_DIR = os.path.join(DATA_DIR, "photos")
+PHOTO_DIR = os.path.join(xdg_dirs.xdg_data_home, "recipe-manager", "photos")
+if not os.path.isdir(PHOTO_DIR):
+	os.makedirs(PHOTO_DIR)
+
+# The path for the default image when recipe.photo == None
+DEFAULT_PHOTO = os.path.join(DATA_DIR, "default_photo.jpg")
 
 # The directory where recipe xml files are stored
-RECIPE_DIR = os.path.join(DATA_DIR, "recipes")
+RECIPE_DIR = os.path.join(xdg_dirs.xdg_data_home, "recipe-manager", "recipes")
+if not os.path.isdir(RECIPE_DIR):
+	os.makedirs(RECIPE_DIR)
 
 # The directory where themes are stored
 THEME_DIR = os.path.join(DATA_DIR, "themes")

=== modified file 'librecipemanager/main_window.py'
--- librecipemanager/main_window.py	2010-09-29 03:24:14 +0000
+++ librecipemanager/main_window.py	2010-09-29 03:38:39 +0000
@@ -34,8 +34,13 @@
 import xml.parsers.expat
 
 from globals import GLADE_FILE, CONFIG_PATH, RECIPE_DIR, PHOTO_DIR, \
+<<<<<<< TREE
 					CUISINES, COURSES, MEASURES
 from utils import config_get, create_menu_item, archive_from_recipe, extract_recipe_archive
+=======
+					DEFAULT_PHOTO, CUISINES, COURSES, MEASURES
+from utils import config_get, create_menu_item, archive_from_recipe
+>>>>>>> MERGE-SOURCE
 from recipe import Recipe
 from widgets import RecipeList
 from view_dialog import RecipeViewDialog

=== modified file 'librecipemanager/recipe.py'
--- librecipemanager/recipe.py	2010-09-21 14:48:47 +0000
+++ librecipemanager/recipe.py	2010-09-29 03:38:39 +0000
@@ -109,7 +109,7 @@
 	def __init__(self, filename=None):
 		self.name = "New Recipe"
 		self.description = "Description"
-		self.photo = "default.jpg"
+		self.photo = None
 		self.cuisine = 0
 		self.course = 0
 		self.servings = 1

=== modified file 'librecipemanager/recipe_cell_renderer.py'
--- librecipemanager/recipe_cell_renderer.py	2010-09-21 21:08:57 +0000
+++ librecipemanager/recipe_cell_renderer.py	2010-09-29 03:38:39 +0000
@@ -30,7 +30,7 @@
 import gtk
 import pango
 
-from globals import PHOTO_DIR
+from globals import PHOTO_DIR, DEFAULT_PHOTO
 from utils import create_layout, draw_photo_with_border
 
 class RecipeCellRenderer(gtk.GenericCellRenderer):
@@ -93,7 +93,11 @@
 		"""
 		default_size = widget.get_style().font_desc.get_size() / pango.SCALE
 		
-		filename = os.path.join(PHOTO_DIR, self.recipe.photo)
+		#FIXME: This method is called WAY too often. Put a print and see.
+		if self.recipe.photo:
+			filename = os.path.join(PHOTO_DIR, self.recipe.photo)
+		else:
+			filename = DEFAULT_PHOTO
 		photo = gtk.gdk.pixbuf_new_from_file_at_size(filename, self._photo_size,
 													 self._photo_size)
 		

=== modified file 'librecipemanager/utils.py'
--- librecipemanager/utils.py	2010-09-21 21:46:33 +0000
+++ librecipemanager/utils.py	2010-09-29 03:38:39 +0000
@@ -33,7 +33,7 @@
 import math
 import tarfile
 
-from globals import CONFIG_PATH, RECIPE_DIR, PHOTO_DIR
+from globals import CONFIG_PATH, RECIPE_DIR, PHOTO_DIR, DEFAULT_PHOTO
 
 _config = None
 
@@ -240,9 +240,15 @@
 		when being imported.
 	"""
 	archive = tarfile.open(filename, "w:gz")
-	os.chdir(PHOTO_DIR)
-	archive.add(os.path.basename(recipe.photo),
-				os.path.join("photos", os.path.basename(recipe.photo)))
+	
+	# FIXME: Not sure if we should actually add a picture if == None
+	if recipe.photo:
+		os.chdir(PHOTO_DIR)
+		photo_to_add = os.path.basename(recipe.photo)
+	else:
+		photo_to_add = DEFAULT_PHOTO
+	archive.add(photo_to_add,
+				os.path.join("photos", photo_to_add))
 	os.chdir(RECIPE_DIR)
 	archive.add(os.path.basename(recipe.filename),
 				os.path.join("recipes", os.path.basename(recipe.filename)))