qtplasmac: fix updates for v154 and v170

Author: phillc54

lib/python/qtvcp/lib/qtplasmac/updater.py

@@ -209,6 +209,7 @@ def split_prefs_file(old, new, prefs):
 
 # use qtplasmac_comp.hal for component connections (pre V1.221.154 2022/01/18)
 def add_component_hal_file(path, halfiles):
+    tmpFile = None
     pinsToCheck = ['PLASMAC COMPONENT INPUTS','plasmac.arc-ok-in','plasmac.axis-x-position',
                    'plasmac.axis-y-position','plasmac.breakaway','plasmac.current-velocity',
                    'plasmac.cutting-start','plasmac.cutting-stop','plasmac.feed-override',
@@ -231,15 +232,14 @@ def add_component_hal_file(path, halfiles):
             with open(halfile, 'r') as inFile:
                 if 'plasmac.cutting-start' in inFile.read():
                     inFile.seek(0)
-                    tmpFile = '{}~'.format(halfile)
                     COPY(halfile, tmpFile)
                     with open(tmpFile, 'r') as inFile:
                         with open(f, 'w') as outFile:
                             for line in inFile:
                                 if any(pin in line for pin in pinsToCheck):
                                     continue
                                 outFile.write(line)
-    if os.path.isfile(tmpFile):
+    if tmpFile and os.path.isfile(tmpFile):
         os.remove(tmpFile)
 
 def add_component_hal_file_iniwrite(inifile):

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -135,13 +135,12 @@ def __init__(self, halcomp, widgets, paths):
         if self.units == 'inch':
             self.units = 'in'
             self.unitsPerMm = 0.03937
-        # try to open prefs file so we can use it for updates
+        # open prefs file so we can use it for updates
         # it will not exist prior to V1.222.170 2022/03/08
-        self.PREFS = None
-        try:
+        if os.path.isfile(os.path.join(self.PATHS.CONFIGPATH, self.machineName + '.prefs')):
             self.PREFS = Access(os.path.join(self.PATHS.CONFIGPATH, self.machineName + '.prefs'))
-        except:
-            pass
+        else:
+            self.PREFS = None
         self.updateIni = []
         self.update_check()
         self.PREFS = Access(os.path.join(self.PATHS.CONFIGPATH, self.machineName + '.prefs'))
@@ -2180,6 +2179,7 @@ def update_check(self):
             old = os.path.join(self.PATHS.CONFIGPATH, 'qtplasmac.prefs')
             if os.path.isfile(old):
                 UPDATER.split_prefs_file(old, qtvcpPrefsFile, machinePrefsFile)
+            self.PREFS = Access(os.path.join(self.PATHS.CONFIGPATH, self.machineName + '.prefs'))
         # move conversational prefs from qtvcp.prefs to <machine_name>.prefs (pre V1.222.187 2022/05/03)
         if os.path.isfile(qtvcpPrefsFile) and os.path.isfile(machinePrefsFile):
             with open(qtvcpPrefsFile, 'r') as inFile:

share/qtvcp/screens/qtplasmac/versions.html

@@ -36,6 +36,11 @@ <h2>QtPlasmaC Version History</h2>
 </ul>
 <i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
 
+<br><b><u>v1.229.229 2022 Aug 19</u></b>
+<ul style="margin:0;">
+  <li>fix updates for v154 and v170</li>
+</ul>
+
 <br><b><u>v1.229.227 2022 Aug 17</u></b>
 <ul style="margin:0;">
   <li>material files naming consistency</li>