neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-20 12:13:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[error-handling]: Improved Error handling for all OperationTypes in AppManager

Browse Source
This commit is contained in:
Magesh K
2024-12-13 16:30:24 +05:30
parent d045c0ed4d
commit 9597c7deb6
2 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
AltStore/Managing Apps/AppManager.swift
View File

@@ -1407,7 +1407,9 @@ private extension AppManager
verifyPledgeOperation?.resultHandler = { result in verifyPledgeOperation?.resultHandler = { result in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success: break case .success: break
} }
} }
@@ -1421,10 +1423,16 @@ private extension AppManager
{ {
let app = try result.get() let app = try result.get()
context.app = app context.app = app
if cacheApp
{
try FileManager.default.copyItem(at: app.fileURL, to: InstalledApp.fileURL(for: app), shouldReplace: true)
}
} }
catch catch
{ {
context.error = error context.error = error
completionHandler(.failure(error))
} }
} }
progress.addChild(downloadOperation.progress, withPendingUnitCount: 25) progress.addChild(downloadOperation.progress, withPendingUnitCount: 25)
@@ -1508,7 +1516,9 @@ private extension AppManager
refreshAnisetteDataOperation.resultHandler = { (result) in refreshAnisetteDataOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success(let anisetteData): group.context.session?.anisetteData = anisetteData case .success(let anisetteData): group.context.session?.anisetteData = anisetteData
} }
} }
@@ -1521,7 +1531,9 @@ private extension AppManager
fetchProvisioningProfilesOperation.resultHandler = { (result) in fetchProvisioningProfilesOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success(let provisioningProfiles): case .success(let provisioningProfiles):
context.provisioningProfiles = provisioningProfiles context.provisioningProfiles = provisioningProfiles
print("PROVISIONING PROFILES \(context.provisioningProfiles)") print("PROVISIONING PROFILES \(context.provisioningProfiles)")
@@ -1659,7 +1671,9 @@ private extension AppManager
resignAppOperation.resultHandler = { (result) in resignAppOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success(let resignedApp): context.resignedApp = resignedApp case .success(let resignedApp): context.resignedApp = resignedApp
} }
} }
@@ -1672,7 +1686,9 @@ private extension AppManager
sendAppOperation.resultHandler = { (result) in sendAppOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success(_): print("App reported as installed") case .success(_): print("App reported as installed")
} }
} }
@@ -1757,7 +1773,9 @@ private extension AppManager
fetchProvisioningProfilesOperation.resultHandler = { (result) in fetchProvisioningProfilesOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success(let provisioningProfiles): context.provisioningProfiles = provisioningProfiles case .success(let provisioningProfiles): context.provisioningProfiles = provisioningProfiles
} }
} }
@@ -1839,6 +1857,7 @@ private extension AppManager
case .failure(let error): case .failure(let error):
restoreContext.error = error restoreContext.error = error
appContext.error = error appContext.error = error
completionHandler(.failure(error))
} }
} }
restoreAppOperation.addDependency(installBackupAppOperation) restoreAppOperation.addDependency(installBackupAppOperation)
@@ -1960,7 +1979,9 @@ private extension AppManager
backupAppOperation.resultHandler = { (result) in backupAppOperation.resultHandler = { (result) in
switch result switch result
{ {
case .failure(let error): context.error = error case .failure(let error):
context.error = error
completionHandler(.failure(error))
case .success: break case .success: break
} }
} }
@@ -2016,6 +2037,7 @@ private extension AppManager
case .failure(let error): case .failure(let error):
restoreContext.error = error restoreContext.error = error
appContext.error = error appContext.error = error
completionHandler(.failure(error))
} }
} }
backupAppOperation.addDependency(installBackupAppOperation) backupAppOperation.addDependency(installBackupAppOperation)

12
AltStore/Operations/DownloadAppOperation.swift
View File

@@ -126,6 +126,7 @@ final class DownloadAppOperation: ResultOperation<ALTApplication>
override func finish(_ result: Result<ALTApplication, Error>) override func finish(_ result: Result<ALTApplication, Error>)
{ {
if(FileManager.default.fileExists(atPath: self.temporaryDirectory.path)){
do do
{ {
try FileManager.default.removeItem(at: self.temporaryDirectory) try FileManager.default.removeItem(at: self.temporaryDirectory)
@@ -134,6 +135,7 @@ final class DownloadAppOperation: ResultOperation<ALTApplication>
{ {
print("Failed to remove DownloadAppOperation temporary directory: \(self.temporaryDirectory).", error) print("Failed to remove DownloadAppOperation temporary directory: \(self.temporaryDirectory).", error)
} }
}
super.finish(result) super.finish(result)
} }
@@ -155,8 +157,9 @@ private extension DownloadAppOperation
func download(@Managed _ app: AppProtocol) func download(@Managed _ app: AppProtocol)
{ {
guard let sourceURL = self.sourceURL else { return self.finish(.failure(OperationError.appNotFound(name: self.appName))) guard let sourceURL = self.sourceURL else {
return self.finish(.failure(OperationError.appNotFound(name: self.appName)))
}
if let appVersion = app as? AppVersion if let appVersion = app as? AppVersion
{ {
// All downloads go through this path, and `app` is // All downloads go through this path, and `app` is
@@ -164,7 +167,7 @@ private extension DownloadAppOperation
// so context.appVersion != nil means downloading from source. // so context.appVersion != nil means downloading from source.
self.context.appVersion = appVersion self.context.appVersion = appVersion
} }
downloadIPA(from: sourceURL!) { result in downloadIPA(from: sourceURL) { result in
do do
{ {
let application = try result.get() let application = try result.get()
@@ -203,7 +206,6 @@ private extension DownloadAppOperation
self.finish(.failure(error)) self.finish(.failure(error))
} }
} }
}
func downloadIPA(from sourceURL: URL, completionHandler: @escaping (Result<ALTApplication, Error>) -> Void) func downloadIPA(from sourceURL: URL, completionHandler: @escaping (Result<ALTApplication, Error>) -> Void)
{ {
@@ -229,7 +231,7 @@ private extension DownloadAppOperation
} }
defer { defer {
if !sourceURL.isFileURL if !sourceURL.isFileURL && FileManager.default.fileExists(atPath: fileURL.path)
{ {
try? FileManager.default.removeItem(at: fileURL) try? FileManager.default.removeItem(at: fileURL)
} }