helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2026-08-22 13:13:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup error formatting

Browse source
This commit is contained in:
shenlong-tanwen 2026-08-13 07:20:09 +05:30
parent db60295e63
commit ffdd360bd7
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mobile/ios/Runner/Sync/MessagesImpl.swift
View file

@ -454,19 +454,24 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
}
private func cloudIdErrorKind(for error: Error) -> CloudIdErrorKind {
private func cloudIdError(for error: Error) -> (kind: CloudIdErrorKind, message: String) {
let nsError = error as NSError
var message = "Error getting Cloud Id: \(error.localizedDescription)"
guard nsError.domain == PHPhotosErrorDomain else {
return .unknown
return (.unknown, message)
}
switch nsError.code {
case PHPhotosError.identifierNotFound.rawValue:
return .notFound
return (.notFound, message)
case PHPhotosError.multipleIdentifiersFound.rawValue:
return .ambiguous
if let matches = nsError.userInfo[PHLocalIdentifiersErrorKey] as? [String] {
message += " (matched: \(matches.joined(separator: ", ")))"
}
return (.ambiguous, message)
default:
return .unknown
return (.unknown, message)
}
}
@ -491,12 +496,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
CloudIdResult(assetId: key, error: "Incomplete Cloud Id: \(cloudId)", errorKind: .incomplete))
}
case .failure(let error):
let kind = cloudIdErrorKind(for: error)
var message = "Error getting Cloud Id: \(error.localizedDescription)"
if kind == .ambiguous,
let matches = (error as NSError).userInfo[PHLocalIdentifiersErrorKey] as? [String] {
message += " (matched: \(matches.joined(separator: ", ")))"
}
let (kind, message) = cloudIdError(for: error)
mappings.append(CloudIdResult(assetId: key, error: message, errorKind: kind))
}
}

1
mobile/pigeon/native_sync_api.dart
View file

@ -102,7 +102,6 @@ enum CloudIdErrorKind {
ambiguous,
// PhotoKit returned a partially synced identifier ("GUID:ID:" with no trailing hash)
incomplete,
unsupported,
unknown,
}