Update

* remember last window positions;
* get remote info of files in directory
* update rpc_service.py

Author: kezhengjie

.vscode/launch.json

@@ -5,11 +5,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Python 调试程序: 当前文件",
+            "name": "mainwindow",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/mainwindow.py",
             "console": "integratedTerminal"
+        },
+        {
+            "name": "Python 调试程序: 当前文件",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
         }
     ]
 }

config.py

@@ -1,16 +1,34 @@
 import json
 
+from rpc_service import DEFAULT_GRPC_PORT
+
 
 class Config:
     def __init__(self) -> None:
         self.ip = ""
         self.filepath = ""
+        self.listen_port = DEFAULT_GRPC_PORT
+        self.x = None
+        self.y = None
 
         try:
             with open("config.json") as fd:
                 d = json.loads(fd.read())
                 self.ip = d["ip"]
                 self.filepath = d["filepath"]
+                try:
+                    self.listen_port = int(d["listen_port"])
+                except Exception as e:
+                    print(e)
+                try:
+                    self.x = int(d["x"])
+                except Exception as e:
+                    print(e)
+                try:
+                    self.y = int(d["y"])
+                except Exception as e:
+                    print(e)
+
         except Exception as e:
             print(e)
 
@@ -22,6 +40,9 @@ def save(self):
                         {
                             "ip": self.ip,
                             "filepath": self.filepath,
+                            "listen_port": self.listen_port,
+                            "x": self.x,
+                            "y": self.y,
                         }
                     )
                 )

mainwindow.py

@@ -18,9 +18,10 @@
 )
 from PySide6.QtCore import QObject, Signal
 import grpc
+from PySide6.QtGui import QMoveEvent
 
 from compress import compress_file, decompress
-from rpc_service import GRPC_PORT, GrpcClient, RPCService
+from rpc_service import GrpcClient, RPCService
 from config import Config
 import rpc_service_pb2_grpc
 
@@ -45,7 +46,7 @@ def initUI(self):
         self.config = Config()
 
         hbox_layout_01 = QHBoxLayout()
-        self.ip_label = QLabel("ip:")
+        self.ip_label = QLabel("远程地址:")
         self.ip_label.setMinimumWidth(35)
         self.ip_edit = QLineEdit(self.config.ip)
         # self.ip_edit.setStyleSheet("QLineEdit { padding-left: 0px; margin-left:14px}")
@@ -59,14 +60,17 @@ def initUI(self):
         qvbox_layout.addLayout(hbox_layout_01)
 
         hbox_layout_02 = QHBoxLayout()
-        self.filepath_title_label = QLabel("文件:")
+        self.filepath_title_label = QLabel("目标:")
         self.filepath_title_label.setMinimumWidth(35)
         self.filepath_line_edit = QLineEdit(self.config.filepath)
         self.select_file_button = QPushButton("选择文件")
         self.select_file_button.clicked.connect(self.show_file_select_dialog)
+        self.select_directory_button = QPushButton("选择文件夹")
+        self.select_directory_button.clicked.connect(self.show_directory_select_dialog)
         hbox_layout_02.addWidget(self.filepath_title_label, 0)
         hbox_layout_02.addWidget(self.filepath_line_edit, 1)
         hbox_layout_02.addWidget(self.select_file_button, 0)
+        hbox_layout_02.addWidget(self.select_directory_button, 0)
         qvbox_layout.addLayout(hbox_layout_02)
 
         self.console = QTextEdit()
@@ -90,32 +94,62 @@ def initUI(self):
         self.setLayout(qvbox_layout)
         self.setGeometry(300, 300, 500, 400)
         self.setWindowTitle("Game Save Sync")
+        if self.config.x is not None and self.config.y is not None:
+            self.move(self.config.x, self.config.y)
         self.show()
         self.start_grpc_thread()
 
+    def moveEvent(self, ev: QMoveEvent):
+        self.config.x = ev.pos().x()
+        self.config.y = ev.pos().y()
+        self.config.save()
+
     def start_grpc_thread(self):
         self.grpc_server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
         rpc_service_pb2_grpc.add_RpcServicer_to_server(
             RPCService(get_filepath=self.filepath_line_edit.text, logger=self.print),
             self.grpc_server,
         )
