boris-behav-obs 8.26.1__tar.gz → 8.27__tar.gz

{boris_behav_obs-8.26.1 → boris_behav_obs-8.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.26.1
+Version: 8.27
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE

{boris_behav_obs-8.26.1 → boris_behav_obs-8.27}/boris/core.py

@@ -53,6 +53,8 @@ import gzip
 from collections import deque
 
 import matplotlib
+import zipfile
+import shutil
 
 matplotlib.use("Qt5Agg")
 
@@ -1360,28 +1362,81 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     def actionCheckUpdate_activated(self, flagMsgOnlyIfNew=False):
         """
         check BORIS web site for updates
+        ask user for updating
         """
 
+        versionURL = "https://www.boris.unito.it/static/ver4.dat"
         try:
-            versionURL = "https://www.boris.unito.it/static/ver4.dat"
             last_version = urllib.request.urlopen(versionURL).read().strip().decode("utf-8")
-            if util.versiontuple(last_version) > util.versiontuple(__version__):
-                msg = (
-                    f"A new version is available: v. <b>{last_version}</b><br>"
-                    'Go to <a href="https://www.boris.unito.it">'
-                    "https://www.boris.unito.it</a> to install it."
+        except Exception:
+            QMessageBox.warning(self, cfg.programName, "Can not check for updates...")
+            return
+
+        # record check timestamp
+        config_file.save(self, lastCheckForNewVersion=int(time.mktime(time.localtime())))
+
+        if util.versiontuple(last_version) > util.versiontuple(__version__):
+            if (
+                dialog.MessageDialog(
+                    cfg.programName,
+                    (
+                        f"A new version is available: v. {last_version}.<br><br>"
+                        'For updating manually go to <a href="https://www.boris.unito.it">https://www.boris.unito.it</a>.<br>'
+                    ),
+                    (cfg.CANCEL, "Update automatically"),
                 )
-                # https://github.com/olivierfriard/BORIS/archive/refs/tags/v{last_version}.zip
-            else:
-                msg = f"The version you are using is the last one: <b>{__version__}</b>"
+                == cfg.CANCEL
+            ):
+                return
+
+        else:
+            msg = f"The version you are using is the last one: <b>{__version__}</b>"
+            QMessageBox.information(self, cfg.programName, msg)
+
+            # any news?
             newsURL = "https://www.boris.unito.it/static/news.dat"
             news = urllib.request.urlopen(newsURL).read().strip().decode("utf-8")
-            config_file.save(self, lastCheckForNewVersion=int(time.mktime(time.localtime())))
-            QMessageBox.information(self, cfg.programName, msg)
             if news:
                 QMessageBox.information(self, cfg.programName, news)
+            return
+
+        # check if a .git is present
+        if (pl.Path(__file__).parent.parent / pl.Path(".git")).is_dir():
+            QMessageBox.critical(self, cfg.programName, "A .git directory is present, BORIS cannot be automatically updated.")
+            return
+
+        # download zip archive
+        try:
+            zip_content = urllib.request.urlopen(f"https://github.com/olivierfriard/BORIS/archive/refs/tags/v{last_version}.zip").read()
         except Exception:
-            QMessageBox.warning(self, cfg.programName, "Can not check for updates...")
+            QMessageBox.critical(self, cfg.programName, "Cannot download the new version")
+            return
+
+        temp_zip = tempfile.NamedTemporaryFile(suffix=".zip")
+        try:
+            with open(temp_zip.name, "wb") as f_out:
+                f_out.write(zip_content)
+        except Exception:
+            QMessageBox.critical(self, cfg.programName, "A problem occurred during saving the new version of BORIS.")
+            return
+
+        # extract to temp dir
+        try:
+            temp_dir = tempfile.TemporaryDirectory()
+            with zipfile.ZipFile(temp_zip.name, "r") as zip_ref:
+                zip_ref.extractall(temp_dir.name)
+        except Exception:
+            QMessageBox.critical(self, cfg.programName, "A problem occurred during the unzip of the new version.")
+            return
+
+        # copy from temp dir to current BORIS dir
+        try:
+            shutil.copytree(f"{temp_dir.name}/BORIS-{last_version}", pl.Path(__file__).parent.parent, dirs_exist_ok=True)
+        except Exception:
+            QMessageBox.critical(self, cfg.programName, "A problem occurred during the copy the new version of BORIS.")
+            return
+
+        QMessageBox.information(self, cfg.programName, f"BORIS was updated to v. {last_version}. Restart the program to apply the changes.")
 
     def seek_mediaplayer(self, new_time: dec, player=0) -> int:
         """

{boris_behav_obs-8.26.1 → boris_behav_obs-8.27}/boris/preferences.py

@@ -54,7 +54,6 @@ class Preferences(QDialog, Ui_prefDialog):
         self.pbCancel.clicked.connect(self.reject)
 
         self.flag_refresh = False
-        self.flag_reset_frames_memory = False
 
     def refresh_preferences(self):
         """

{boris_behav_obs-8.26.1 → boris_behav_obs-8.27}/boris/version.py

@@ -20,5 +20,5 @@ This file is part of BORIS.
 
 """
 
-__version__ = "8.26.1"
+__version__ = "8.27"
 __version_date__ = "2024-06-06"

{boris_behav_obs-8.26.1 → boris_behav_obs-8.27}/boris_behav_obs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boris-behav-obs
-Version: 8.26.1
+Version: 8.27
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License:                     GNU GENERAL PUBLIC LICENSE

{boris_behav_obs-8.26.1 → boris_behav_obs-8.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "boris-behav-obs"
-version = "8.26.1"
+version = "8.27"
 description = "BORIS - Behavioral Observation Research Interactive Software"
 authors = [{ name="Olivier Friard", email="olivier.friard@unito.it" }]
 readme = "README.rst"
@@ -58,7 +58,7 @@ line-length = 140
 exclude = ["*_ui.py", "mpv*"]
 
 [tool.bumpver]
-current_version = "8.26.1"
+current_version = "8.27"
 version_pattern = "MAJOR.MINOR.PATCH"