Skip to content

Rename enum and adjust to camel casing #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Sources/MuxUploadSDK/Upload/UploadPersistence.swift
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,17 @@ class UploadPersistence {
/// Flattened version of an upload in progress
struct PersistenceEntry : Codable {
let savedAt: TimeInterval
let stateCode: StoredState
let stateCode: PreviousStateCode
let lastSuccessfulByte: UInt64
let uploadInfo: UploadInfo

enum StoredState : Int, Codable { case was_in_progress = 0, was_paused = 1 }
enum PreviousStateCode : Int, Codable {
case wasInProgress = 0, wasPaused = 1
}

func with(
savedAt: TimeInterval? = nil,
stateCode: StoredState? = nil,
stateCode: PreviousStateCode? = nil,
lastSuccessfulByte: UInt64? = nil,
uploadInfo: UploadInfo? = nil
) -> PersistenceEntry {
Expand All @@ -147,19 +149,19 @@ struct PersistenceEntry : Codable {
// Can start again but from the beginning
case .starting, .ready: return PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_in_progress,
stateCode: .wasInProgress,
lastSuccessfulByte: 0,
uploadInfo: upload
)
case .paused(let update): return PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: UInt64(update.progress.completedUnitCount),
uploadInfo: upload
)
case .uploading(let update): return PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_in_progress,
stateCode: .wasInProgress,
lastSuccessfulByte: UInt64(update.progress.completedUnitCount),
uploadInfo: upload
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ final class UploadPersistenceTests: XCTestCase {
func testWrite() throws {
let e1 = PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "e1")
)
let e2 = PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "e2")
)
Expand Down Expand Up @@ -54,13 +54,13 @@ final class UploadPersistenceTests: XCTestCase {
func testReadAndReadAll() throws {
let e1 = PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "e1")
)
let e2 = PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "e2")
)
Expand Down Expand Up @@ -106,13 +106,13 @@ final class UploadPersistenceTests: XCTestCase {
func testRemove() throws {
let e1 = PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "e1")
)
let e2 = PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "e2")
)
Expand Down Expand Up @@ -144,13 +144,13 @@ final class UploadPersistenceTests: XCTestCase {
func testCleanUpOldEntriesRemovesThreeDayOldEntries() throws {
let newerEntry = PersistenceEntry(
savedAt: Date().timeIntervalSince1970,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "newer")
)
let olderEntry = PersistenceEntry(
savedAt: UploadPersistenceTests.OLD_ENTRY_AGE_SEC,
stateCode: .was_paused,
stateCode: .wasPaused,
lastSuccessfulByte: 0,
uploadInfo: renameDummyUploadInfo(basename: "older")
)
Expand Down