Bugfix for issue #85 reported by Colin Nichol.

CroatianMeteorNetwork · Mar 10, 2025 · a92a67f · a92a67f
1 parent 3cc98d6
commit a92a67f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git a/CMN_binViewer.py b/CMN_binViewer.py
@@ -72,7 +72,7 @@
 from module_CAMS2CMN import convert_rmsftp_to_cams
 from makeMP4 import makeMP4
 
-version = "3.37.1"
+version = "3.37.2"
 
 # set to true to disable the video radiobutton
 disable_UI_video = False
@@ -3377,24 +3377,30 @@ def confirmationEnd(self):
 
             # write filtered UFO-compatible R91 csv file 
             if sys.version_info[0] > 2:
-                self.timestamp_label.configure(text = "Updating UFO file...")
-                try:
-                    ufoFile = glob.glob(os.path.join(self.dir_path, '*.csv'))[0]
-
-                    with open(ufoFile,'r') as uf:
-                        ufoData = uf.readlines()
-                    newufoData = self.updateUFOData(FTPdetectinfoExport, ufoData)
+
+                ufoName = os.path.split(self.dir_path)[1] + '.csv'
+                ufoFile = os.path.join(self.dir_path, ufoName)
+
+                if os.path.isfile(ufoFile):
+                    self.timestamp_label.configure(text = "Updating UFO file...")
                     try:
-                        _, ufof = os.path.split(ufoFile)
-                        fnam = os.path.join(self.ConfirmationInstance.confirmationDirectory, ufof)
-                        with open(fnam, 'w') as newUfoFile:
-                            for line in newufoData:
-                                newUfoFile.write(line)
-
-                    except OSError as error:
-                        log.info('unable to write CSV file, {}'.format(error))
-                except FileNotFoundError:
-                    log.info('CSV file not present')
+                        with open(ufoFile,'r') as uf:
+                            ufoData = uf.readlines()
+                        newufoData = self.updateUFOData(FTPdetectinfoExport, ufoData)
+                        try:
+                            _, ufof = os.path.split(ufoFile)
+                            fnam = os.path.join(self.ConfirmationInstance.confirmationDirectory, ufof)
+                            with open(fnam, 'w') as newUfoFile:
+                                for line in newufoData:
+                                    newUfoFile.write(line)
+
+                        except OSError as error:
+                            log.info('unable to write CSV file, {}'.format(error))
+                    except Exception:
+                        log.info('UFO CSV file corrupt and cant be updated')
+                else:
+                    log.info('UFO CSV file not present')
+
             else:
                 print('ufo filtering doesnt work on Python 2.7')
 

diff --git a/CMN_binViewer_setup.iss b/CMN_binViewer_setup.iss
@@ -7,7 +7,7 @@
 
 [Setup]
 AppName=CMN_binViewer
-AppVersion="3.37.1"
+AppVersion="3.37.2"
 AppPublisher=Croatian Meteor Network
 AppPublisherURL=http://cmn.rgn.hr/
 DefaultDirName={commonpf64}\CMN_binViewer

diff --git a/CMN_binViewer_setup_win32.iss b/CMN_binViewer_setup_win32.iss
@@ -7,7 +7,7 @@
 
 [Setup]
 AppName=CMN_binViewer
-AppVersion="3.37.1"
+AppVersion="3.37.2"
 AppPublisher=Croatian Meteor Network
 AppPublisherURL=http://cmn.rgn.hr/
 DefaultDirName={commonpf}\CMN_binViewer

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 CMN Binviewer Change Log
 ========================
+3.37.2
+Mar 25: Bugfix to trap case when RMS didn't create the UFO-format CSV file properly
+
 3.37.1
 Nov 24: Bugfix to support newer versions of numpy without np.int
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "3.37.1"
+current_version = "3.37.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 
 [bumpver.file_patterns]