update_git_module

preset/app/git.py

@@ -74,10 +74,10 @@ def checkout(localRep, branch, progStream=None):
         porcelain.checkout_branch(r, 'origin/' + branch, outstream=progStream)
 
 
-def pull(repo_path, progStream=None, depth=3):
+def pull(localRep, progStream=None, depth=3):
     if progStream is None:
         progStream = NoneStream()
-    porcelain.pull(repo_path, refspecs=porcelain.active_branch(repo_path), outstream=progStream, depth=depth)
+    porcelain.pull(localRep, refspecs=porcelain.active_branch(localRep), outstream=progStream, depth=depth)
 
 
 def reset(localRep):
@@ -111,6 +111,18 @@ def isOnline(localRep):
     except Exception as e:
         # print(f"Connection failed: {e}")
         return False
+    
+def swRemote(localRep, remote_url):
+    r = Repo(localRep)
+    porcelain.remote_remove(r,'origin')
+    porcelain.remote_add(r,'origin',remote_url)
+
+def swRemote_force(localRep, remote_url):
+    r = Repo(localRep)
+    porcelain.remote_remove(r,'origin')
+    porcelain.remote_add(r,'origin',remote_url)
+    porcelain.fetch(localRep)
+    porcelain.pull(localRep, refspecs=porcelain.active_branch(localRep), force=True)
 
 
 if __name__ == '__main__':

preset/app/ota.py

@@ -1,5 +1,5 @@
-import os
-
-os.system('chmod -R 777 /home')
-os.system('rsync -r --checksum /home/backup/ /root')
+import os
+
+os.system('chmod -R 777 /home')
+os.system('rsync -r --checksum /home/backup/ /root')
 os.system("ps | grep main.py | grep -v grep | awk '{print $1}' | xargs kill")

preset/app/reset.py

@@ -1,23 +1,23 @@
-localrep = "/home/backup"
-otaPath = "/root/preset/app/ota.py"
-
-from maix import camera, display, image
-
-image.load_freetype("/root/preset/fonts/simhei.ttf")
-hello_img = image.new(size=(320, 240), color=(0, 0, 0), mode="RGB")
-hello_img.draw_string(10, 115, 'Reset', scale=1.0, color=(255, 255, 255), thickness=1)
-display.show(hello_img)
-
-import git
-
-git.rw()
-git.reset(localrep)
-hello_img = image.new(size=(320, 240), color=(0, 0, 0), mode="RGB")
-hello_img.draw_string(10, 115, 'Reconstruct directory', scale=1.0, color=(255, 255, 255), thickness=1)
-display.show(hello_img)
-
-with open(otaPath) as f:
-    code = f.read()
-exec(code)
-
-git.ro()
+localrep = "/home/backup"
+otaPath = "/root/preset/app/ota.py"
+
+from maix import camera, display, image
+
+image.load_freetype("/root/preset/fonts/simhei.ttf")
+hello_img = image.new(size=(320, 240), color=(0, 0, 0), mode="RGB")
+hello_img.draw_string(10, 115, 'Reset', scale=1.0, color=(255, 255, 255), thickness=1)
+display.show(hello_img)
+
+import git
+
+git.rw()
+git.reset(localrep)
+hello_img = image.new(size=(320, 240), color=(0, 0, 0), mode="RGB")
+hello_img.draw_string(10, 115, 'Reconstruct directory', scale=1.0, color=(255, 255, 255), thickness=1)
+display.show(hello_img)
+
+with open(otaPath) as f:
+    code = f.read()
+exec(code)
+
+git.ro()

preset/app/swremote.py

@@ -1,5 +1,5 @@
 localrep = "/home/backup"
-remote_url = "https://git.cocorobo.cn/liushuai/CocoPi_upgrade.git"
+remote_url = "https://gitee.com/ForeverXJie/test.git"
 
 import git