celldetective 1.4.2__py3-none-any.whl → 1.5.0b1__py3-none-any.whl

celldetective/__init__.py

@@ -1 +1,26 @@
 from ._version import __version__
+import os
+from .log_manager import setup_global_logging, get_logger
+
+# Define default log path in user home
+USER_LOG_DIR = os.path.join(os.path.expanduser("~"), ".celldetective", "logs")
+GLOBAL_LOG_FILE = os.path.join(USER_LOG_DIR, "celldetective.log")
+
+# Setup logging
+setup_global_logging(log_file=GLOBAL_LOG_FILE)
+
+# Expose logger
+logger = get_logger()
+
+
+def get_software_location() -> str:
+    """
+    Get the installation folder of celldetective.
+
+    Returns
+    -------
+    str
+            Path to the celldetective installation folder.
+    """
+
+    return rf"{os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]}"

celldetective/__main__.py

@@ -1,66 +1,85 @@
 #!/usr/bin/env python3
 import sys
+import os
+
+os.environ["KMP_DUPLICATE_LIB_OK"] = "TRUE"
+
 from PyQt5.QtWidgets import QApplication, QSplashScreen
 from PyQt5.QtGui import QPixmap
 from os import sep
-from celldetective.utils import get_software_location
-from time import time, sleep
 
-#os.environ['QT_DEBUG_PLUGINS'] = '1'
+# os.environ['QT_DEBUG_PLUGINS'] = '1'
 
 if __name__ == "__main__":
 
-	splash=True
-	print('Loading the libraries...')
+    splash = True
+    from celldetective import logger
+    from celldetective import get_software_location
+
+    logger.info("Loading the libraries...")
+
+    App = QApplication(sys.argv)
+    App.setStyle("Fusion")
+
+    software_location = get_software_location()
 
-	App = QApplication(sys.argv)
-	App.setStyle("Fusion")
+    if splash:
+        splash_pix = QPixmap(
+            sep.join([software_location, "celldetective", "icons", "splash.png"])
+        )
+        splash = QSplashScreen(splash_pix)
+        splash.setMask(splash_pix.mask())
+        splash.show()
+        App.processEvents()
 
-	software_location = get_software_location()
+    # Update check in background
+    def check_update():
+        try:
+            import requests
+            import re
+            from celldetective import __version__
 
-	if splash:
-		start = time()
-		splash_pix = QPixmap(sep.join([software_location,'celldetective','icons','splash.png']))
-		splash = QSplashScreen(splash_pix)
-		splash.setMask(splash_pix.mask())
-		splash.show()
-		#App.processEvents(QEventLoop.AllEvents, 300)
-		while time() - start < 1:
-			sleep(0.001)
-			App.processEvents()
+            package = "celldetective"
+            response = requests.get(f"https://pypi.org/pypi/{package}/json", timeout=5)
+            latest_version = response.json()["info"]["version"]
 
-	try:
-		
-		import requests
-		import re
-		from celldetective import __version__
+            latest_version_num = re.sub("[^0-9]", "", latest_version)
+            current_version_num = re.sub("[^0-9]", "", __version__)
 
-		package = 'celldetective'
-		response = requests.get(f'https://pypi.org/pypi/{package}/json')
-		latest_version = response.json()['info']['version']
+            if len(latest_version_num) != len(current_version_num):
+                max_length = max([len(latest_version_num), len(current_version_num)])
+                latest_version_num = int(
+                    latest_version_num.zfill(max_length - len(latest_version_num))
+                )
+                current_version_num = int(
+                    current_version_num.zfill(max_length - len(current_version_num))
+                )
 
-		latest_version_num = re.sub('[^0-9]','', latest_version)
-		current_version_num = re.sub('[^0-9]','',__version__)
+            if latest_version_num > current_version_num:
+                logger.warning(
+                    "Update is available...\nPlease update using `pip install --upgrade celldetective`..."
+                )
+        except Exception as e:
+            logger.error(
+                f"Update check failed... Please check your internet connection: {e}"
+            )
 
-		if len(latest_version_num)!=len(current_version_num):
-			max_length = max([len(latest_version_num),len(current_version_num)])
-			latest_version_num = int(latest_version_num.zfill(max_length - len(latest_version_num)))
-			current_version_num = int(current_version_num.zfill(max_length - len(current_version_num)))
+    import threading
 
-		if latest_version_num > current_version_num:
-			print('Update is available...\nPlease update using `pip install --upgrade celldetective`...')
-	
-	except Exception as e:
+    update_thread = threading.Thread(target=check_update)
+    update_thread.daemon = True
+    update_thread.start()
 
-		print(f"{e=}")
+    from celldetective.gui.InitWindow import AppInitWindow
 
-	from celldetective.gui.InitWindow import AppInitWindow
+    logger.info("Libraries successfully loaded...")
 
-	print('Libraries successfully loaded...')
+    from celldetective.gui.base.utils import center_window
 
-	window = AppInitWindow(App, software_location=software_location)
+    window = AppInitWindow(App, software_location=software_location)
+    center_window(window)
 
-	if splash:
-		splash.finish(window)
+    if splash:
+        splash.finish(window)
 
-	sys.exit(App.exec())
+    sys.exit(App.exec())

celldetective/_version.py

@@ -1 +1 @@
-__version__ = "1.4.2"
+__version__ = "1.5.0b1"