Merge lp:~kolmis/wxbanker/xdg-base-dir into lp:wxbanker

[Michael Rooney]

[Michael Rooney (mrooney)]

I'll propose this for merging so I can get a nice diff and start testing it. Any important things to know? Is it functional from your understanding?

[Michael Rooney (mrooney)]

Excellent, this looks pretty good so I'm merging it into trunk. It doesn't actually comply with XDG but it lays the important ground work to do so; I'll implement the stub data and config methods in trunk. Thanks for this branch, it is much appreciated!

review: Approve

=== modified file 'accountlistctrl.py'
--- accountlistctrl.py	2009-04-22 01:48:05 +0000
+++ accountlistctrl.py	2009-04-28 21:09:07 +0000
@@ -439,7 +439,7 @@
     def onRemoveButton(self, event):
         if self.currentIndex is not None:
             account = self.accountObjects[self.currentIndex]
-            warningMsg = _("This will permanently remove the account '%s' and all its transactions. Continue?").decode("utf-8")
+            warningMsg = _("This will permanently remove the account '%s' and all its transactions. Continue?")
             dlg = wx.MessageDialog(self, warningMsg%account.Name, _("Warning"), style=wx.YES_NO|wx.ICON_EXCLAMATION)
             if dlg.ShowModal() == wx.ID_YES:
                 # Remove the account from the model.

=== modified file 'controller.py'
--- controller.py	2009-04-08 02:30:18 +0000
+++ controller.py	2009-05-03 07:50:49 +0000
@@ -215,7 +215,8 @@
 """
 
 from persistentstore import PersistentStore
-import wx, os, sys
+import wx
+import fileservice as fs
 from wx.lib.pubsub import Publisher
 import debug
 
@@ -225,8 +226,8 @@
         self._AutoSave = autoSave
         self.Models = []
         
+        self.InitConfig()
         self.LoadPath(path, use=True)
-        self.InitConfig()
         
         Publisher.subscribe(self.onAutoSaveToggled, "user.autosave_toggled")
         Publisher.subscribe(self.onSaveRequest, "user.saved")
@@ -237,9 +238,9 @@
         # have which differ from the default values of the types,
         # so initializing an Int to 0 or a Bool to False is not needed.
         self.wxApp = wx.App(False)
+        self.wxApp.SetAppName("wxBanker")
         self.wxApp.Controller = self
-            
-        config = wx.Config("wxBanker")
+        config = wx.Config(localFilename=fs.getConfigFilePath('wxBanker.cfg'))
         wx.Config.Set(config)
         if not config.HasEntry("SIZE_X"):
             config.WriteInt("SIZE_X", 800)
@@ -279,18 +280,7 @@
             
     def LoadPath(self, path, use=False):
         if path is None:
-            # Figure out where the bank database file is, and load it.
-            #Note: look at wx.StandardPaths.Get().GetUserDataDir() in the future
-            path = os.path.join(os.path.dirname(__file__), 'bank.db')
-            if not '--use-local' in sys.argv and 'HOME' in os.environ:
-                # We seem to be on a Unix environment.
-                preferredPath = os.path.join(os.environ['HOME'], '.wxbanker', 'bank.db')
-                if os.path.exists(preferredPath) or not os.path.exists(path):
-                    path = preferredPath
-                    # Ensure that the directory exists.
-                    dirName = os.path.dirname(path)
-                    if not os.path.exists(dirName):
-                        os.mkdir(dirName)
+            path=fs.getDataFilePath('bank.db')
         
         store = PersistentStore(path)
         store.AutoSave = self.AutoSave

=== modified file 'csvimporter.py'
--- csvimporter.py	2009-03-26 06:09:15 +0000
+++ csvimporter.py	2009-05-02 22:16:05 +0000
@@ -5,6 +5,7 @@
 from bankobjects import Transaction
 from wx.lib.pubsub import Publisher
 import codecs, csv, os, re
+import fileservice as fs
 try:
     import simplejson as json
 except:
@@ -57,21 +58,7 @@
 class CsvImporterProfileManager:
 
     def __init__(self):
-        configFile = 'csvImportProfiles.json'
-        
-        # copied from wxbanker.py
-        defaultPath = os.path.join(os.path.dirname(__file__), configFile)
-        if 'HOME' in os.environ:
-            # We seem to be on a Unix environment.
-            preferredPath = os.path.join(os.environ['HOME'], '.config', 'wxBanker', configFile)
-            if os.path.exists(preferredPath) or not os.path.exists(defaultPath):
-                defaultPath = preferredPath
-                # Ensure that the directory exists.
-                dirName = os.path.dirname(defaultPath)
-                if not os.path.exists(dirName):
-                    os.mkdir(dirName)
-        
-        self.configFile = defaultPath
+        self.configFile = fs.getConfigFilePath('csvImportProfiles.json')
         self.loadProfiles()
     
     def getProfile(self, key):

=== added file 'fileservice.py'
--- fileservice.py	1970-01-01 00:00:00 +0000
+++ fileservice.py	2009-05-02 22:32:49 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#    https://launchpad.net/wxbanker
+#    currencies.py: Copyright 2007-2009 Mike Rooney <[e-mail]>
+#
+#    This file is part of wxBanker.
+#
+#    wxBanker is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wxBanker is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.%
+
+import os, sys
+
+def __getFilePath(filename):
+    # Figure out where the bank database file is, and load it.
+    #Note: look at wx.StandardPaths.Get().GetUserDataDir() in the future
+    path = os.path.join(os.path.dirname(__file__), filename)
+    if not '--use-local' in sys.argv and 'HOME' in os.environ:
+        # We seem to be on a Unix environment.
+        preferredPath = os.path.join(os.environ['HOME'], '.wxbanker', filename)
+        if os.path.exists(preferredPath) or not os.path.exists(path):
+            path = preferredPath
+            # Ensure that the directory exists.
+            dirName = os.path.dirname(path)
+            if not os.path.exists(dirName):
+                os.mkdir(dirName)
+    return path
+    
+
+def getDataFilePath(filename):
+    return __getFilePath(filename)
+    
+def getConfigFilePath(filename):
+    return __getFilePath(filename)
+

=== modified file 'localization.py'
--- localization.py	2009-04-08 02:30:18 +0000
+++ localization.py	2009-04-28 21:09:07 +0000
@@ -33,7 +33,7 @@
 
 # Install gettext.
 import gettext
-gettext.install(APP, DIR)
+gettext.install(APP, DIR, unicode=True)
 
 # Check if the user forced a language with --lang=XX.
 import sys