LiveSync 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

{LiveSync-0.3.2.dist-info → LiveSync-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LiveSync
-Version: 0.3.2
+Version: 0.3.3
 Summary: Repeatedly synchronize local workspace with a (slow) remote machine
 Home-page: https://github.com/zauberzeug/livesync
 Author: Zauberzeug GmbH

{LiveSync-0.3.2.dist-info → LiveSync-0.3.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
 livesync/__init__.py,sha256=tZrvnAIpVuo9cQHMCvi6l2vup66NXPxRwyR5UBNtCTs,50
-livesync/folder.py,sha256=gkjhE8uBKAPs3hIJQLoCCFF_1KEh9ODrOlbYm-JHNRM,4022
+livesync/folder.py,sha256=E_HWXLW40fhoCW_NQh6liEe3gSW9ckIga6rYdQ3DEzc,4351
 livesync/livesync.py,sha256=2kNwtM3a1r5moAXCD4BcK0UJYa0EdZP5PTUNiEqKI6g,1294
 livesync/mutex.py,sha256=nHaP0Tge3ZV7jyVBbYsMug5L5YkuJf8_XIbfAdVJkPc,1741
 livesync/run_subprocess.py,sha256=ZZqK9dlOVlJhL0xkKN7bG-BAT558nHk-IJNGqIMeWyM,368
 livesync/sync.py,sha256=9cQwtdLHIBvenzyq0HRJOagPm1OGSDpi43vLBa2aNUs,1635
-LiveSync-0.3.2.dist-info/LICENSE,sha256=QcBlwggRQYhvfTAE481AAMFQfMS_N6Bj8Svh1T6dsnI,1072
-LiveSync-0.3.2.dist-info/METADATA,sha256=I86gj3hllCf1gRvXhJJeFuXCmlSl-Ne-1WWbqdqIOIg,5335
-LiveSync-0.3.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-LiveSync-0.3.2.dist-info/entry_points.txt,sha256=4dn5YR27lUlJWea3yqLKLqR4MwqjcqzMR5Q4jVFnytI,52
-LiveSync-0.3.2.dist-info/top_level.txt,sha256=mLwExc6wTUGqxvUkYMio5rxGS1h8bvxpNsR2ebfjSL4,9
-LiveSync-0.3.2.dist-info/RECORD,,
+LiveSync-0.3.3.dist-info/LICENSE,sha256=QcBlwggRQYhvfTAE481AAMFQfMS_N6Bj8Svh1T6dsnI,1072
+LiveSync-0.3.3.dist-info/METADATA,sha256=cke14IwKy3EKV267y4lceiPRLvyWqjBIY_f-0_7ZG-g,5335
+LiveSync-0.3.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+LiveSync-0.3.3.dist-info/entry_points.txt,sha256=4dn5YR27lUlJWea3yqLKLqR4MwqjcqzMR5Q4jVFnytI,52
+LiveSync-0.3.3.dist-info/top_level.txt,sha256=mLwExc6wTUGqxvUkYMio5rxGS1h8bvxpNsR2ebfjSL4,9
+LiveSync-0.3.3.dist-info/RECORD,,

livesync/folder.py

@@ -55,17 +55,22 @@ class Folder:
         path = self.source_path / '.syncignore'
         if not path.is_file():
             path.write_text('\n'.join(self.DEFAULT_IGNORES))
-        return [line.strip() for line in path.read_text().splitlines() if not line.startswith('#')]
+        ignores = [line.strip() for line in path.read_text().splitlines() if not line.startswith('#')]
+        ignores += [ignore.rstrip('/\\') for ignore in ignores if ignore.endswith('/') or ignore.endswith('\\')]
+        return ignores
 
     def get_summary(self) -> str:
         summary = f'{self.source_path} --> {self.target}\n'
         try:
+            cmd = ['git', 'rev-parse', '--is-inside-work-tree']
+            subprocess.run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        except subprocess.CalledProcessError:
+            pass  # not a git repo, git is not installed, or something else
+        else:
             cmd = ['git', 'log', '--pretty=format:[%h]\n', '-n', '1']
             summary += subprocess.check_output(cmd, cwd=self.source_path).decode()
             cmd = ['git', 'status', '--short', '--branch']
             summary += subprocess.check_output(cmd, cwd=self.source_path).decode().strip() + '\n'
-        except Exception:
-            pass  # not a git repo, git is not installed, or something else
         return summary
 
     async def watch(self) -> None: