← Back to branch summary

~osomon/phatch/extract-all-metadata

« back to all changes in this revision

Viewing changes to phatch/core/models.py

  • Committer: spe.stani.be at gmail
  • Date: 2010-03-11 16:02:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1795.
  • Revision ID: spe.stani.be@gmail.com-20100311160211-4i54s0voyymzoi4s
implementing the context modules

Show diffs side-by-side

added added

removed removed

Lines of Context:
phatch/core/models.py
38
38
from lib.reverse_translation import _t
39
39
from config import PATHS
40
40
from lib import openImage
41
 
from lib.desktop import DESKTOP_FOLDER, USER_FOLDER
42
 
if DESKTOP_FOLDER == USER_FOLDER:
43
 
    DESKTOP_FOLDER = os.path.expanduser('~/phatch')
 
41
from lib.desktop import DESKTOP_PATH, USER_PATH
 
42
if DESKTOP_PATH == USER_PATH:
 
43
    DESKTOP_PATH = os.path.expanduser('~/phatch')
44
44
 
45
45
from safeGlobals import safe_globals
46
46
Field.set_globals(safe_globals())
151
151
                photo.log('Could not save "%s" in "%s":\n%s\n'\
152
152
                    % (base, folder, message))
153
153
                photo.log('Will try to save in "%s" instead.\n'\
154
 
                    % DESKTOP_FOLDER)
155
 
            self.ensure_path(DESKTOP_FOLDER)
156
 
            filename = os.path.join(DESKTOP_FOLDER, base)
 
154
                    % DESKTOP_PATH)
 
155
            self.ensure_path(DESKTOP_PATH)
 
156
            filename = os.path.join(DESKTOP_PATH, base)
157
157
        return filename
158
158
 
159
159
    # field classes which are specific to Phatch and