medicafe 0.250805.2__tar.gz → 0.250806.0__tar.gz

{medicafe-0.250805.2 → medicafe-0.250806.0}/MediBot/update_medicafe.py

@@ -15,6 +15,40 @@ except ImportError:
     requests = None
     print("Warning: requests module not available. Some functionality may be limited.")
 
+def print_status(message, status_type="INFO"):
+    """Print formatted status messages with ASCII-only visual indicators."""
+    if status_type == "SUCCESS":
+        print("\n" + "="*60)
+        print("[SUCCESS] {}".format(message))
+        print("="*60)
+    elif status_type == "ERROR":
+        print("\n" + "="*60)
+        print("[ERROR] {}".format(message))
+        print("="*60)
+    elif status_type == "WARNING":
+        print("\n" + "-"*60)
+        print("[WARNING] {}".format(message))
+        print("-"*60)
+    elif status_type == "INFO":
+        print("\n" + "-"*60)
+        print("[INFO] {}".format(message))
+        print("-"*60)
+    else:
+        print(message)
+
+def print_final_result(success, message):
+    """Print final result with clear visual indication."""
+    if success:
+        print_status("UPDATE COMPLETED SUCCESSFULLY", "SUCCESS")
+        print("Final Status: {}".format(message))
+    else:
+        print_status("UPDATE FAILED", "ERROR")
+        print("Final Status: {}".format(message))
+    
+    print("\nExiting in 5 seconds...")
+    time.sleep(5)
+    sys.exit(0 if success else 1)
+
 def get_installed_version(package):
     try:
         process = subprocess.Popen(
@@ -88,9 +122,8 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
     Attempts to upgrade the package multiple times with delays in between.
     """
     if not check_internet_connection():
-        print("Error: No internet connection detected. Please check your internet connection and try again.")
-        time.sleep(3)  # Pause for 3 seconds before exiting
-        sys.exit(1)
+        print_status("No internet connection detected. Please check your internet connection and try again.", "ERROR")
+        print_final_result(False, "No internet connection available")
     
     for attempt in range(1, retries + 1):
         print("Attempt {} to upgrade {}...".format(attempt, package))
@@ -110,24 +143,24 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
             new_version = get_installed_version(package)  # Get new version after upgrade
             if compare_versions(new_version, get_latest_version(package)) >= 0:  # Compare versions
                 if attempt == 1:
-                    print("Upgrade succeeded!")
+                    print_status("Upgrade succeeded!", "SUCCESS")
                 else:
-                    print("Attempt {}: Upgrade succeeded!".format(attempt))
+                    print_status("Attempt {}: Upgrade succeeded!".format(attempt), "SUCCESS")
                 time.sleep(delay)
                 return True
             else:
-                print("Upgrade failed. Current version remains: {}".format(new_version))
+                print_status("Upgrade failed. Current version remains: {}".format(new_version), "WARNING")
                 if attempt < retries:
                     print("Retrying in {} seconds...".format(delay))
                     time.sleep(delay)
         else:
             print(stderr.decode().strip())
-            print("Attempt {}: Upgrade failed.".format(attempt))
+            print_status("Attempt {}: Upgrade failed.".format(attempt), "WARNING")
             if attempt < retries:
                 print("Retrying in {} seconds...".format(delay))
                 time.sleep(delay)
     
-    print("Error: All upgrade attempts failed.")
+    print_status("All upgrade attempts failed.", "ERROR")
     return False
 
 def ensure_dependencies():
@@ -149,7 +182,7 @@ def ensure_dependencies():
     is_windows_py34 = sys.version_info[:2] == (3, 4) and platform.system() == 'Windows'
 
     if is_windows_py34:
-        print("Detected Windows with Python 3.4")
+        print_status("Detected Windows with Python 3.4", "INFO")
         print("Please ensure the following packages are installed manually:")
         for pkg in problematic_packages:
             package_name, version = pkg.split('==')
@@ -187,7 +220,7 @@ def ensure_dependencies():
                 print("Required version of {}: {}".format(package_name, version))
                 time.sleep(2)  # Pause for 2 seconds to allow user to read the output
                 if not upgrade_package(package_name):  # Attempt to upgrade/downgrade to the required version
-                    print("Warning: Failed to upgrade/downgrade {} to version {}.".format(package_name, version))
+                    print_status("Failed to upgrade/downgrade {} to version {}.".format(package_name, version), "WARNING")
                     time.sleep(2)  # Pause for 2 seconds after failure message
             elif version and installed_version == version:  # Check if installed version matches required version
                 print("All versions match for {}. No changes needed.".format(package_name))
@@ -199,13 +232,13 @@ def ensure_dependencies():
                     print("Latest version of {}: {}".format(package_name, latest_version))
                     time.sleep(2)  # Pause for 2 seconds to allow user to read the output
                     if not upgrade_package(package_name):
-                        print("Warning: Failed to upgrade {}.".format(package_name))
+                        print_status("Failed to upgrade {}.".format(package_name), "WARNING")
                         time.sleep(2)  # Pause for 2 seconds after failure message
         except pkg_resources.DistributionNotFound:
             print("Package {} is not installed. Attempting to install...".format(package_name))
             time.sleep(2)  # Pause for 2 seconds before attempting installation
             if not upgrade_package(package_name):
-                print("Warning: Failed to install {}.".format(package_name))
+                print_status("Failed to install {}.".format(package_name), "WARNING")
                 time.sleep(2)  # Pause for 2 seconds after failure message
 
 def check_for_updates_only():
@@ -234,56 +267,54 @@ def check_for_updates_only():
         print("UP_TO_DATE")
 
 def main():
+    print_status("MediCafe Update Utility", "INFO")
+    print("Starting update process...")
+    
     # Ensure internet connection before proceeding
     if not check_internet_connection():
-        print("Error: No internet connection. Please check your connection and try again.")
-        time.sleep(3)  # Pause for 3 seconds before exiting
-        sys.exit(1)
+        print_status("No internet connection. Please check your connection and try again.", "ERROR")
+        print_final_result(False, "No internet connection available")
 
     # Ensure all dependencies are met before proceeding
     response = input("Do you want to check dependencies? (yes/no, default/enter is no): ").strip().lower()
     if response in ['yes', 'y']:
         ensure_dependencies()
     else:
-        print("Skipping dependency check.")
+        print_status("Skipping dependency check.", "INFO")
         time.sleep(3)  # Pause for 3 seconds before proceeding
 
     package = "medicafe"
     
     current_version = get_installed_version(package)
     if not current_version:
-        print("{} is not installed.".format(package))
-        time.sleep(3)  # Pause for 3 seconds before exiting
-        sys.exit(1)
+        print_status("{} is not installed.".format(package), "ERROR")
+        print_final_result(False, "Package not installed")
     
     latest_version = get_latest_version(package)
     if not latest_version:
-        print("Could not retrieve the latest version information.")
-        time.sleep(3)  # Pause for 3 seconds before exiting
-        sys.exit(1)
+        print_status("Could not retrieve the latest version information.", "ERROR")
+        print_final_result(False, "Unable to fetch latest version")
     
     print("Current version of {}: {}".format(package, current_version))
     print("Latest version of {}: {}".format(package, latest_version))
     
     if compare_versions(latest_version, current_version) > 0:
-        print("A newer version is available. Proceeding with upgrade.")
+        print_status("A newer version is available. Proceeding with upgrade.", "INFO")
         if upgrade_package(package):
             # Verify upgrade
             time.sleep(3)
             new_version = get_installed_version(package)
             if compare_versions(new_version, latest_version) >= 0:
-                print("Upgrade successful. New version: {}".format(new_version))
+                print_status("Upgrade successful. New version: {}".format(new_version), "SUCCESS")
+                print_final_result(True, "Successfully upgraded to version {}".format(new_version))
             else:
-                print("Upgrade failed. Current version remains: {}".format(new_version))
-                time.sleep(3)  # Pause for 3 seconds before exiting
-                sys.exit(1)
+                print_status("Upgrade failed. Current version remains: {}".format(new_version), "ERROR")
+                print_final_result(False, "Upgrade verification failed")
         else:
-            time.sleep(3)  # Pause for 3 seconds before exiting
-            sys.exit(1)
+            print_final_result(False, "Upgrade process failed")
     else:
-        print("You already have the latest version installed.")
-        time.sleep(3)  # Pause for 3 seconds before exiting
-        sys.exit(1)
+        print_status("You already have the latest version installed.", "SUCCESS")
+        print_final_result(True, "Already running latest version")
 
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "--check-only":

{medicafe-0.250805.2 → medicafe-0.250806.0}/MediLink/MediLink_Gmail.py

@@ -1,5 +1,19 @@
 # MediLink_Gmail.py
 import sys, os, subprocess, time, webbrowser, requests, json, ssl, signal
+
+# Set up Python path to find MediCafe when running directly
+def setup_python_path():
+    """Set up Python path to find MediCafe package"""
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    workspace_root = os.path.dirname(current_dir)
+    
+    # Add workspace root to Python path if not already present
+    if workspace_root not in sys.path:
+        sys.path.insert(0, workspace_root)
+
+# Set up paths before importing MediCafe
+setup_python_path()
+
 from MediCafe.core_utils import get_shared_config_loader
 
 # Get shared config loader

{medicafe-0.250805.2 → medicafe-0.250806.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250805.2
+Version: 0.250806.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250805.2 → medicafe-0.250806.0}/medicafe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250805.2
+Version: 0.250806.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250805.2 → medicafe-0.250806.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='medicafe',
-    version="0.250805.2",
+    version="0.250806.0",
     description='MediCafe',
     long_description="""
     # Project Overview: MediCafe