Skip to content
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.

Sign up for GitHub

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

[PP-1412] Properly map Feedbook audiobook manifests #443

Merged
merged 9 commits into from
Jul 2, 2024
Merged

[PP-1412] Properly map Feedbook audiobook manifests #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ac385ec
Resolve TOC navigation errors
mauricecarrier7 Jun 26, 2024
36ca31d
Merge branch 'beta' into PP-1406/TOC-navigation-error
mauricecarrier7 Jun 26, 2024
b0f5904
integrate updated audiobook toolkit
mauricecarrier7 Jul 1, 2024
3cc2ee8
Update project.pbxproj
mauricecarrier7 Jul 1, 2024
64825fa
Merge branch 'beta' into fix/PP-1412-Properly-map-feedbook-audiobook-…
mauricecarrier7 Jul 1, 2024
6ebd4a9
Update project.pbxproj
mauricecarrier7 Jul 1, 2024
d2a7a59
Update project.pbxproj
mauricecarrier7 Jul 1, 2024
0ad395f
Update TPPBookCellDelegate+Extensions.swift
mauricecarrier7 Jul 1, 2024
58c1879
Update ios-audiobooktoolkit
mauricecarrier7 Jul 1, 2024
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
12 changes: 6 additions & 6 deletions Palace.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5655,7 +5655,7 @@
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 267;
CURRENT_PROJECT_VERSION = 268;
DEVELOPMENT_TEAM = 88CBA74T8K;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5714,7 +5714,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 267;
CURRENT_PROJECT_VERSION = 268;
DEVELOPMENT_TEAM = 88CBA74T8K;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5899,7 +5899,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 267;
CURRENT_PROJECT_VERSION = 268;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5960,7 +5960,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 267;
CURRENT_PROJECT_VERSION = 268;
DEVELOPMENT_TEAM = 88CBA74T8K;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -6022,7 +6022,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 267;
CURRENT_PROJECT_VERSION = 268;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -6083,7 +6083,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 267;
CURRENT_PROJECT_VERSION = 268;
DEVELOPMENT_TEAM = 88CBA74T8K;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down
7 changes: 6 additions & 1 deletion Palace/MyBooks/MyBooksDownloadCenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,12 @@ extension MyBooksDownloadCenter {
// Assuming we create and use an audiobook object to manage deletion
guard let jsonData = try? JSONSerialization.data(withJSONObject: dict, options: []),
let manifest = try? Manifest.customDecoder().decode(Manifest.self, from: jsonData),
let audiobook = AudiobookFactory.audiobook(for: manifest, bookIdentifier: book.identifier, decryptor: nil, token: book.bearerToken) else {
let audiobook = AudiobookFactory.audiobook(
for: manifest,
bookIdentifier: book.identifier,
decryptor: nil,
token: book.bearerToken
) else {
return
}
audiobook.deleteLocalContent(completion: { _, _ in })
Expand Down
2 changes: 1 addition & 1 deletion ios-audiobooktoolkit
Open in desktop
Submodule ios-audiobooktoolkit updated 12 files
+8 −8 PalaceAudiobookToolkit.xcodeproj/project.pbxproj
+2 −2 PalaceAudiobookToolkit/Core/OpenAccessAudiobook.swift
+2 −2 PalaceAudiobookToolkit/DRM/FeedbookDRMProcessor.swift
+14 −6 PalaceAudiobookToolkit/Player/Helpers/Models/Manifest.swift
+59 −2 PalaceAudiobookToolkit/Player/Helpers/Models/Metadata.swift
+9 −5 PalaceAudiobookToolkit/Player/OpenAccessPlayer.swift
+4 −2 PalaceAudiobookToolkitTests/AudiobookNetworkServiceTest.swift
+0 −62 PalaceAudiobookToolkitTests/ChapterLocationTests.swift
+1 −0 PalaceAudiobookToolkitTests/DownloadTaskMock.swift
+2 −0 PalaceAudiobookToolkitTests/ManifestJSON.swift
+2 −1 PalaceAudiobookToolkitTests/SleepTimerTests.swift
+319 −0 PalaceAudiobookToolkitTests/TestResources/endOfTheWorld_manifest.json
Loading