save config files and logs to user datadir

Author: gpdionisio

.settings/org.eclipse.core.resources.prefs

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import sys
-import os.path
+import os
 sys.path.append(os.path.join(os.path.dirname(__file__), 'src'))
 from PyQt5.QtWidgets import QApplication
 from PyQt5.Qt import Qt, QPixmap, QSplashScreen, QProgressBar, QColor, QPalette, QLabel
@@ -11,14 +11,14 @@
 if __name__ == '__main__':
     # Create App
     app = QApplication(sys.argv)
+    
     if getattr( sys, 'frozen', False ) :
         # running in a bundle
         imgDir = os.path.join(sys._MEIPASS, 'img')
-        #log_File = os.path.join(sys._MEIPASS, 'img')
-    else :
+        
+    else:
         # running live
-        imgDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'img')
-        #log_File = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lastLogs.html')     
+        imgDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'img')        
 
     ### --------------       
 

pet4l.py

@@ -15,7 +15,7 @@ with open(os.path.join(base_dir, 'src', 'version.txt')) as version_file:
 version_file.close()
 version_str = version_data["number"] + version_data["tag"]
 
-add_files = [('src/rpcServer.json', '.'), ('src/version.txt', '.'), ('img', 'img')]
+add_files = [('src/version.txt', '.'), ('img', 'img')]
 
 lib_path = next(p for p in sys.path if 'site-packages' in p)
 if os_type == 'win32':

specPet4l.spec

@@ -3,6 +3,7 @@
 import sys
 import os.path
 
+APPDATA_DIRNAME = ".PET4L-DATA"
 MPATH = "44'/77'/"
 WIF_PREFIX = 212 # 212 = d4
 MAGIC_BYTE = 30
@@ -12,4 +13,6 @@
 MINIMUM_FEE = 0.0001    # minimum PIV/kB
 starting_width = 1033
 starting_height = 785
-log_File = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lastLogs.html')
+home_dir = os.path.expanduser('~')
+user_dir = os.path.join(home_dir, APPDATA_DIRNAME)
+log_File = os.path.join(user_dir, 'lastLogs.html')

src/constants.py

@@ -5,7 +5,7 @@
 sys.path.append(os.path.join(os.path.dirname(__file__), 'src'))
 import signal
 from misc import getVersion, printDbg
-from constants import starting_height, starting_width
+from constants import starting_height, starting_width, user_dir
 from PyQt5.Qt import QMainWindow, QIcon, QAction
 from mainWindow import MainWindow
 from qt.dlg_configureRPCserver import ConfigureRPCserver_dlg
@@ -34,6 +34,9 @@ def __init__(self, imgDir):
         # Get version and title
         self.version = getVersion()
         self.title = 'PET4L - PIVX Emergency Tool For Ledger - v.%s-%s' % (self.version['number'], self.version['tag'])
+        # Create the userdir if it doesn't exist
+        if not os.path.exists(user_dir):
+            os.makedirs(user_dir)
         # Initialize user interface
         self.initUI(imgDir)
 

src/mainApp.py

@@ -54,8 +54,8 @@ def __init__(self, parent, imgDir):
         ###-- Create Queues and redirect stdout and stderr (eventually)
         self.queue = Queue()
         self.queue2 = Queue()
-        sys.stdout = WriteStream(self.queue)
-        sys.stderr = WriteStream(self.queue2)       
+        #sys.stdout = WriteStream(self.queue)
+        #sys.stderr = WriteStream(self.queue2)       
 
         ###-- Init last logs
         logFile = open(log_File, 'w+')

src/mainWindow.py

@@ -7,7 +7,7 @@
 import time
 from PyQt5.QtCore import QObject, pyqtSignal
 
-from constants import log_File
+from constants import log_File, user_dir
 
 def append_to_logfile(text):
     try:
@@ -148,14 +148,18 @@ def splitString(text, n):
 def readRPCfile():
     try:
         import simplejson as json
-        config_file = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), 'rpcServer.json')
-        with open(config_file) as data_file:
-            rpc_config = json.load(data_file)
-        data_file.close()
+        config_file = os.path.join(user_dir, 'rpcServer.json')
+        if os.path.exists(config_file):
+            with open(config_file) as data_file:
+                rpc_config = json.load(data_file)
+            data_file.close()
+        else:
+            raise Exception("No rpcServer.json found. Creating new.")
     except Exception as e:
-        printException(getCallerName(), getFunctionName(), "error reading RPC file", e.args)
-        return "127.0.0.1", "45458", "default_user", "default_pass"
+        # save default config and return it
+        config = {"rpc_ip": "127.0.0.1", "rpc_port": 45458, "rpc_user": "myUsername", "rpc_password": "myPassword"}
+        writeRPCfile(config)
+        return "127.0.0.1", 45458, "myUsername", "myPassword"
 
     rpc_ip = rpc_config.get('rpc_ip')
     rpc_port = int(rpc_config.get('rpc_port'))
@@ -182,11 +186,11 @@ def sec_to_time(seconds):
 def writeRPCfile(configuration):
     try:
         import simplejson as json
-        rpc_file = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), 'rpcServer.json')
+        rpc_file = os.path.join(user_dir, 'rpcServer.json')
         with open(rpc_file, 'w+') as data_file:
             json.dump(configuration, data_file)      
         data_file.close()
+
     except Exception as e:
         printException(getCallerName(), getFunctionName(), "error writing RPC file", e.args)
 

src/misc.py

@@ -23,16 +23,16 @@ def __init__(self, main_wnd):
 
     def initUI(self):
         self.ui = Ui_ConfigureRPCserverDlg()
-        self.ui.setupUi(self)
+        self.ui.setupUi(self, self.main_wnd)
 
 
     def loadRPCfile(self):
-        self.rpc_ip, self.rpc_port, self.rpc_user, self.rpc_password = readRPCfile()     
+        self.rpc_ip, self.rpc_port, self.rpc_user, self.rpc_password = readRPCfile()  
 
 
 
 class Ui_ConfigureRPCserverDlg(object):
-    def setupUi(self, ConfigureRPCserverDlg):
+    def setupUi(self, ConfigureRPCserverDlg, main_wnd):
         ConfigureRPCserverDlg.setModal(True)
         ## -- Layout
         self.layout = QGroupBox(ConfigureRPCserverDlg)