-        self.grpc_server.add_insecure_port("[::]:" + str(GRPC_PORT))
+        self.grpc_server.add_insecure_port("[::]:" + str(self.config.listen_port))
         self.grpc_server.start()
 
     def show_file_select_dialog(self):
         filepath = QFileDialog.getOpenFileName(
             self,
             "选择文件",
+            (
+                os.path.dirname(self.filepath_line_edit.text())
+                if self.filepath_line_edit.text() != ""
+                else "."
+            ),
         )
         if filepath[0] != "":
             self.filepath_line_edit.setText(filepath[0])
             self.config.filepath = filepath[0]
             self.config.save()
 
+    def show_directory_select_dialog(self):
+        dir_path = QFileDialog.getExistingDirectory(
+            self,
+            "选择文件夹",
+            (
+                os.path.dirname(self.filepath_line_edit.text())
+                if self.filepath_line_edit.text() != ""
+                else "."
+            ),
+        )
+        if dir_path != "":
+            self.filepath_line_edit.setText(dir_path)
+            self.config.filepath = dir_path
+            self.config.save()
+
     def show_ip_edit_dialog(self):
         input_dialog = QInputDialog()
         text, ok = input_dialog.getText(
-            self, "修改ip", "请输入ip:", text=self.config.ip
+            self,
+            "修改地址",
+            "请输入地址:",
+            text=self.config.ip,
         )
         if ok:
             self.ip_edit.setText(text)
@@ -129,13 +163,23 @@ def compress_file(self, filepath: str):
         self.print(f"压缩完成")
         return zip_filepath
 
+    def sync_directory(self):
+        with GrpcClient.get_channel(self.config.ip) as channel:
+            response = GrpcClient.get_remote_files_status(
+                channel, os.path.basename(self.filepath_line_edit.text())
+            )
+            for file_info in response.files:
+                self.print(str(file_info))
+
     def start_sync(self):
         self.sync_button.setDisabled(True)
 
         def sync_method():
             self.print("开始同步")
             try:
                 local_filepath = self.filepath_line_edit.text()
+                if os.path.isdir(local_filepath):
+                    return self.sync_directory()
                 local_file_md5 = ""
                 local_file_basename = os.path.basename(local_filepath)
                 local_file_mtime = 0

rpc_service.proto

@@ -2,47 +2,36 @@ syntax = "proto3";
 
 package game.save.sync;
 
