git-editlog 1.0.1__tar.gz → 1.0.3__tar.gz

{git_editlog-1.0.1/git_editlog.egg-info → git_editlog-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-editlog
-Version: 1.0.1
+Version: 1.0.3
 Summary: Auto commit edit log for Git
 Home-page: https://ktpanda.org/software/git-editlog
 Author: Katie Rust

{git_editlog-1.0.1 → git_editlog-1.0.3}/git_editlog/__init__.py

@@ -1,4 +1,4 @@
-VERSION = "1.0.1"
+VERSION = "1.0.3"
 
 import sys
 

{git_editlog-1.0.1 → git_editlog-1.0.3}/git_editlog/__main__.py

@@ -22,9 +22,36 @@ def setup_python_logging(verbose=False):
     console_handler.setFormatter(log_formatter)
     root.addHandler(console_handler)
 
+
+def add_repo_list(fpath, repo_paths, seen_paths, limit):
+    cdir = fpath.parent
+    with fpath.open(encoding='utf8') as fp:
+        for line in fp:
+            line = line.strip()
+            if not line or line.startswith('#'):
+                continue
+            add_repo(cdir, line, repo_paths, seen_paths, limit - 1)
+
+def add_repo(cdir, name, repo_paths, seen_paths, limit=10):
+    if is_list := name.startswith('@'):
+        name = name[1:].lstrip()
+
+    path = cdir / name
+    if path in seen_paths:
+        return
+
+    seen_paths.add(path)
+
+    if is_list:
+        if limit <= 0:
+            return
+        add_repo_list(path, repo_paths, seen_paths, limit)
+    else:
+        repo_paths.append(path)
+
 def main():
     p = argparse.ArgumentParser(description='')
-    p.add_argument('repos', type=Path, nargs='*')
+    p.add_argument('repos', nargs='*')
     p.add_argument('-l', '--repo-list', type=Path)
     p.add_argument('-v', '--verbose', action='store_true', help='')
     #p.add_argument(help='')
@@ -33,20 +60,16 @@ def main():
     setup_python_logging(args.verbose)
 
     repo_paths = []
+    seen_paths = set()
     repo_watchers = []
+
+    cdir = Path('.')
+
     for path in args.repos:
-        repo_paths.append(path)
+        add_repo(cdir, path, repo_paths, seen_paths)
 
     if args.repo_list:
-        base = args.repo_list.parent
-        with args.repo_list.open() as fp:
-            for line in fp:
-                line = line.strip()
-                if not line or line.startswith('#'):
-                    continue
-
-                path = (base / line).absolute()
-                repo_paths.append(path)
+        add_repo_list(args.repo_list, repo_paths, seen_paths, 10)
 
     for path in repo_paths:
         try:

{git_editlog-1.0.1 → git_editlog-1.0.3}/git_editlog/repo_watcher.py

@@ -6,6 +6,7 @@ import argparse
 import subprocess
 import traceback
 import logging
+import threading
 import copy
 from pathlib import Path
 
@@ -16,7 +17,7 @@ log = logging.getLogger(__name__)
 EDITLOG_BRANCH = 'editlog'
 EDITLOG_BASE_BRANCH = EDITLOG_BRANCH + '-base'
 
-EXCLUDE_EXT = {'.3mf', '.stl', '.zip', '.jpg', '.jpeg', '.png'}
+EXCLUDE_EXT = {'.3mf', '.stl', '.zip', '.jpg', '.jpeg', '.png', '.db', '.sqlite', '.sqlite-wal', '.sqlite-shm', '.sqlite-journal'}
 
 def gitdir_allow_trigger(relpath):
     if relpath == 'HEAD':
@@ -37,6 +38,8 @@ class BaseRepoWatcher:
         self.git = git_helper.Git(repo_path)
         self.repo_path = self.git.get_toplevel()
 
+        self.lock = threading.Lock()
+
         info = self.git.run_capt(['rev-parse', '--show-toplevel', '--git-dir']).split('\n')
 
         repo_path = self.repo_path = self.git.repo_path = Path(info[0]).absolute()
@@ -47,6 +50,7 @@ class BaseRepoWatcher:
 
         self.editlog_dir = git_dir / 'editlog'
         self.editlog_index = self.editlog_dir / 'index'
+        self.editlog_index_lock = self.editlog_dir / 'index.lock'
         self.editlog_head_file = self.editlog_dir / 'HEAD'
 
         self.git.env_vars['GIT_INDEX_FILE'] = str(self.editlog_index)
@@ -73,6 +77,9 @@ class BaseRepoWatcher:
         self.editlog_branch_head = get_branch(self.git, EDITLOG_BRANCH)
         self.last_head = get_branch(self.git, EDITLOG_BASE_BRANCH)
 
+        self.files_touched = set()
+
+        self.delete_lock()
         if not self.editlog_branch_head:
             # Create an empty tree to start with
             empty_blob = self.git.run_capt(['hash-object', '-w', '-t', 'blob', '--stdin'], input=b'')
@@ -85,6 +92,12 @@ class BaseRepoWatcher:
 
         self.setup_editlog_dir()
 
+    def delete_lock(self):
+        try:
+            os.unlink(self.editlog_index_lock)
+        except IOError:
+            pass
+
     def setup_editlog_dir(self):
         dir = self.editlog_dir
         dir.mkdir(exist_ok=True)
@@ -102,52 +115,62 @@ class BaseRepoWatcher:
             relpath = path.relative_to(self.git_dir)
             if not gitdir_allow_trigger(str(relpath)):
                 return False
+            relpath = f'.git/{relpath}'
         except ValueError: # path is not relative to gitdir
-            pass
-
-        self.last_event_time = time.time()
-        return True
-
-    def should_check(self):
-        event_time = self.last_event_time
-        if self.last_check_event_time == event_time:
-            return False
-
-        ctime = time.time()
-        time_since_last_event = ctime - event_time
-
-        # Wait for idle of at least 3 seconds before checking
-        if time_since_last_event < 3:
-            # If this is the first time we've seen an event since the last check, note
-            # the time and return False.
-            if self.deferred_check_time is None:
-                self.deferred_check_time = event_time
+            try:
+                relpath = str(path.relative_to(self.repo_path))
+            except ValueError: # path is not relative to repo
                 return False
 
-            # If it's been less than 30 seconds after the first deferred check, return False.
-            # Otherwise, continue and force a check.
-            if ctime < self.deferred_check_time + 30:
-                return False
-
-        self.last_check_event_time = event_time
+        with self.lock:
+            self.last_event_time = time.time()
+            self.files_touched.add(relpath.replace('\\', '/'))
         return True
 
     def check(self):
         if self.main_index_lock.exists():
             return
 
-        if not self.should_check():
-            return
+        with self.lock:
+            event_time = self.last_event_time
+            if self.last_check_event_time == event_time:
+                # No changes since the last check
+                return
 
-        print()
-        print(f'{self.repo_path}: possible changes detected, checking git...')
+            ctime = time.time()
+            time_since_last_event = ctime - event_time
+
+            # Wait for idle of at least 5 seconds before checking.
+            if time_since_last_event < 5:
+                # If this is the first time we've seen an event since the last check, note
+                # the time and defer the check.
+                if self.deferred_check_time is None:
+                    self.deferred_check_time = event_time
+                    return
+
+                # If it's been less than 30 seconds after the first deferred check, continue to wait.
+                # Otherwise, continue and force a check.
+                if ctime < self.deferred_check_time + 30:
+                    return
 
+            self.last_check_event_time = event_time
+            trigger_files = self.files_touched
+            self.files_touched = set()
+
+        print()
+        if trigger_files:
+            print(f'{self.repo_path}: changes detected in files:')
+            for path in sorted(trigger_files):
+                print(f'    {path}')
+            print()
+        else:
+            print(f'{self.repo_path}: check forced')
 
         if any(f.exists() for f in self.do_not_log_if_exists):
             print(f'{self.repo_path}: rebase/merge in progress, not logging')
             return
 
-        current_head = self.git.run_capt(['rev-parse', '--verify', 'HEAD'])
+        self.delete_lock()
 
         # Force our head to be the head of the editlog branch so git status won't try to
         # read the actual head
@@ -182,8 +205,10 @@ class BaseRepoWatcher:
 
         tree_hash = self.git.run_capt(['write-tree'])
 
+        current_head = self.git.run_capt(['rev-parse', '--verify', 'HEAD'])
+
         if (tree_hash == self.editlog_tree and current_head == self.last_head):
-            print(f'{self.repo_path}: no changes')
+            print(f'{self.repo_path}: no loggable changes')
             return
 
         ctime = time.time()

{git_editlog-1.0.1 → git_editlog-1.0.3/git_editlog.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-editlog
-Version: 1.0.1
+Version: 1.0.3
 Summary: Auto commit edit log for Git
 Home-page: https://ktpanda.org/software/git-editlog
 Author: Katie Rust