mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-22 06:15:59 +00:00
Recover files on early disconnect
This commit is contained in:
1 parent
e68167788a
commit
bf7ad37d15
1 file changed
+47
@@ -48,6 +48,16 @@ class InboundNearbyConnection: NearbyConnection {
|
|||||||
|
|
||||||
|
|
||||||
override func disconnect() {
|
override func disconnect() {
|
||||||
|
let recoveredAllPendingFiles = recoverCompletedFilesOnDisconnect()
|
||||||
|
if recoveredAllPendingFiles {
|
||||||
|
if case let .protocolError(message) = self.lastError as? NearbyError,
|
||||||
|
message == "Error.ClosedByPeer".localized() {
|
||||||
|
log("[InboundNearbyConnection \(self.id)] Recovering completed transfer after connection closed by peer.")
|
||||||
|
self.lastError = nil
|
||||||
|
NearbyConnectionManager.shared.updatedTransferProgress(connection: self, progress: 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
super.disconnect()
|
super.disconnect()
|
||||||
currentState = .disconnected
|
currentState = .disconnected
|
||||||
deletePartiallyReceivedFiles()
|
deletePartiallyReceivedFiles()
|
||||||
@@ -704,4 +714,41 @@ class InboundNearbyConnection: NearbyConnection {
|
|||||||
try? FileManager.default.removeItem(at: file.destinationURL)
|
try? FileManager.default.removeItem(at: file.destinationURL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private func recoverCompletedFilesOnDisconnect() -> Bool {
|
||||||
|
guard !filesToBeReceived.isEmpty else { return false }
|
||||||
|
|
||||||
|
var recoveredCount = 0
|
||||||
|
let pendingFileIDs = Array(filesToBeReceived.keys)
|
||||||
|
|
||||||
|
for fileID in pendingFileIDs {
|
||||||
|
guard let file = filesToBeReceived[fileID] else { continue }
|
||||||
|
guard file.created, file.bytesTransferred == file.meta.size else { continue }
|
||||||
|
|
||||||
|
do {
|
||||||
|
try file.fileHandle?.close()
|
||||||
|
} catch {
|
||||||
|
log("[InboundNearbyConnection \(self.id)] Failed to close recovered file handle for \(file.destinationURL.lastPathComponent): \(error.localizedDescription)")
|
||||||
|
}
|
||||||
|
|
||||||
|
#if os(macOS)
|
||||||
|
file.progress?.unpublish()
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if !downloadedFiles.contains(file.destinationURL) {
|
||||||
|
downloadedFiles.append(file.destinationURL)
|
||||||
|
}
|
||||||
|
EXIFUtils.applyTimestamps(at: file.destinationURL)
|
||||||
|
|
||||||
|
filesToBeReceived.removeValue(forKey: fileID)
|
||||||
|
recoveredCount += 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if recoveredCount > 0 {
|
||||||
|
log("[InboundNearbyConnection \(self.id)] Recovered \(recoveredCount) completed file(s) during disconnect.")
|
||||||
|
}
|
||||||
|
|
||||||
|
return recoveredCount > 0 && filesToBeReceived.isEmpty
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user