Show folder completion percent. Syncthing 0.14.25 changes.

3 files changed, 29 insertions, 14 deletions

diff --git a/setup.py b/setup.py
index 02133da..aa32ace 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
         name='syncthingmanager',
-        version='0.2.0dev1',
+        version='0.2.0dev2',
         description='A commandline tool for configuring Syncthing',
         url='https://github.com/classicsc/syncthingmanager',
         author='Samuel Smoker',
diff --git a/syncthingmanager/__init__.py b/syncthingmanager/__init__.py
index e5cd405..edded38 100644
--- a/syncthingmanager/__init__.py
+++ b/syncthingmanager/__init__.py
@@ -24,7 +24,7 @@ import os
 from xml.etree.ElementTree import parse
 from textwrap import dedent
 import platform
-import requests
+from math import floor
 
 # Put globals here
 __VERSION__ = '0.1.0'
@@ -474,6 +474,16 @@ class SyncthingManager(Syncthing):
         versioning = {'params': {}, 'type': ''}
         self.folder_edit(folderstr, 'versioning', versioning)
 
+    def db_folder_sync_fraction(self, folderstr):
+        folder_id = self.folder_info(folderstr)['id']
+        status = self.db.status(folder_id)
+        try:
+            return status['inSyncBytes'] / status['globalBytes']
+        except ZeroDivisionError:
+            return 1
+        except TypeError:
+            return 1
+
     def _print_device_info(self, devicestr):
         config = self.system.config()
         info = self.device_info(devicestr)
@@ -545,6 +555,7 @@ class SyncthingManager(Syncthing):
         except TypeError:
             raise SyncthingManagerError("Folder not configured: " + folderstr)
         status = self.system.status()
+        sync_status = floor(100 * self.db_folder_sync_fraction(info['id']))
         devices = []
         for device in folder['devices']:
             if device['deviceID'] == status['myID']:
@@ -581,12 +592,12 @@ class SyncthingManager(Syncthing):
                 nondefaults += ('\n    Command:            ' +
                         folder['versioning']['params']['command'])
         outstr = """\
-                {0}
+                {0}     {4}%
                     Shared With:  {1}
                     Folder ID:  {2}
                     Folder Path:    {3}\
                 """.format(folderstr, ', '.join(map(str, devices)),
-                        folder['id'], folder['path'])
+                        folder['id'], folder['path'], str(sync_status))
         print(dedent(outstr))
         print(nondefaults)
 
@@ -597,6 +608,7 @@ class SyncthingManager(Syncthing):
         status = self.system.status()
         for folder in config['folders']:
             devices = []
+            sync_status = floor(100 * self.db_folder_sync_fraction(folder['id']))
             for device in folder['devices']:
                 if device['deviceID'] == status['myID']:
                     continue
@@ -607,12 +619,12 @@ class SyncthingManager(Syncthing):
             else:
                 folderstr = folder['label']
             outstr = """\
-                    {0}
+                    {0}     {4}%
                         Shared With:  {1}
                         Folder ID:  {2}
                         Folder Path:    {3}
                     """.format(folderstr, ', '.join(map(str, devices)),
-                            folder['id'], folder['path'])
+                            folder['id'], folder['path'], str(sync_status))
             print(dedent(outstr))
 
 
@@ -644,9 +656,8 @@ def arguments():
     daemon_parser = base_subparsers.add_parser('daemon', help="control synchronization activity by device or folder.")
     daemon_parser.add_argument('-p', '--pause', help="pause syncing with a device")
     daemon_parser.add_argument('-r', '--resume', help='resume syncing with a device')
-    # This stuff should be in 0.14.25, uncomment when it goes stable.
-#    daemon_parser.add_argument('--pause-all', action='store_true', help="pause syncing with all devices")
-#    daemon_parser.add_argument('--resume-all', action='store_true', help="resume syncing with all devices")
+    daemon_parser.add_argument('--pause-all', action='store_true', help="pause syncing with all devices")
+    daemon_parser.add_argument('--resume-all', action='store_true', help="resume syncing with all devices")
 
     device_parser = base_subparsers.add_parser('device',
             help="work with devices")
@@ -861,10 +872,10 @@ def main():
                 st.daemon_pause(args.pause)
             if args.resume:
                 st.daemon_resume(args.resume)
-#            if args.pause_all:
-#                st.daemon_pause('')
-#            if args.resume_all:
-#                st.daemon_resume('')
+            if args.pause_all:
+                st.daemon_pause('')
+            if args.resume_all:
+                st.daemon_resume('')
         elif args.subparser_name == 'folder':
             if args.folderparser_name == 'add':
                 st.add_folder(args.path, args.folderID, args.label,
diff --git a/syncthingmanager/tests/test_stman.py b/syncthingmanager/tests/test_stman.py
index 437dbc5..4eff574 100644
--- a/syncthingmanager/tests/test_stman.py
+++ b/syncthingmanager/tests/test_stman.py
@@ -191,4 +191,8 @@ def test_daemon_resume(s):
     s.daemon_pause('SyncthingManagerTestDevice1')
     assert s.system.connections()['connections']['MFZWI3D-BONSGYC-YLTMRWG-C43ENR5-QXGZDMM-FZWI3DP-BONSGYY-LTMRWAD']['paused']
     s.daemon_resume('SyncthingManagerTestDevice1')
-    assert not s.system.connections()['connections']['MFZWI3D-BONSGYC-YLTMRWG-C43ENR5-QXGZDMM-FZWI3DP-BONSGYY-LTMRWAD']['paused']
\ No newline at end of file
+    assert not s.system.connections()['connections']['MFZWI3D-BONSGYC-YLTMRWG-C43ENR5-QXGZDMM-FZWI3DP-BONSGYY-LTMRWAD']['paused']
+
+def test_db_sync_fraction(s):
+    a = s.db_folder_sync_fraction('stmantest1')
+    assert isinstance(a, float) or isinstance(a, int)