solving issues in bitdust/updates/git_proc.py

Author: vesellov

bitdust/updates/git_proc.py

@@ -78,17 +78,20 @@
 #------------------------------------------------------------------------------
 
 _CurrentProcess = None
-_FirstRunDelay = 1200
-_LoopInterval = 3600*6
+_FirstRunDelay = 60*2
+_LoopInterval = 60*3  # 60*60*6
 _ShedulerTask = None
 
 #------------------------------------------------------------------------------
 
 
 def write2log(txt):
-    out_file = open(settings.UpdateLogFilename(), 'a')
-    out_file.write(strng.to_text(txt))
-    out_file.close()
+    try:
+        out_file = open(settings.UpdateLogFilename(), 'a')
+        out_file.write(strng.to_text(txt))
+        out_file.close()
+    except:
+        pass
 
 
 #------------------------------------------------------------------------------
@@ -129,13 +132,13 @@ def sync_callback(result):
         events.send('source-code-update-error', data=dict(result=result))
 
     try:
-        from bitdust.system import tray_icon
+        # from bitdust.system import tray_icon
         if result == 'error':
             # tray_icon.draw_icon('error')
             # reactor.callLater(5, tray_icon.restore_icon)
             return
         elif result == 'code-fetched':
-            tray_icon.set_icon('updated')
+            # tray_icon.set_icon('updated')
             return
     except:
         pass
@@ -178,48 +181,56 @@ def sync(callback_func=None, update_method='rebase'):
         `git rebase origin/master -v`  or  `git reset --hard origin/master`
 
     """
-    src_dir_path = bpio.getExecutableDir()
+    src_dir_path = os.path.abspath(os.path.join(bpio.getExecutableDir(), '..'))
     expected_src_dir = os.path.join(deploy.default_base_dir_portable(), 'src')
+    if _Debug:
+        lg.args(_DebugLevel, update_method=update_method, src_dir=src_dir_path, expected_src_dir=expected_src_dir)
     if bpio.portablePath(src_dir_path) != bpio.portablePath(expected_src_dir):
         if _Debug:
             lg.out(_DebugLevel, 'git_proc.sync SKIP, non standard sources location: %r' % src_dir_path)
         return
 
     def _reset_done(response, error, retcode, result):
+        if _Debug:
+            lg.args(_DebugLevel, retcode=retcode, error=error, response=response)
         if callback_func is None:
             return
+        if retcode != 0:
+            result = 'sync-error'
+        else:
+            if result == 'new-code':
+                result = 'code-fetched'
+            else:
+                result = 'up-to-date'
         callback_func(result)
 
     def _rebase_done(response, error, retcode, result):
+        if _Debug:
+            lg.args(_DebugLevel, retcode=retcode, error=error, response=response)
         if callback_func is None:
             return
         if retcode != 0:
             result = 'sync-error'
         else:
-            if response.count(b'Changes from') or response.count(b'Fast-forwarded'):
+            if result == 'new-code' or response.count(b'Changes from') or response.count(b'Fast-forwarded'):
                 result = 'code-fetched'
             else:
                 result = 'up-to-date'
         callback_func(result)
 
     def _fetch_done(response, error, retcode):
+        if _Debug:
+            lg.args(_DebugLevel, retcode=retcode, error=error, response=response)
         if retcode != 0:
             if callback_func:
                 callback_func('sync-error')
             return
-        result = 'sync-error'
-        if response.count(b'Unpacking') or \
-            (response.count(b'master') and response.count(b'->')) or \
-            response.count(b'Updating') or \
-            response.count(b'Receiving') or \
-                response.count(b'Counting'):
+        result = 'fetch-ok'
+        if response.count(b'Unpacking') or (response.count(b'master') and response.count(b'->')) or \
+            response.count(b'Updating') or response.count(b'Receiving') or response.count(b'Counting'):
             result = 'new-code'
         if update_method == 'reset':
-            run([
-                'reset',
-                '--hard',
-                'origin/master',
-            ], callback=lambda resp, err, ret: _reset_done(resp, err, ret, result))
+            run(['reset', '--hard', 'origin/master'], callback=lambda resp, err, ret: _reset_done(resp, err, ret, result))
         elif update_method == 'rebase':
             run(['rebase', 'origin/master', '-v'], callback=lambda resp, err, ret: _rebase_done(resp, err, ret, result))
         else:
@@ -234,7 +245,7 @@ def _fetch_done(response, error, retcode):
 def run(cmdargs, base_dir=None, git_bin=None, env=None, callback=None):
     if _Debug:
         lg.out(_DebugLevel, 'git_proc.run')
-    base_dir = base_dir or bpio.getExecutableDir()
+    base_dir = base_dir or os.path.abspath(os.path.join(bpio.getExecutableDir(), '..'))
     if bpio.Windows():
         cmd = [
             'git',