versioning tweak

Author: notklaatu

usr/share/pyshared/stopgolibs/about.py

@@ -1,5 +1,6 @@
 import wx
 import os
+from datetime import date
 
 def OnAboutBox(self):
 
@@ -24,8 +25,8 @@ def OnAboutBox(self):
     info.SetName('StopGo')
     info.SetVersion('0.8.18')
     info.SetDescription(description)
-    info.SetCopyright('(C) VERSION_STRING6 - VERSION_STRING7 Seth Kenlon')
-    info.SetWebSite('http://www.makerbox.co.nz')
+    info.SetCopyright('(C) 2016 - ' + str(date.today().year) + ' Seth Kenlon')
+    info.SetWebSite('http://makerbox.org.nz')
     info.SetLicence(licence)
     info.AddDeveloper('Klaatu, Seth Kenlon, Jess Weichler')
 

usr/share/pyshared/stopgolibs/app.py

@@ -15,7 +15,10 @@ def getOptions():
     parser.add_argument("project",nargs="?")
     parser.add_argument("-c", "--config",nargs="?",dest='config',
                         help="Optional path to a non-default config file.")
-    parser.add_argument("-d", "--debug",dest='debug',action='store_true',help="Run in debug mode.")
+    parser.add_argument("-l", "--logfile",nargs="?",dest='logfile',
+                        help="Optional path to log file. Default is /tmp")
+    parser.add_argument("-v", "--verbose",dest='verbose',action='store_true',help="Print debugging to terminal.")
+    #parser.add_argument("-w", "--which",dest='which',action='store_true',help="Print version to terminal.")
     parser.add_argument("-s", "--shell",dest='shell',action='store_true',help="Keep it in the shell. Do not launch the GUI.")
     parser.add_argument("-m", "--make-project",nargs="?",dest='make',
                         help="Path to a directory of sequential images to load as if it were a StopGo project.")

usr/share/pyshared/stopgolibs/gui.py

@@ -30,15 +30,19 @@
 
 class GUI(wx.Frame):
     def __init__(self, parent, id, title, style, clargs):
-        HANDLER = logging.handlers.WatchedFileHandler(os.environ.get("LOGFILE", os.path.join(os.path.expanduser('~'), 'stopgo.log')))
+        if _plat.startswith('win'):
+            HANDLER = logging.handlers.WatchedFileHandler(os.environ.get("LOGFILE", os.path.join(os.path.expanduser('~'), 'stopgo.log')))
+        else:
+            HANDLER = logging.handlers.WatchedFileHandler(os.environ.get("LOGFILE", os.path.join('/','tmp','stopgo.log')))
+
         FORMATTER = logging.Formatter(logging.BASIC_FORMAT)
         HANDLER.setFormatter(FORMATTER)
 
-        if clargs.has_key('debug'):
+        if not clargs.has_key('verbose'):
             root = logging.getLogger()
             root.setLevel(os.environ.get("LOGLEVEL", "INFO"))
             root.addHandler(HANDLER)
-
+            
         logging.exception("Debugging on.")
         #First retrieve the screen size of the device
         self.screenSize = wx.DisplaySize()

usr/share/pyshared/stopgolibs/pref.py

@@ -131,6 +131,8 @@ def OnCancel(self,e):
 class PrefProbe():
     def __init__(self):
         # does path exist
+        self.newprefs = {"profile":"hd1080", "container":"mp4", "bitrate":"21M", "fps":"8", "encoder":"ffmpeg", "dir":"Desktop","prompt":"New project prompt"}
+
         if not os.path.exists(os.path.join(os.path.expanduser("~"), '.config')):
             os.makedirs( os.path.join(os.path.expanduser("~"), '.config'))
 
@@ -143,20 +145,18 @@ def __init__(self):
 
 
     def PrefGet(self):
-        newprefs = {"profile":"1080p", "container":"mp4", "bitrate":"21Mbps", "fps":"8", "encoder":"ffmpeg", "dir":"Desktop","prompt":"New project prompt"}
-        
         myprefs = {}
 
         try:
             dosiero = open(os.path.join(os.path.expanduser("~"), '.config', 'stopgo.conf.json'), 'r')
             myprefs = json.load(dosiero)
 
         except:
-            self.PrefDef(newprefs)
+            self.PrefDef()
             dosiero = open(os.path.join(os.path.expanduser("~"), '.config', 'stopgo.conf.json'), 'r')
             myprefs = json.load(dosiero)
 
-        for nkey in newprefs.items():
+        for nkey in self.newprefs.items():
             #print(type(myprefs))#DEBUG
             if myprefs.get(nkey[0]) == None:
                 #print(str(nkey[0]) + str(' not found') ) #DEBUG
@@ -165,9 +165,9 @@ def PrefGet(self):
 
         return myprefs
 
-    def PrefDef(self,newprefs):
+    def PrefDef(self):
         homedir = os.path.expanduser("~/")
 
         with open(os.path.join(homedir, '.config', 'stopgo.conf.json'), 'w') as outfile:
-            json.dump(newprefs, outfile)
+            json.dump(self.newprefs, outfile)