-service Rpc { 
-  rpc Ping (PingRequest) returns (PingReply) {}
-  rpc Binary(BinaryRequest) returns(BinaryReply){}
-  rpc FileStatus(FileStatusRequest) returns(FileStatusReply){}
-  rpc UploadFile(stream UploadFileRequest)returns(UploadFileReply){}
-  rpc DownloadFile(DownloadFileRequest)returns(stream DownloadFileReply){}
-}
-
-message DownloadFileRequest{}
-message DownloadFileReply{
-  bytes data = 1;
-}
-
-message UploadFileRequest{
-  bytes data = 1;
-}
-
-message UploadFileReply{
-  bool status = 1;
-}
-
-message PingRequest {
-  string msg = 1;
-}
-
-message PingReply {
-  string msg = 1;
-}
-
-message BinaryRequest{
-  bytes b = 1;
-}
-
-message BinaryReply{
-  string msg = 1;
-}
-
-message FileStatusRequest{}
-message FileStatusReply{
+service Rpc {
+  rpc Ping(PingRequest) returns (PingReply) {}
+  rpc Binary(BinaryRequest) returns (BinaryReply) {}
+  rpc FileStatus(FileStatusRequest) returns (FileStatusReply) {}
+  rpc UploadFile(stream UploadFileRequest) returns (UploadFileReply) {}
+  rpc DownloadFile(DownloadFileRequest) returns (stream DownloadFileReply) {}
+  rpc DirectoryStatus(DirectoryStatusRequest) returns (DirectoryStatusReply) {}
+  rpc ReceiveDirectory(ReceiveDirectoryRequest)
+      returns (ReceiveDirectoryReply) {}
+  rpc DownloadDirectory(DownloadDirectoryRequest)
+      returns (DownloadDirectoryReply) {}
+}
+
+message ReceiveDirectoryRequest {}
+message ReceiveDirectoryReply {}
+message DownloadDirectoryRequest {}
+message DownloadDirectoryReply {}
+message DirectoryStatusRequest { string directory_name = 1; }
+message DirectoryStatusReply { repeated FileStatusReply files = 1; }
+message DownloadFileRequest {}
+message DownloadFileReply { bytes data = 1; }
+message UploadFileRequest { bytes data = 1; }
+message UploadFileReply { bool status = 1; }
+message PingRequest { string msg = 1; }
+message PingReply { string msg = 1; }
+message BinaryRequest { bytes b = 1; }
+message BinaryReply { string msg = 1; }
+message FileStatusRequest {}
+message FileStatusReply {
   string md5 = 1;
   int64 timestamp = 2;
   string filename = 3;
 }
-

rpc_service.py

@@ -11,7 +11,7 @@
 import rpc_service_pb2_grpc
 from threading import Thread
 
-GRPC_PORT = 6465
+DEFAULT_GRPC_PORT = 6465
 
 
 class RPCService(rpc_service_pb2_grpc.RpcServicer):
@@ -34,6 +34,9 @@ def FileStatus(self, request, context):
             return rpc_service_pb2.FileStatusReply(
                 md5="", timestamp=0, filename=os.path.basename(filepath)
             )
+        if os.path.isdir(filepath):
+            context.set_code(grpc.StatusCode.INVALID_ARGUMENT)
+            context.set_details("not a file")
         file_timestamp = int(os.path.getmtime(filepath))
         with open(filepath, "rb") as fp:
             data = fp.read()
@@ -70,14 +73,49 @@ def DownloadFile(self, request, context):
                     return
                 yield rpc_service_pb2.DownloadFileReply(data=data)
 
+    def DirectoryStatus(self, request, context):
+        directory_path = self._get_filepath()
+        if os.path.basename(directory_path) != request.directory_name:
+            context.set_code(grpc.StatusCode.INVALID_ARGUMENT)
+            context.set_details("not a directory")
+            return rpc_service_pb2.DirectoryStatusReply()
+        result = []
+        for path, _, filenames in os.walk(directory_path):
+            for filename in filenames:
+                local_filepath = os.path.join(path, filename)
+                relative_path = local_filepath[len(directory_path) + 1 :]
+                md5 = None
+                try:
+                    with open(local_filepath, "rb") as fp:
+                        data = fp.read()
+                        md5 = hashlib.md5(data).hexdigest()
+                    file_timestamp = int(os.path.getmtime(local_filepath))
+                except Exception as e:
+                    print(e)
+                    continue
+                result.append(
+                    rpc_service_pb2.FileStatusReply(
+                        md5=md5,
+                        timestamp=file_timestamp,
+                        filename=relative_path,
+                    )
+                )
+        return rpc_service_pb2.DirectoryStatusReply(files=result)
+
 
 BUF_SIZE = 1024 * 1024 * 2
 
 
 class GrpcClient:
     @staticmethod
-    def get_channel(ip: str):
-        return grpc.insecure_channel(f"{ip}:{GRPC_PORT}")
+    def get_channel(addr: str):
+        ip = None
+        port = DEFAULT_GRPC_PORT
+        i = addr.find(":")
+        if i != -1:
+            ip = addr[:i]
+            port = int(addr[i + 1 :])
+        return grpc.insecure_channel(f"{ip}:{port}")
 
     @staticmethod
     def get_remote_file_status(channel: grpc.Channel):
@@ -103,6 +141,13 @@ def download_file(channel: grpc.Channel):
         stub = rpc_service_pb2_grpc.RpcStub(channel)
         return stub.DownloadFile(rpc_service_pb2.DownloadFileRequest())
 
+    @staticmethod
+    def get_remote_files_status(channel: grpc.Channel, directory_name: str):
+        stub = rpc_service_pb2_grpc.RpcStub(channel)
+        return stub.DirectoryStatus(
+            rpc_service_pb2.DirectoryStatusRequest(directory_name=directory_name)
+        )
+
 
 def serve():
     def wrapper():
@@ -140,7 +185,7 @@ def test():
         RPCService(get_filepath=lambda: sys.argv[1], logger=print),
         grpc_server,
     )
-    grpc_server.add_insecure_port("[::]:" + str(GRPC_PORT))
+    grpc_server.add_insecure_port("[::]:" + str(DEFAULT_GRPC_PORT))
     grpc_server.start()
     try:
         while True: