commit e3af0fc601832aada2083878db56f0b2a0cff60d
author Michael W <baddaemon87@gmail.com> Sun Jan 19 12:51:55 2020 +0100
committer Michael Bestas <mkbestas@lineageos.org> Sun Jan 19 15:08:47 2020 +0200
tree c7a719ca4ac9eff85091125dea6673cfa1e61560
parent 68902593b0032af054fdacee934623238f163756

crowdin: Improve console output

* Reduce the amount of output lines - this makes it more readable
* Add a signal handler to handle aborts - we don't need a stacktrace here

Change-Id: I836a3ddfbb42b6c74d7213f290903e36c703d0c3

crowdin_sync.py

diff --git a/crowdin_sync.py b/crowdin_sync.py
index 82a4ae1..d3de7a8 100755
--- a/crowdin_sync.py
+++ b/crowdin_sync.py
@@ -35,6 +35,7 @@
 import yaml
 
 from lxml import etree
+from signal import signal, SIGINT
 from xml.dom import minidom
 
 # ################################# GLOBALS ################################## #
@@ -242,7 +243,7 @@
 
 
 def push_as_commit(config_files, base_path, path, name, branch, username):
-    print('Committing %s on branch %s' % (name, branch))
+    print('Committing %s on branch %s: ' % (name, branch), end='')
 
     # Get path
     project_path = path
@@ -264,17 +265,16 @@
     try:
         repo.git.commit(m='Automatic translation import')
     except:
-        print('Failed to create commit for %s, probably empty: skipping'
-              % name, file=sys.stderr)
+        print('Failed, probably empty: skipping', file=sys.stderr)
         return
 
     # Push commit
     try:
         repo.git.push('ssh://%s@review.lineageos.org:29418/%s' % (username, name),
                       'HEAD:refs/for/%s%%topic=translation' % branch)
-        print('Successfully pushed commit for %s' % name)
+        print('Success')
     except:
-        print('Failed to push commit for %s' % name, file=sys.stderr)
+        print('Failed', file=sys.stderr)
 
     _COMMITS_CREATED = True
 
@@ -310,11 +310,12 @@
         '--code-review +2',
         '--submit', js['currentPatchSet']['revision']]
         msg, code = run_subprocess(cmd, True)
+        print('Submitting commit %s: ' % js[url], end='')
         if code != 0:
             errorText = msg[1].replace('\n\n', '; ').replace('\n', '')
-            print('Submitting commit {0} failed: {1}'.format(js['url'], errorText))
+            print('Failed: %s' % errorText)
         else:
-            print('Success when submitting commit {0}'.format(js['url']))
+            print('Success')
 
         commits += 1
 
@@ -541,7 +542,14 @@
                        resultProject.getAttribute('name'), br, username)
 
 
+def sig_handler(signal_received, frame):
+    print('')
+    print('SIGINT or CTRL-C detected. Exiting gracefully')
+    exit(0)
+
+
 def main():
+    signal(SIGINT, sig_handler)
     args = parse_args()
     default_branch = args.branch