Skip to content

Commit db92567

Browse files
committed
Use a UUID string as MuxUpload internal identifier (#30)
1 parent b33bd7c commit db92567

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

Sources/MuxUploadSDK/PublicAPI/MuxUpload.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final class MuxUpload : Hashable, Equatable {
4848

4949
private let uploadInfo: UploadInfo
5050
private let manageBySDK: Bool
51-
private let id: Int
51+
private let id: String = UUID().uuidString
5252
private let uploadManager: UploadManager
5353

5454
private var lastSeenStatus: Status = Status(progress: Progress(totalUnitCount: 0), updatedTime: 0, startTime: 0, isPaused: false)
@@ -276,7 +276,6 @@ public final class MuxUpload : Hashable, Equatable {
276276
private init (uploadInfo: UploadInfo, manage: Bool = true, uploadManager: UploadManager) {
277277
self.uploadInfo = uploadInfo
278278
self.manageBySDK = manage
279-
self.id = Int.random(in: Int.min...Int.max)
280279
self.uploadManager = uploadManager
281280
}
282281

Sources/MuxUploadSDK/PublicAPI/UploadManager.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public final class UploadManager {
5656
public func resumeUpload(ofFile: URL) async -> MuxUpload? {
5757
let fileUploader = await uploadActor.getUpload(ofFileAt: ofFile)
5858
if let nonNilUploader = fileUploader {
59-
nonNilUploader.addDelegate(withToken: Int.random(in: Int.min...Int.max), uploaderDelegate)
59+
nonNilUploader.addDelegate(withToken: UUID().uuidString, uploaderDelegate)
6060
return MuxUpload(wrapping: nonNilUploader, uploadManager: self)
6161
} else {
6262
return nil
@@ -79,7 +79,7 @@ public final class UploadManager {
7979
public func resumeAllUploads() {
8080
Task.detached { [self] in
8181
for upload in await uploadActor.getAllUploads() {
82-
upload.addDelegate(withToken: Int.random(in: Int.min...Int.max), uploaderDelegate)
82+
upload.addDelegate(withToken: UUID().uuidString, uploaderDelegate)
8383
}
8484
}
8585
}
@@ -108,10 +108,10 @@ public final class UploadManager {
108108
internal func findUploaderFor(videoFile url: URL) -> ChunkedFileUploader? {
109109
return uploadersByURL[url]
110110
}
111-
112-
internal func registerUploader(_ fileWorker: ChunkedFileUploader, withId id: Int) {
111+
112+
internal func registerUploader(_ fileWorker: ChunkedFileUploader, withId id: String) {
113113
uploadersByURL.updateValue(fileWorker, forKey: fileWorker.uploadInfo.videoFile)
114-
fileWorker.addDelegate(withToken: id + 1, uploaderDelegate)
114+
fileWorker.addDelegate(withToken: UUID().uuidString, uploaderDelegate)
115115
Task.detached {
116116
await self.uploadActor.updateUpload(
117117
fileWorker.uploadInfo,

Sources/MuxUploadSDK/Upload/ChunkedFileUploader.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ChunkedFileUploader {
1616
let uploadInfo: UploadInfo
1717
var currentState: InternalUploadState { get { _currentState } }
1818

19-
private var delegates: [Int : ChunkedFileUploaderDelegate] = [:]
19+
private var delegates: [String : ChunkedFileUploaderDelegate] = [:]
2020

2121
private let file: ChunkedFile
2222
private var currentWorkTask: Task<(), Never>? = nil
@@ -25,11 +25,11 @@ class ChunkedFileUploader {
2525
private var lastReadCount: UInt64 = 0
2626
private let reporter = Reporter()
2727

28-
func addDelegate(withToken token: Int, _ delegate: ChunkedFileUploaderDelegate) {
28+
func addDelegate(withToken token: String, _ delegate: ChunkedFileUploaderDelegate) {
2929
delegates.updateValue(delegate, forKey: token)
3030
}
3131

32-
func removeDelegate(withToken: Int) {
32+
func removeDelegate(withToken: String) {
3333
delegates.removeValue(forKey: withToken)
3434
}
3535

0 commit comments

Comments
 (0)