fix:fix samefile logic error for s3+profile in sync (#548)

Author: LoveEatCandy

megfile/lib/compare.py

@@ -5,10 +5,10 @@
 
 
 def get_sync_type(src_protocol, dst_protocol):
-    if src_protocol == "s3" and dst_protocol != "s3":
-        return "download"
-    elif src_protocol != "s3" and dst_protocol == "s3":
+    if dst_protocol == "s3" or dst_protocol.startswith("s3+"):
         return "upload"
+    elif src_protocol == "s3" or src_protocol.startswith("s3+"):
+        return "download"
     else:
         return "copy"
 

megfile/s3_path.py

@@ -610,6 +610,7 @@ def create_generator(_s3_pathname) -> Iterator[FileEntry]:
                         yield FileEntry(S3Path(path).name, path, _make_stat(content))
                     dirname = os.path.dirname(path)
                     while dirname not in dirnames and dirname != top_dir:
+                        # TODO: optimize memory usage and file path order
                         dirnames.add(dirname)
                         path = dirname + "/" if search_dir else dirname
                         if pattern.match(path):

tests/utils/test_compare.py

@@ -6,6 +6,10 @@ def test_get_sync_type():
     assert compare.get_sync_type("s3", "fs") == "download"
     assert compare.get_sync_type("fs", "s3") == "upload"
     assert compare.get_sync_type("sftp", "fs") == "copy"
+    assert compare.get_sync_type("s3", "s3") == "upload"
+    assert compare.get_sync_type("s3", "s3+test") == "upload"
+    assert compare.get_sync_type("s3+test", "s3") == "upload"
+    assert compare.get_sync_type("s3+test", "fs") == "download"
 
 
 def test_compare_time():