From 0977ef97f3a5d3267073c1444febd94800997df3 Mon Sep 17 00:00:00 2001
From: "Dr.Lt.Data" <dr.lt.data@gmail.com>
Date: Tue, 19 Sep 2023 10:14:14 +0900
Subject: [PATCH] fix: messages

---
 __init__.py   | 17 ++++++++++-------
 git_helper.py | 51 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/__init__.py b/__init__.py
index ae172bb..8bb2cc1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -55,7 +55,7 @@ sys.path.append('../..')
 from torchvision.datasets.utils import download_url
 
 # ensure .js
-print("### Loading: ComfyUI-Manager (V0.28.2)")
+print("### Loading: ComfyUI-Manager (V0.28.3)")
 
 comfy_ui_required_revision = 1240
 comfy_ui_revision = "Unknown"
@@ -251,21 +251,24 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
     if do_update:
         if "CUSTOM NODE PULL: True" in output:
             process.wait()
-            print(f"\rUpdated: '{path}'")
+            print(f"\rUpdated: {path}")
             return True
         elif "CUSTOM NODE PULL: None" in output:
             process.wait()
             return True
         else:
-            print(f"{output}")
+            print(f"\rUpdate error: {path}")
             process.wait()
             return False
     else:
         if "CUSTOM NODE CHECK: True" in output:
             process.wait()
             return True
+        elif "CUSTOM NODE CHECK: False" in output:
+            process.wait()
+            return False
         else:
-            print(f"{output}")
+            print(f"\rFetch error: {path}")
             process.wait()
             return False
 
@@ -278,9 +281,9 @@ def __win_check_git_pull(path):
 
 def git_repo_has_updates(path, do_fetch=False, do_update=False):
     if do_fetch:
-        print(f"\rFetching: {path}", end='')
+        print(f"\x1b[2K\rFetching: {path}", end='')
     elif do_update:
-        print(f"\rUpdating: {path}", end='')
+        print(f"\x1b[2K\rUpdating: {path}", end='')
 
     # Check if the path is a git repository
     if not os.path.exists(os.path.join(path, '.git')):
@@ -311,7 +314,7 @@ def git_repo_has_updates(path, do_fetch=False, do_update=False):
                 new_commit_hash = repo.head.commit.hexsha
 
                 if commit_hash != new_commit_hash:
-                    print(f"\rUpdated: '{path}'")
+                    print(f"\x1b[2K\rUpdated: '{path}'")
 
             except Exception as e:
                 print(f"Updating failed: '{path}'\n{e}")
diff --git a/git_helper.py b/git_helper.py
index 25acf7b..f5333f8 100644
--- a/git_helper.py
+++ b/git_helper.py
@@ -12,33 +12,38 @@ def gitclone(custom_nodes_path, url):
     repo.close()
 
 def gitcheck(path, do_fetch=False):
-    # Fetch the latest commits from the remote repository
-    repo = git.Repo(path)
+    try:
+        # Fetch the latest commits from the remote repository
+        repo = git.Repo(path)
 
-    current_branch = repo.active_branch
-    branch_name = current_branch.name
+        current_branch = repo.active_branch
+        branch_name = current_branch.name
 
-    remote_name = 'origin'
-    remote = repo.remote(name=remote_name)
+        remote_name = 'origin'
+        remote = repo.remote(name=remote_name)
 
-    if do_fetch:
-        remote.fetch()
+        if do_fetch:
+            remote.fetch()
+
+        # Get the current commit hash and the commit hash of the remote branch
+        commit_hash = repo.head.commit.hexsha
+        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+
+        # Compare the commit hashes to determine if the local repository is behind the remote repository
+        if commit_hash != remote_commit_hash:
+            # Get the commit dates
+            commit_date = repo.head.commit.committed_datetime
+            remote_commit_date = repo.refs[f'{remote_name}/{branch_name}'].object.committed_datetime
+
+            # Compare the commit dates to determine if the local repository is behind the remote repository
+            if commit_date < remote_commit_date:
+                print("CUSTOM NODE CHECK: True")
+        else:
+            print("CUSTOM NODE CHECK: False")
+    except Exception as e:
+        print(e)
+        print("CUSTOM NODE CHECK: Error")
 
-    # Get the current commit hash and the commit hash of the remote branch
-    commit_hash = repo.head.commit.hexsha
-    remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
-
-    # Compare the commit hashes to determine if the local repository is behind the remote repository
-    if commit_hash != remote_commit_hash:
-        # Get the commit dates
-        commit_date = repo.head.commit.committed_datetime
-        remote_commit_date = repo.refs[f'{remote_name}/{branch_name}'].object.committed_datetime
-
-        # Compare the commit dates to determine if the local repository is behind the remote repository
-        if commit_date < remote_commit_date:
-            print("CUSTOM NODE CHECK: True")
-    else:
-        print("CUSTOM NODE CHECK: False")
 
 def gitpull(path):
     # Check if the path is a git repository