Merge pull request #91 from wildfoundry/fix-uploads

fix bug uploading files
wildfoundry · May 8, 2023 · 3e0b46f · 3e0b46f
2 parents 8fd1e37 + 96128f9
commit 3e0b46f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/dataplicity/_version.py b/dataplicity/_version.py
@@ -1,4 +1,4 @@
-__version__ = "0.5.9"
+__version__ = "0.5.10"
 
 if __name__ == "__main__":
     # The build script uses this to extract the current version

diff --git a/dataplicity/clockcheck.py b/dataplicity/clockcheck.py
@@ -16,7 +16,7 @@
 
 
 CHECK_PERIOD = 1.0
-MAX_CLOCK_DISCREPENCY = 10.0
+MAX_CLOCK_DISCREPANCY = 180.0
 
 
 class ClockCheckThread(Thread):
@@ -34,7 +34,7 @@ def run(self):
             sleep(CHECK_PERIOD)
             elapsed = time() - start
 
-            if elapsed > MAX_CLOCK_DISCREPENCY:
+            if elapsed > MAX_CLOCK_DISCREPANCY:
                 self.on_fail()
 
     def on_fail(self):

diff --git a/dataplicity/m2m/packets.py b/dataplicity/m2m/packets.py
@@ -512,6 +512,7 @@ class WriteRemoteFileResult(M2MPacket):
     attributes = [
         ("id", bytes),
         ("position", int),
+        ("chunk_size", int),
         ("device_path", bytes),
         ("fail", int),
         ("fail_reason", bytes),

diff --git a/dataplicity/remote_directory.py b/dataplicity/remote_directory.py
@@ -315,6 +315,8 @@ def on_write_remote_file(self, client, id, path, device_path, offset, data, fina
             client.send(
                 PacketType.write_remote_file_result,
                 id,
+                offset,
+                len(data),
                 device_path,
                 1,
                 str(error).encode("utf-8", "replace"),
@@ -337,6 +339,7 @@ def on_write_remote_file(self, client, id, path, device_path, offset, data, fina
                     PacketType.write_remote_file_result,
                     id,
                     offset,
+                    len(data),
                     device_path,
                     2,
                     str(error).encode("utf-8", "replace"),
@@ -357,6 +360,7 @@ def on_write_remote_file(self, client, id, path, device_path, offset, data, fina
                     PacketType.write_remote_file_result,
                     id,
                     offset,
+                    len(data),
                     device_path,
                     3,
                     str(error).encode("utf-8", "replace"),
@@ -368,6 +372,7 @@ def on_write_remote_file(self, client, id, path, device_path, offset, data, fina
             PacketType.write_remote_file_result,
             id,
             offset + len(data),
+            len(data),
             device_path,
             0,
             b"",