atridad/Ascently
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 81 Activity

Logging overhaul

Browse Source
This commit is contained in:
Atridad Lahiji
2025-11-18 12:58:45 -07:00
parent c2f95f2793
commit 6d67ae6d81
25 changed files with 1428 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/Ascently.xcodeproj/LiveActivityManager.swift
View File

@@ -25,7 +25,7 @@ final class LiveActivityManager {
pushType: nil
)
} catch {
print("Failed to start live activity: \(error)")
AppLogger.error("Failed to start live activity: \(error)", tag: "LegacyLiveActivityManager")
}
}

BIN
ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

14
ios/Ascently/ContentView.swift
View File

@@ -91,11 +91,12 @@ struct ContentView: View {
object: nil,
queue: .main
) { _ in
print("App will enter foreground - preparing Live Activity check")
Task {
Task { @MainActor in
AppLogger.info(
"App will enter foreground - preparing Live Activity check", tag: "Lifecycle")
// Small delay to ensure app is fully active
try? await Task.sleep(nanoseconds: 800_000_000) // 0.8 seconds
await dataManager.onAppBecomeActive()
dataManager.onAppBecomeActive()
// Re-verify health integration when returning from background
await dataManager.healthKitService.verifyAndRestoreIntegration()
}
@@ -107,10 +108,11 @@ struct ContentView: View {
object: nil,
queue: .main
) { _ in
print("App did become active - checking Live Activity status")
Task {
Task { @MainActor in
AppLogger.info(
"App did become active - checking Live Activity status", tag: "Lifecycle")
try? await Task.sleep(nanoseconds: 300_000_000) // 0.3 seconds
await dataManager.onAppBecomeActive()
dataManager.onAppBecomeActive()
await dataManager.healthKitService.verifyAndRestoreIntegration()
}
}

39
ios/Ascently/Services/HealthKitService.swift
View File

@@ -38,7 +38,7 @@ class HealthKitService: ObservableObject {
{
currentWorkoutStartDate = startDate
currentWorkoutSessionId = sessionId
print("HealthKit: Restored active workout from \(startDate)")
AppLogger.info("HealthKit: Restored active workout from \(startDate)", tag: "HealthKit")
}
}
@@ -56,31 +56,34 @@ class HealthKitService: ObservableObject {
guard isEnabled else { return }
guard HKHealthStore.isHealthDataAvailable() else {
print("HealthKit: Device does not support HealthKit")
AppLogger.warning("HealthKit: Device does not support HealthKit", tag: "HealthKit")
return
}
checkAuthorization()
if !isAuthorized {
print(
"HealthKit: Integration was enabled but authorization lost, attempting to restore..."
)
AppLogger.warning(
"HealthKit: Integration was enabled but authorization lost, attempting to restore...",
tag: "HealthKit")
do {
try await requestAuthorization()
print("HealthKit: Authorization restored successfully")
AppLogger.info("HealthKit: Authorization restored successfully", tag: "HealthKit")
} catch {
print("HealthKit: Failed to restore authorization: \(error.localizedDescription)")
AppLogger.error(
"HealthKit: Failed to restore authorization: \(error.localizedDescription)",
tag: "HealthKit")
}
} else {
print("HealthKit: Integration verified - authorization is valid")
AppLogger.info(
"HealthKit: Integration verified - authorization is valid", tag: "HealthKit")
}
if hasActiveWorkout() {
print(
"HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)"
)
AppLogger.info(
"HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)",
tag: "HealthKit")
}
}
@@ -130,7 +133,7 @@ class HealthKitService: ObservableObject {
currentWorkoutStartDate = startDate
currentWorkoutSessionId = sessionId
persistActiveWorkout()
print("HealthKit: Started workout for session \(sessionId)")
AppLogger.info("HealthKit: Started workout for session \(sessionId)", tag: "HealthKit")
}
func endWorkout(endDate: Date) async throws {
@@ -178,15 +181,17 @@ class HealthKitService: ObservableObject {
try await builder.endCollection(at: endDate)
let workout = try await builder.finishWorkout()
print(
"HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")"
)
AppLogger.info(
"HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")",
tag: "HealthKit")
currentWorkoutStartDate = nil
currentWorkoutSessionId = nil
persistActiveWorkout()
} catch {
print("HealthKit: Failed to save workout: \(error.localizedDescription)")
AppLogger.error(
"HealthKit: Failed to save workout: \(error.localizedDescription)", tag: "HealthKit"
)
currentWorkoutStartDate = nil
currentWorkoutSessionId = nil
persistActiveWorkout()
@@ -199,7 +204,7 @@ class HealthKitService: ObservableObject {
currentWorkoutStartDate = nil
currentWorkoutSessionId = nil
persistActiveWorkout()
print("HealthKit: Workout cancelled")
AppLogger.info("HealthKit: Workout cancelled", tag: "HealthKit")
}
func hasActiveWorkout() -> Bool {

91
ios/Ascently/Services/SyncService.swift
View File

@@ -12,10 +12,27 @@ class SyncService: ObservableObject {
@Published var isOfflineMode = false
private let userDefaults = UserDefaults.standard
private let logTag = "SyncService"
private var syncTask: Task<Void, Never>?
private var pendingChanges = false
private let syncDebounceDelay: TimeInterval = 2.0
private func logDebug(_ message: @autoclosure () -> String) {
AppLogger.debug(message(), tag: logTag)
}
private func logInfo(_ message: @autoclosure () -> String) {
AppLogger.info(message(), tag: logTag)
}
private func logWarning(_ message: @autoclosure () -> String) {
AppLogger.warning(message(), tag: logTag)
}
private func logError(_ message: @autoclosure () -> String) {
AppLogger.error(message(), tag: logTag)
}
private enum Keys {
static let serverURL = "sync_server_url"
static let authToken = "sync_auth_token"
@@ -201,7 +218,7 @@ class SyncService: ObservableObject {
return false
}
print(
logInfo(
"iOS DELTA SYNC: Sending gyms=\(modifiedGyms.count), problems=\(modifiedProblems.count), sessions=\(modifiedSessions.count), attempts=\(modifiedAttempts.count), deletions=\(modifiedDeletions.count)"
)
@@ -244,7 +261,7 @@ class SyncService: ObservableObject {
let decoder = JSONDecoder()
let deltaResponse = try decoder.decode(DeltaSyncResponse.self, from: data)
print(
logInfo(
"iOS DELTA SYNC: Received gyms=\(deltaResponse.gyms.count), problems=\(deltaResponse.problems.count), sessions=\(deltaResponse.sessions.count), attempts=\(deltaResponse.attempts.count), deletions=\(deltaResponse.deletedItems.count)"
)
@@ -270,7 +287,7 @@ class SyncService: ObservableObject {
let allDeletions = dataManager.getDeletedItems() + response.deletedItems
let uniqueDeletions = Array(Set(allDeletions))
print(
logInfo(
"iOS DELTA SYNC: Applying \(uniqueDeletions.count) deletion records before merging data"
)
applyDeletionsToDataManager(deletions: uniqueDeletions, dataManager: dataManager)
@@ -298,10 +315,10 @@ class SyncService: ObservableObject {
_ = try imageManager.saveImportedImage(imageData, filename: consistentFilename)
imagePathMapping[serverFilename] = consistentFilename
} catch SyncError.imageNotFound {
print("Image not found on server: \(serverFilename)")
logInfo("Image not found on server: \(serverFilename)")
continue
} catch {
print("Failed to download image \(serverFilename): \(error)")
logInfo("Failed to download image \(serverFilename): \(error)")
continue
}
}
@@ -436,7 +453,7 @@ class SyncService: ObservableObject {
) async throws {
guard !modifiedProblems.isEmpty else { return }
print("iOS DELTA SYNC: Syncing images for \(modifiedProblems.count) modified problems")
logInfo("iOS DELTA SYNC: Syncing images for \(modifiedProblems.count) modified problems")
for backupProblem in modifiedProblems {
guard
@@ -465,9 +482,9 @@ class SyncService: ObservableObject {
}
try await uploadImage(filename: consistentFilename, imageData: imageData)
print("Uploaded modified problem image: \(consistentFilename)")
logInfo("Uploaded modified problem image: \(consistentFilename)")
} catch {
print("Failed to upload image \(consistentFilename): \(error)")
logInfo("Failed to upload image \(consistentFilename): \(error)")
}
}
}
@@ -549,7 +566,7 @@ class SyncService: ObservableObject {
func syncWithServer(dataManager: ClimbingDataManager) async throws {
if isOfflineMode {
print("Sync skipped: Offline mode is enabled.")
logInfo("Sync skipped: Offline mode is enabled.")
return
}
@@ -586,7 +603,7 @@ class SyncService: ObservableObject {
// If both client and server have been synced before, use delta sync
if hasLocalData && hasServerData && lastSyncTime != nil {
print("iOS SYNC: Using delta sync for incremental updates")
logInfo("iOS SYNC: Using delta sync for incremental updates")
try await performDeltaSync(dataManager: dataManager)
// Update last sync time
@@ -597,32 +614,32 @@ class SyncService: ObservableObject {
if !hasLocalData && hasServerData {
// Case 1: No local data - do full restore from server
print("iOS SYNC: Case 1 - No local data, performing full restore from server")
print("Syncing images from server first...")
logInfo("iOS SYNC: Case 1 - No local data, performing full restore from server")
logInfo("Syncing images from server first...")
let imagePathMapping = try await syncImagesFromServer(
backup: serverBackup, dataManager: dataManager)
print("Importing data after images...")
logInfo("Importing data after images...")
try importBackupToDataManager(
serverBackup, dataManager: dataManager, imagePathMapping: imagePathMapping)
print("Full restore completed")
logInfo("Full restore completed")
} else if hasLocalData && !hasServerData {
// Case 2: No server data - upload local data to server
print("iOS SYNC: Case 2 - No server data, uploading local data to server")
logInfo("iOS SYNC: Case 2 - No server data, uploading local data to server")
let currentBackup = createBackupFromDataManager(dataManager)
_ = try await uploadData(currentBackup)
print("Uploading local images to server...")
logInfo("Uploading local images to server...")
try await syncImagesToServer(dataManager: dataManager)
print("Initial upload completed")
logInfo("Initial upload completed")
} else if hasLocalData && hasServerData {
// Case 3: Both have data - use safe merge strategy
print("iOS SYNC: Case 3 - Merging local and server data safely")
logInfo("iOS SYNC: Case 3 - Merging local and server data safely")
try await mergeDataSafely(
localBackup: localBackup,
serverBackup: serverBackup,
dataManager: dataManager)
print("Safe merge completed")
logInfo("Safe merge completed")
} else {
print("No data to sync")
logInfo("No data to sync")
}
// Update last sync time
@@ -640,7 +657,7 @@ class SyncService: ObservableObject {
if let date = formatter.date(from: timestamp) {
return Int64(date.timeIntervalSince1970 * 1000)
}
print("Failed to parse timestamp: \(timestamp), using 0")
logInfo("Failed to parse timestamp: \(timestamp), using 0")
return 0
}
@@ -666,12 +683,12 @@ class SyncService: ObservableObject {
imageData, filename: consistentFilename)
imagePathMapping[serverFilename] = consistentFilename
print("Downloaded and mapped image: \(serverFilename) -> \(consistentFilename)")
logInfo("Downloaded and mapped image: \(serverFilename) -> \(consistentFilename)")
} catch SyncError.imageNotFound {
print("Image not found on server: \(serverFilename)")
logInfo("Image not found on server: \(serverFilename)")
continue
} catch {
print("Failed to download image \(serverFilename): \(error)")
logInfo("Failed to download image \(serverFilename): \(error)")
continue
}
}
@@ -704,18 +721,18 @@ class SyncService: ObservableObject {
).path
do {
try FileManager.default.moveItem(atPath: fullPath, toPath: newPath)
print("Renamed local image: \(filename) -> \(consistentFilename)")
logInfo("Renamed local image: \(filename) -> \(consistentFilename)")
// Update problem's image path in memory for consistency
} catch {
print("Failed to rename local image, using original: \(error)")
logInfo("Failed to rename local image, using original: \(error)")
}
}
try await uploadImage(filename: consistentFilename, imageData: imageData)
print("Successfully uploaded image: \(consistentFilename)")
logInfo("Successfully uploaded image: \(consistentFilename)")
} catch {
print("Failed to upload image \(consistentFilename): \(error)")
logInfo("Failed to upload image \(consistentFilename): \(error)")
// Continue with other images even if one fails
}
}
@@ -733,7 +750,7 @@ class SyncService: ObservableObject {
!activeSessionIds.contains($0.sessionId)
}
print(
logInfo(
"iOS SYNC: Excluding \(dataManager.sessions.count - completedSessions.count) active sessions and \(dataManager.attempts.count - completedAttempts.count) active session attempts from sync"
)
@@ -808,26 +825,26 @@ class SyncService: ObservableObject {
let allDeletions = localDeletions + serverBackup.deletedItems
let uniqueDeletions = Array(Set(allDeletions))
print("Merging gyms...")
logInfo("Merging gyms...")
let mergedGyms = mergeGyms(
local: dataManager.gyms,
server: serverBackup.gyms,
deletedItems: uniqueDeletions)
print("Merging problems...")
logInfo("Merging problems...")
let mergedProblems = try mergeProblems(
local: dataManager.problems,
server: serverBackup.problems,
imagePathMapping: imagePathMapping,
deletedItems: uniqueDeletions)
print("Merging sessions...")
logInfo("Merging sessions...")
let mergedSessions = try mergeSessions(
local: dataManager.sessions,
server: serverBackup.sessions,
deletedItems: uniqueDeletions)
print("Merging attempts...")
logInfo("Merging attempts...")
let mergedAttempts = try mergeAttempts(
local: dataManager.attempts,
server: serverBackup.attempts,
@@ -887,7 +904,7 @@ class SyncService: ObservableObject {
&& !allDeletedAttemptIds.contains($0.id.uuidString)
}
print(
logInfo(
"iOS IMPORT: Preserving \(activeSessions.count) active sessions and \(activeAttempts.count) active attempts during import"
)
@@ -977,7 +994,7 @@ class SyncService: ObservableObject {
// Restore active sessions and their attempts after import
for session in activeSessions {
print("iOS IMPORT: Restoring active session: \(session.id)")
logInfo("iOS IMPORT: Restoring active session: \(session.id)")
dataManager.sessions.append(session)
if session.id == dataManager.activeSession?.id {
dataManager.activeSession = session
@@ -997,12 +1014,12 @@ class SyncService: ObservableObject {
dataManager.clearDeletedItems()
if let data = try? JSONEncoder().encode(backup.deletedItems) {
UserDefaults.standard.set(data, forKey: "ascently_deleted_items")
print("iOS IMPORT: Imported \(backup.deletedItems.count) deletion records")
logInfo("iOS IMPORT: Imported \(backup.deletedItems.count) deletion records")
}
// Update local data state to match imported data timestamp
DataStateManager.shared.setLastModified(backup.exportedAt)
print("Data state synchronized to imported timestamp: \(backup.exportedAt)")
logInfo("Data state synchronized to imported timestamp: \(backup.exportedAt)")
} catch {
throw SyncError.importFailed(error)

46
ios/Ascently/Utils/AppLogger.swift Normal file
View File

@@ -0,0 +1,46 @@
import Foundation
/// Centralized logging utility for the iOS app.
///
/// All log output is automatically compiled out in non-debug builds to avoid leaking
/// sensitive information. Use this instead of calling `print` directly.
enum AppLogger {
enum LogLevel: String {
case debug = "DEBUG"
case info = "INFO"
case warning = "WARN"
case error = "ERROR"
}
static func debug(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .debug, tag: tag, message: message())
}
static func info(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .info, tag: tag, message: message())
}
static func warning(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .warning, tag: tag, message: message())
}
static func error(_ message: @autoclosure () -> String, tag: String = #fileID) {
log(level: .error, tag: tag, message: message())
}
static func log(level: LogLevel, tag: String, message: @autoclosure () -> String) {
#if DEBUG
let lastPath = (tag as NSString).lastPathComponent
let resolvedTag = lastPath.isEmpty ? tag : lastPath
Swift.print("[\(level.rawValue)][\(resolvedTag)] \(message())")
#endif
}
}
enum LogTag {
static let climbingData = "ClimbingData"
static let dataManagement = "DataManagementSection"
static let exportData = "ExportDataView"
static let syncSection = "SyncSection"
}

22
ios/Ascently/Utils/DataStateManager.swift
View File

@@ -18,14 +18,17 @@ class DataStateManager {
private init() {
// Initialize with current timestamp if this is the first time
if !isInitialized() {
print("DataStateManager: First time initialization")
AppLogger.info("DataStateManager: First time initialization", tag: "DataState")
// Set initial timestamp to a very old date so server data will be considered newer
let epochTime = "1970-01-01T00:00:00.000Z"
userDefaults.set(epochTime, forKey: Keys.lastModified)
markAsInitialized()
print("DataStateManager initialized with epoch timestamp: \(epochTime)")
AppLogger.info(
"DataStateManager initialized with epoch timestamp: \(epochTime)", tag: "DataState")
} else {
print("DataStateManager: Already initialized, current timestamp: \(getLastModified())")
AppLogger.info(
"DataStateManager: Already initialized, current timestamp: \(getLastModified())",
tag: "DataState")
}
}
@@ -34,29 +37,32 @@ class DataStateManager {
func updateDataState() {
let now = ISO8601DateFormatter().string(from: Date())
userDefaults.set(now, forKey: Keys.lastModified)
print("iOS Data state updated to: \(now)")
AppLogger.info("iOS Data state updated to: \(now)", tag: "DataState")
}
func getLastModified() -> String {
if let storedTimestamp = userDefaults.string(forKey: Keys.lastModified) {
print("iOS DataStateManager returning stored timestamp: \(storedTimestamp)")
AppLogger.debug(
"iOS DataStateManager returning stored timestamp: \(storedTimestamp)",
tag: "DataState")
return storedTimestamp
}
let epochTime = "1970-01-01T00:00:00.000Z"
print("No data state timestamp found - returning epoch time: \(epochTime)")
AppLogger.warning(
"No data state timestamp found - returning epoch time: \(epochTime)", tag: "DataState")
return epochTime
}
func setLastModified(_ timestamp: String) {
userDefaults.set(timestamp, forKey: Keys.lastModified)
print("Data state set to: \(timestamp)")
AppLogger.info("Data state set to: \(timestamp)", tag: "DataState")
}
func reset() {
userDefaults.removeObject(forKey: Keys.lastModified)
userDefaults.removeObject(forKey: Keys.initialized)
print("Data state reset")
AppLogger.info("Data state reset", tag: "DataState")
}
private func isInitialized() -> Bool {

164
ios/Ascently/Utils/ImageManager.swift
View File

@@ -5,6 +5,7 @@ import UIKit
class ImageManager {
static let shared = ImageManager()
private let logTag = "ImageManager"
private let thumbnailCache = NSCache<NSString, UIImage>()
private let fileManager = FileManager.default
@@ -30,7 +31,7 @@ class ImageManager {
// Final integrity check
if !validateStorageIntegrity() {
print("CRITICAL: Storage integrity compromised - attempting emergency recovery")
logError("CRITICAL: Storage integrity compromised - attempting emergency recovery")
emergencyImageRestore()
}
@@ -83,7 +84,7 @@ class ImageManager {
return
}
print("🔄 Migrating images from OpenClimb to Ascently directory...")
logInfo("🔄 Migrating images from OpenClimb to Ascently directory...")
do {
// Create parent directory if needed
@@ -94,16 +95,16 @@ class ImageManager {
// Move the entire directory
try fileManager.moveItem(at: legacyDir, to: appSupportDirectory)
print("Successfully migrated image directory from OpenClimb to Ascently")
logInfo("Successfully migrated image directory from OpenClimb to Ascently")
} catch {
print("❌ Failed to migrate image directory: \(error)")
logError("Failed to migrate image directory: \(error)")
// If move fails, try to copy instead
do {
try fileManager.copyItem(at: legacyDir, to: appSupportDirectory)
print("Successfully copied image directory from OpenClimb to Ascently")
logInfo("Successfully copied image directory from OpenClimb to Ascently")
// Don't remove the old directory in case of issues
} catch {
print("❌ Failed to copy image directory: \(error)")
logError("Failed to copy image directory: \(error)")
}
}
}
@@ -122,9 +123,9 @@ class ImageManager {
attributes: [
.protectionKey: FileProtectionType.completeUntilFirstUserAuthentication
])
print("Created directory: \(directory.path)")
logInfo("Created directory: \(directory.path)")
} catch {
print("ERROR: Failed to create directory \(directory.path): \(error)")
logError("ERROR: Failed to create directory \(directory.path): \(error)")
}
}
}
@@ -141,9 +142,9 @@ class ImageManager {
var backupURL = backupDirectory
try imagesURL.setResourceValues(resourceValues)
try backupURL.setResourceValues(resourceValues)
print("Excluded image directories from iCloud backup")
logInfo("Excluded image directories from iCloud backup")
} catch {
print("WARNING: Failed to exclude from iCloud backup: \(error)")
logWarning("WARNING: Failed to exclude from iCloud backup: \(error)")
}
}
@@ -167,11 +168,11 @@ class ImageManager {
}
private func performRobustMigration() {
print("Starting robust image migration system...")
logInfo("Starting robust image migration system...")
// Check for interrupted migration
if let incompleteState = loadMigrationState() {
print("Detected interrupted migration, resuming...")
logInfo("Detected interrupted migration, resuming...")
resumeMigration(from: incompleteState)
} else {
// Start fresh migration
@@ -188,7 +189,7 @@ class ImageManager {
private func startNewMigration() {
// First check for images in previous Application Support directories
if let previousAppSupportImages = findPreviousAppSupportImages() {
print("Found images in previous Application Support directory")
logInfo("Found images in previous Application Support directory")
migratePreviousAppSupportImages(from: previousAppSupportImages)
return
}
@@ -198,7 +199,7 @@ class ImageManager {
let hasLegacyImportImages = fileManager.fileExists(atPath: legacyImportImagesDirectory.path)
guard hasLegacyImages || hasLegacyImportImages else {
print("No legacy images to migrate")
logInfo("No legacy images to migrate")
return
}
@@ -213,7 +214,7 @@ class ImageManager {
let legacyFiles = try fileManager.contentsOfDirectory(
atPath: legacyImagesDirectory.path)
allLegacyFiles.append(contentsOf: legacyFiles)
print("Found \(legacyFiles.count) images in OpenClimbImages")
logInfo("Found \(legacyFiles.count) images in OpenClimbImages")
}
// Collect files from Documents/images directory
@@ -221,10 +222,10 @@ class ImageManager {
let importFiles = try fileManager.contentsOfDirectory(
atPath: legacyImportImagesDirectory.path)
allLegacyFiles.append(contentsOf: importFiles)
print("Found \(importFiles.count) images in Documents/images")
logInfo("Found \(importFiles.count) images in Documents/images")
}
print("Total legacy images to migrate: \(allLegacyFiles.count)")
logInfo("Total legacy images to migrate: \(allLegacyFiles.count)")
let initialState = MigrationState(
version: MigrationState.currentVersion,
@@ -239,24 +240,24 @@ class ImageManager {
performMigrationWithCheckpoints(files: allLegacyFiles, currentState: initialState)
} catch {
print("ERROR: Failed to start migration: \(error)")
logError("ERROR: Failed to start migration: \(error)")
}
}
private func resumeMigration(from state: MigrationState) {
print("Resuming migration from checkpoint...")
print("Progress: \(state.completedFiles.count)/\(state.totalFiles)")
logInfo("Resuming migration from checkpoint...")
logInfo("Progress: \(state.completedFiles.count)/\(state.totalFiles)")
do {
let legacyFiles = try fileManager.contentsOfDirectory(
atPath: legacyImagesDirectory.path)
let remainingFiles = legacyFiles.filter { !state.completedFiles.contains($0) }
print("Resuming with \(remainingFiles.count) remaining files")
logInfo("Resuming with \(remainingFiles.count) remaining files")
performMigrationWithCheckpoints(files: remainingFiles, currentState: state)
} catch {
print("ERROR: Failed to resume migration: \(error)")
logError("ERROR: Failed to resume migration: \(error)")
// Fallback: start fresh
removeMigrationState()
startNewMigration()
@@ -323,11 +324,11 @@ class ImageManager {
completedFiles.append(fileName)
migratedCount += 1
print("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))")
logInfo("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))")
} catch {
failedCount += 1
print("ERROR: Failed to migrate \(fileName): \(error)")
logError("ERROR: Failed to migrate \(fileName): \(error)")
}
// Save checkpoint every 5 files or if interrupted
@@ -341,7 +342,7 @@ class ImageManager {
lastCheckpoint: Date()
)
saveMigrationState(checkpointState)
print("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)")
logInfo("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)")
}
}
}
@@ -357,7 +358,7 @@ class ImageManager {
)
saveMigrationState(finalState)
print("Migration complete: \(migratedCount) migrated, \(failedCount) failed")
logInfo("Migration complete: \(migratedCount) migrated, \(failedCount) failed")
// Clean up legacy directory if no failures
if failedCount == 0 {
@@ -366,7 +367,7 @@ class ImageManager {
}
private func verifyMigrationIntegrity() {
print("Verifying migration integrity...")
logInfo("Verifying migration integrity...")
var allLegacyFiles = Set<String>()
@@ -384,12 +385,12 @@ class ImageManager {
allLegacyFiles.formUnion(importFiles)
}
} catch {
print("ERROR: Failed to read legacy directories: \(error)")
logError("ERROR: Failed to read legacy directories: \(error)")
return
}
guard !allLegacyFiles.isEmpty else {
print("No legacy directories to verify against")
logInfo("No legacy directories to verify against")
return
}
@@ -400,10 +401,10 @@ class ImageManager {
let missingFiles = allLegacyFiles.subtracting(migratedFiles)
if missingFiles.isEmpty {
print("Migration integrity verified - all files present")
logInfo("Migration integrity verified - all files present")
cleanupLegacyDirectory()
} else {
print("WARNING: Missing \(missingFiles.count) files, re-triggering migration")
logWarning("WARNING: Missing \(missingFiles.count) files, re-triggering migration")
// Re-trigger migration for missing files
performMigrationWithCheckpoints(
files: Array(missingFiles),
@@ -417,16 +418,16 @@ class ImageManager {
))
}
} catch {
print("ERROR: Failed to verify migration integrity: \(error)")
logError("ERROR: Failed to verify migration integrity: \(error)")
}
}
private func cleanupLegacyDirectory() {
do {
try fileManager.removeItem(at: legacyImagesDirectory)
print("Cleaned up legacy directory")
logInfo("Cleaned up legacy directory")
} catch {
print("WARNING: Failed to clean up legacy directory: \(error)")
logWarning("WARNING: Failed to clean up legacy directory: \(error)")
}
}
@@ -446,16 +447,16 @@ class ImageManager {
let data = try Data(contentsOf: migrationStateURL)
let state = try JSONDecoder().decode(MigrationState.self, from: data)
// Check if state is too old (more than 1 hour)
// Check if state is too old
if Date().timeIntervalSince(state.lastCheckpoint) > 3600 {
print("WARNING: Migration state is stale, starting fresh")
logWarning("WARNING: Migration state is stale, starting fresh")
removeMigrationState()
return nil
}
return state.isComplete ? nil : state
} catch {
print("ERROR: Failed to load migration state: \(error)")
logError("ERROR: Failed to load migration state: \(error)")
removeMigrationState()
return nil
}
@@ -466,7 +467,7 @@ class ImageManager {
let data = try JSONEncoder().encode(state)
try data.write(to: migrationStateURL)
} catch {
print("ERROR: Failed to save migration state: \(error)")
logError("ERROR: Failed to save migration state: \(error)")
}
}
@@ -482,7 +483,7 @@ class ImageManager {
private func cleanupMigrationState() {
try? fileManager.removeItem(at: migrationStateURL)
try? fileManager.removeItem(at: migrationLockURL)
print("Cleaned up migration state files")
logInfo("Cleaned up migration state files")
}
func saveImageData(_ data: Data, withName name: String? = nil) -> String? {
@@ -497,10 +498,10 @@ class ImageManager {
// Create backup copy
try data.write(to: backupPath)
print("Saved image with backup: \(fileName)")
logInfo("Saved image with backup: \(fileName)")
return fileName
} catch {
print("ERROR: Failed to save image \(fileName): \(error)")
logError("ERROR: Failed to save image \(fileName): \(error)")
return nil
}
}
@@ -520,7 +521,7 @@ class ImageManager {
if fileManager.fileExists(atPath: backupPath.path),
let data = try? Data(contentsOf: backupPath)
{
print("Restored image from backup: \(path)")
logInfo("Restored image from backup: \(path)")
// Restore to primary location
try? data.write(to: URL(fileURLWithPath: primaryPath))
@@ -595,7 +596,7 @@ class ImageManager {
do {
try fileManager.removeItem(atPath: primaryPath)
} catch {
print("ERROR: Failed to delete primary image at \(primaryPath): \(error)")
logError("ERROR: Failed to delete primary image at \(primaryPath): \(error)")
success = false
}
}
@@ -605,7 +606,7 @@ class ImageManager {
do {
try fileManager.removeItem(at: backupPath)
} catch {
print("ERROR: Failed to delete backup image at \(backupPath.path): \(error)")
logError("ERROR: Failed to delete backup image at \(backupPath.path): \(error)")
success = false
}
}
@@ -642,7 +643,7 @@ class ImageManager {
}
func performMaintenance() {
print("Starting image maintenance...")
logInfo("Starting image maintenance...")
syncBackups()
validateImageIntegrity()
@@ -660,11 +661,11 @@ class ImageManager {
let backupPath = backupDirectory.appendingPathComponent(fileName)
try? fileManager.copyItem(at: primaryPath, to: backupPath)
print("Created missing backup for: \(fileName)")
logInfo("Created missing backup for: \(fileName)")
}
}
} catch {
print("ERROR: Failed to sync backups: \(error)")
logError("ERROR: Failed to sync backups: \(error)")
}
}
@@ -683,14 +684,14 @@ class ImageManager {
}
}
print("Validated \(validFiles) of \(files.count) image files")
logInfo("Validated \(validFiles) of \(files.count) image files")
} catch {
print("ERROR: Failed to validate images: \(error)")
logError("ERROR: Failed to validate images: \(error)")
}
}
private func cleanupOrphanedFiles() {
print("Cleanup would require coordination with data manager")
logInfo("Cleanup would require coordination with data manager")
}
func getStorageInfo() -> (primaryCount: Int, backupCount: Int, totalSize: Int64) {
@@ -718,7 +719,7 @@ class ImageManager {
private func logDirectoryInfo() {
let info = getStorageInfo()
let previousDir = findPreviousAppSupportImages()
print(
logInfo(
"""
Ascently Image Storage:
- App Support: \(appSupportDirectory.path)
@@ -732,7 +733,7 @@ class ImageManager {
}
func forceRecoveryMigration() {
print("FORCE RECOVERY: Starting manual migration recovery...")
logInfo("FORCE RECOVERY: Starting manual migration recovery...")
// Remove any stale state
removeMigrationState()
@@ -741,7 +742,7 @@ class ImageManager {
// Force fresh migration
startNewMigration()
print("FORCE RECOVERY: Migration recovery completed")
logInfo("FORCE RECOVERY: Migration recovery completed")
}
func saveImportedImage(_ imageData: Data, filename: String) throws -> String {
@@ -754,12 +755,12 @@ class ImageManager {
// Create backup
try? imageData.write(to: backupPath)
print("Imported image: \(filename)")
logInfo("Imported image: \(filename)")
return filename
}
func emergencyImageRestore() {
print("EMERGENCY: Attempting image restoration...")
logError("EMERGENCY: Attempting image restoration...")
// Try to restore from backup directory
do {
@@ -777,14 +778,14 @@ class ImageManager {
}
}
print("EMERGENCY: Restored \(restoredCount) images from backup")
logError("EMERGENCY: Restored \(restoredCount) images from backup")
} catch {
print("EMERGENCY: Failed to restore from backup: \(error)")
logError("EMERGENCY: Failed to restore from backup: \(error)")
}
// Try previous Application Support directories first
if let previousAppSupportImages = findPreviousAppSupportImages() {
print("EMERGENCY: Found previous Application Support images, migrating...")
logError("EMERGENCY: Found previous Application Support images, migrating...")
migratePreviousAppSupportImages(from: previousAppSupportImages)
return
}
@@ -793,23 +794,21 @@ class ImageManager {
if fileManager.fileExists(atPath: legacyImagesDirectory.path)
|| fileManager.fileExists(atPath: legacyImportImagesDirectory.path)
{
print("EMERGENCY: Attempting legacy migration as fallback...")
logError("EMERGENCY: Attempting legacy migration as fallback...")
forceRecoveryMigration()
}
}
func debugSafeInitialization() -> Bool {
print("DEBUG SAFE: Performing debug-safe initialization check...")
logDebug("DEBUG SAFE: Performing debug-safe initialization check...")
// Check if we're in a debug environment
#if DEBUG
print("DEBUG SAFE: Debug environment detected")
logDebug("DEBUG SAFE: Debug environment detected")
// Check for interrupted migration more aggressively
if fileManager.fileExists(atPath: migrationLockURL.path) {
print("DEBUG SAFE: Found migration lock - likely debug interruption")
logDebug("DEBUG SAFE: Found migration lock - likely debug interruption")
// Give extra time for file system to stabilize
Thread.sleep(forTimeInterval: 1.0)
// Try emergency recovery
@@ -829,14 +828,14 @@ class ImageManager {
((try? fileManager.contentsOfDirectory(atPath: backupDirectory.path)) ?? []).count > 0
if primaryEmpty && backupHasFiles {
print("DEBUG SAFE: Primary empty but backup exists - restoring")
logDebug("DEBUG SAFE: Primary empty but backup exists - restoring")
emergencyImageRestore()
return true
}
// Check if primary storage is empty but previous Application Support images exist
if primaryEmpty, let previousAppSupportImages = findPreviousAppSupportImages() {
print("DEBUG SAFE: Primary empty but found previous Application Support images")
logDebug("DEBUG SAFE: Primary empty but found previous Application Support images")
migratePreviousAppSupportImages(from: previousAppSupportImages)
return true
}
@@ -852,7 +851,7 @@ class ImageManager {
// Check if we have more backups than primary files (sign of corruption)
if backupFiles.count > primaryFiles.count + 5 {
print(
logInfo(
"WARNING INTEGRITY: Backup count significantly exceeds primary - potential corruption"
)
return false
@@ -860,7 +859,7 @@ class ImageManager {
// Check if primary is completely empty but we have data elsewhere
if primaryFiles.isEmpty && !backupFiles.isEmpty {
print("WARNING INTEGRITY: Primary storage empty but backups exist")
logWarning("WARNING INTEGRITY: Primary storage empty but backups exist")
return false
}
@@ -874,7 +873,7 @@ class ImageManager {
for: .applicationSupportDirectory, in: .userDomainMask
).first
else {
print("ERROR: Could not access Application Support directory")
logError("ERROR: Could not access Application Support directory")
return nil
}
@@ -908,13 +907,13 @@ class ImageManager {
}
}
} catch {
print("ERROR: Error scanning for previous Application Support directories: \(error)")
logError("ERROR: Error scanning for previous Application Support directories: \(error)")
}
return nil
}
private func migratePreviousAppSupportImages(from sourceDirectory: URL) {
print("Migrating images from previous Application Support directory")
logInfo("Migrating images from previous Application Support directory")
do {
let imageFiles = try fileManager.contentsOfDirectory(atPath: sourceDirectory.path)
@@ -937,18 +936,33 @@ class ImageManager {
// Create backup
try? fileManager.copyItem(at: sourcePath, to: backupPath)
print("Migrated: \(fileName)")
logInfo("Migrated: \(fileName)")
} catch {
print("ERROR: Failed to migrate \(fileName): \(error)")
logError("ERROR: Failed to migrate \(fileName): \(error)")
}
}
}
print("Completed migration from previous Application Support directory")
logInfo("Completed migration from previous Application Support directory")
} catch {
print("ERROR: Failed to migrate from previous Application Support: \(error)")
logError("ERROR: Failed to migrate from previous Application Support: \(error)")
}
}
private func logInfo(_ message: String) {
AppLogger.info(message, tag: logTag)
}
private func logWarning(_ message: String) {
AppLogger.warning(message, tag: logTag)
}
private func logError(_ message: String) {
AppLogger.error(message, tag: logTag)
}
private func logDebug(_ message: String) {
AppLogger.debug(message, tag: logTag)
}
}

52
ios/Ascently/Utils/ZipUtils.swift
View File

@@ -4,6 +4,8 @@ import zlib
struct ZipUtils {
private static let logTag = "ZipUtils"
private static let DATA_JSON_FILENAME = "data.json"
private static let IMAGES_DIR_NAME = "images"
private static let METADATA_FILENAME = "metadata.txt"
@@ -49,7 +51,7 @@ struct ZipUtils {
)
// Process images in batches for better performance
print("Processing \(referencedImagePaths.count) images for export")
logInfo("Processing \(referencedImagePaths.count) images for export")
var successfulImages = 0
let batchSize = 10
let sortedPaths = Array(referencedImagePaths).sorted()
@@ -59,7 +61,7 @@ struct ZipUtils {
for (index, imagePath) in sortedPaths.enumerated() {
if index % batchSize == 0 {
print("Processing images \(index)/\(sortedPaths.count)")
logInfo("Processing images \(index)/\(sortedPaths.count)")
}
let imageURL = URL(fileURLWithPath: imagePath)
@@ -83,11 +85,11 @@ struct ZipUtils {
successfulImages += 1
}
} catch {
print("Failed to read image: \(imageName)")
logWarning("Failed to read image: \(imageName)")
}
}
print("Export: included \(successfulImages)/\(referencedImagePaths.count) images")
logInfo("Export: included \(successfulImages)/\(referencedImagePaths.count) images")
// Build central directory
centralDirectory.reserveCapacity(fileEntries.count * 100) // Estimate 100 bytes per entry
@@ -114,7 +116,7 @@ struct ZipUtils {
}
static func extractImportZip(data: Data) throws -> ImportResult {
print("Starting ZIP extraction - data size: \(data.count) bytes")
logInfo("Starting ZIP extraction - data size: \(data.count) bytes")
return try extractUsingCustomParser(data: data)
}
@@ -127,10 +129,10 @@ struct ZipUtils {
let zipEntries: [ZipEntry]
do {
zipEntries = try parseZipFile(data: data)
print("Successfully parsed ZIP file with \(zipEntries.count) entries")
logInfo("Successfully parsed ZIP file with \(zipEntries.count) entries")
} catch {
print("Failed to parse ZIP file: \(error)")
print(
logError("Failed to parse ZIP file: \(error)")
logError(
"ZIP data header: \(data.prefix(20).map { String(format: "%02X", $0) }.joined(separator: " "))"
)
throw NSError(
@@ -142,24 +144,24 @@ struct ZipUtils {
)
}
print("Found \(zipEntries.count) entries in ZIP file:")
logInfo("Found \(zipEntries.count) entries in ZIP file:")
for entry in zipEntries {
print(" - \(entry.filename) (size: \(entry.data.count) bytes)")
logInfo(" - \(entry.filename) (size: \(entry.data.count) bytes)")
}
for entry in zipEntries {
switch entry.filename {
case METADATA_FILENAME:
metadataContent = String(data: entry.data, encoding: .utf8) ?? ""
print("Found metadata: \(metadataContent.prefix(100))...")
logInfo("Found metadata: \(metadataContent.prefix(100))...")
case DATA_JSON_FILENAME:
jsonContent = String(data: entry.data, encoding: .utf8) ?? ""
print("Found data.json with \(jsonContent.count) characters")
logInfo("Found data.json with \(jsonContent.count) characters")
if jsonContent.isEmpty {
print("WARNING: data.json is empty!")
logWarning("WARNING: data.json is empty!")
} else {
print("data.json preview: \(jsonContent.prefix(200))...")
logInfo("data.json preview: \(jsonContent.prefix(200))...")
}
default:
@@ -173,17 +175,17 @@ struct ZipUtils {
entry.data, filename: originalFilename)
importedImagePaths[originalFilename] = filename
} catch {
print("Failed to import image \(originalFilename): \(error)")
logError("Failed to import image \(originalFilename): \(error)")
}
}
}
}
guard !jsonContent.isEmpty else {
print("ERROR: data.json not found or empty")
print("Available files in ZIP:")
logError("ERROR: data.json not found or empty")
logInfo("Available files in ZIP:")
for entry in zipEntries {
print(" - \(entry.filename)")
logInfo(" - \(entry.filename)")
}
throw NSError(
domain: "ImportError", code: 1,
@@ -194,13 +196,25 @@ struct ZipUtils {
)
}
print("Import extraction completed: \(importedImagePaths.count) images processed")
logInfo("Import extraction completed: \(importedImagePaths.count) images processed")
return ImportResult(
jsonData: jsonContent.data(using: .utf8) ?? Data(), imagePathMapping: importedImagePaths
)
}
private static func logInfo(_ message: String) {
AppLogger.info(message, tag: logTag)
}
private static func logWarning(_ message: String) {
AppLogger.warning(message, tag: logTag)
}
private static func logError(_ message: String) {
AppLogger.error(message, tag: logTag)
}
private static func createMetadata(
exportData: ClimbDataBackup,
referencedImagePaths: Set<String>

210
ios/Ascently/ViewModels/ClimbingDataManager.swift
View File

@@ -38,7 +38,6 @@ class ClimbingDataManager: ObservableObject {
let healthKitService = HealthKitService.shared
@Published var isSyncing = false
private enum Keys {
static let gyms = "ascently_gyms"
static let problems = "ascently_problems"
@@ -115,7 +114,8 @@ class ClimbingDataManager: ObservableObject {
return
}
print("Starting migration from OpenClimb to Ascently keys...")
AppLogger.info(
"Starting migration from OpenClimb to Ascently keys...", tag: LogTag.climbingData)
var migrationCount = 0
// Migrate each data type if it exists in old format but not in new format
@@ -135,7 +135,7 @@ class ClimbingDataManager: ObservableObject {
userDefaults.set(oldData, forKey: newKey)
userDefaults.removeObject(forKey: oldKey)
migrationCount += 1
print("✅ Migrated: \(oldKey) → \(newKey)")
AppLogger.info("Migrated: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
}
}
@@ -147,7 +147,8 @@ class ClimbingDataManager: ObservableObject {
{
sharedDefaults.set(oldData, forKey: newKey)
sharedDefaults.removeObject(forKey: oldKey)
print("✅ Migrated shared: \(oldKey) → \(newKey)")
AppLogger.info(
"Migrated shared: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
}
}
}
@@ -161,18 +162,19 @@ class ClimbingDataManager: ObservableObject {
userDefaults.set(lastModified, forKey: newDataStateKey)
userDefaults.removeObject(forKey: legacyDataStateKey)
migrationCount += 1
print("✅ Migrated data state timestamp")
AppLogger.info("Migrated data state timestamp", tag: LogTag.climbingData)
}
// Mark migration as completed
userDefaults.set(true, forKey: migrationKey)
if migrationCount > 0 {
print(
"Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently"
AppLogger.info(
"Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently",
tag: LogTag.climbingData
)
} else {
print("No OpenClimb data found to migrate")
AppLogger.info("No OpenClimb data found to migrate", tag: LogTag.climbingData)
}
}
@@ -441,7 +443,9 @@ class ClimbingDataManager: ObservableObject {
startDate: newSession.startTime ?? Date(),
sessionId: newSession.id)
} catch {
print("Failed to start HealthKit workout: \(error.localizedDescription)")
AppLogger.error(
"Failed to start HealthKit workout: \(error.localizedDescription)",
tag: LogTag.climbingData)
}
}
}
@@ -477,7 +481,9 @@ class ClimbingDataManager: ObservableObject {
try await healthKitService.endWorkout(
endDate: completedSession.endTime ?? Date())
} catch {
print("Failed to end HealthKit workout: \(error.localizedDescription)")
AppLogger.error(
"Failed to end HealthKit workout: \(error.localizedDescription)",
tag: LogTag.climbingData)
}
}
}
@@ -667,7 +673,9 @@ class ClimbingDataManager: ObservableObject {
}
if !orphanedAttempts.isEmpty {
print("🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts")
AppLogger.info(
"🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts",
tag: LogTag.climbingData)
// Track these as deleted to prevent sync from re-introducing them
for attempt in orphanedAttempts {
@@ -693,14 +701,15 @@ class ClimbingDataManager: ObservableObject {
if seenAttempts.contains(key) {
duplicateIds.append(attempt.id)
print("🧹 Found duplicate attempt: \(attempt.id)")
AppLogger.info("🧹 Found duplicate attempt: \(attempt.id)", tag: LogTag.climbingData)
} else {
seenAttempts.insert(key)
}
}
if !duplicateIds.isEmpty {
print("🧹 Removing \(duplicateIds.count) duplicate attempts")
AppLogger.info(
"🧹 Removing \(duplicateIds.count) duplicate attempts", tag: LogTag.climbingData)
// Track duplicates as deleted
for attemptId in duplicateIds {
@@ -714,8 +723,9 @@ class ClimbingDataManager: ObservableObject {
if initialAttemptCount != attempts.count {
saveAttempts()
let removedCount = initialAttemptCount - attempts.count
print(
"Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)"
AppLogger.info(
"Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)",
tag: LogTag.climbingData
)
}
@@ -725,7 +735,9 @@ class ClimbingDataManager: ObservableObject {
}
if !orphanedProblems.isEmpty {
print("🧹 Cleaning up \(orphanedProblems.count) orphaned problems")
AppLogger.info(
"🧹 Cleaning up \(orphanedProblems.count) orphaned problems",
tag: LogTag.climbingData)
for problem in orphanedProblems {
trackDeletion(itemId: problem.id.uuidString, itemType: "problem")
@@ -744,7 +756,9 @@ class ClimbingDataManager: ObservableObject {
}
if !orphanedSessions.isEmpty {
print("🧹 Cleaning up \(orphanedSessions.count) orphaned sessions")
AppLogger.info(
"🧹 Cleaning up \(orphanedSessions.count) orphaned sessions",
tag: LogTag.climbingData)
for session in orphanedSessions {
trackDeletion(itemId: session.id.uuidString, itemType: "session")
@@ -844,19 +858,29 @@ class ClimbingDataManager: ObservableObject {
let problemsForImages = problems
// Move heavy I/O operations to background thread
let logTag = LogTag.climbingData
let zipData = try await Task.detached(priority: .userInitiated) {
// Collect actual image paths from disk for the ZIP
let referencedImagePaths = await Self.collectReferencedImagePathsStatic(
let imageSummary = Self.collectReferencedImagePathsStatic(
problems: problemsForImages,
imagesDirectory: imagesDirectory)
print("Starting export with \(referencedImagePaths.count) images")
let referencedImagePaths = imageSummary.paths
await MainActor.run {
AppLogger.info(
"Starting export with \(referencedImagePaths.count) images (\(imageSummary.missingCount) missing)",
tag: logTag)
}
let zipData = try await ZipUtils.createExportZip(
exportData: exportData,
referencedImagePaths: referencedImagePaths
)
print("Export completed successfully")
await MainActor.run {
AppLogger.info("Export completed successfully", tag: logTag)
}
return (zipData, referencedImagePaths.count)
}.value
@@ -865,7 +889,7 @@ class ClimbingDataManager: ObservableObject {
return zipData.0
} catch {
let errorMessage = "Export failed: \(error.localizedDescription)"
print("ERROR: \(errorMessage)")
AppLogger.error("ERROR: \(errorMessage)", tag: LogTag.climbingData)
setError(errorMessage)
return nil
}
@@ -894,16 +918,24 @@ class ClimbingDataManager: ObservableObject {
return Date()
}
print("Raw JSON content preview:")
print(String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...")
AppLogger.debug("Raw JSON content preview:", tag: LogTag.climbingData)
AppLogger.debug(
String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...",
tag: LogTag.climbingData
)
let importData = try decoder.decode(ClimbDataBackup.self, from: importResult.jsonData)
print("Successfully decoded import data:")
print("- Gyms: \(importData.gyms.count)")
print("- Problems: \(importData.problems.count)")
print("- Sessions: \(importData.sessions.count)")
print("- Attempts: \(importData.attempts.count)")
AppLogger.info(
"""
Successfully decoded import data:
- Gyms: \(importData.gyms.count)
- Problems: \(importData.problems.count)
- Sessions: \(importData.sessions.count)
- Attempts: \(importData.attempts.count)
""",
tag: LogTag.climbingData
)
try validateImportData(importData)
@@ -960,14 +992,20 @@ class ClimbingDataManager: ObservableObject {
extension ClimbingDataManager {
private func collectReferencedImagePaths() -> Set<String> {
let imagesDirectory = ImageManager.shared.imagesDirectory.path
return Self.collectReferencedImagePathsStatic(
let result = Self.collectReferencedImagePathsStatic(
problems: problems,
imagesDirectory: imagesDirectory)
AppLogger.info(
"Export: Collected \(result.paths.count) images (\(result.missingCount) missing)",
tag: LogTag.climbingData)
return result.paths
}
private static func collectReferencedImagePathsStatic(
nonisolated private static func collectReferencedImagePathsStatic(
problems: [Problem], imagesDirectory: String
) -> Set<String> {
) -> (paths: Set<String>, missingCount: Int) {
var imagePaths = Set<String>()
var missingCount = 0
@@ -988,8 +1026,7 @@ extension ClimbingDataManager {
}
}
print("Export: Collected \(imagePaths.count) images (\(missingCount) missing)")
return imagePaths
return (imagePaths, missingCount)
}
private func updateProblemImagePaths(
@@ -1030,11 +1067,14 @@ extension ClimbingDataManager {
}
deterministicImagePaths.append(deterministicName)
print("Renamed imported image: \(tempFileName) → \(deterministicName)")
AppLogger.debug(
"Renamed imported image: \(tempFileName) → \(deterministicName)",
tag: LogTag.climbingData)
}
} catch {
print(
"Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)"
AppLogger.error(
"Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)",
tag: LogTag.climbingData
)
deterministicImagePaths.append(tempFileName)
}
@@ -1078,7 +1118,8 @@ extension ClimbingDataManager {
if needsUpdate {
problems = updatedProblems
saveProblems()
print("Migrated image paths for \(problems.count) problems")
AppLogger.info(
"Migrated image paths for \(problems.count) problems", tag: LogTag.climbingData)
}
}
@@ -1089,8 +1130,9 @@ extension ClimbingDataManager {
// Log storage information for debugging
let info = await ImageManager.shared.getStorageInfo()
print(
"Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total"
await AppLogger.debug(
"Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total",
tag: LogTag.climbingData
)
}.value
}
@@ -1128,7 +1170,9 @@ extension ClimbingDataManager {
}
if !orphanedFiles.isEmpty {
print("Cleaned up \(orphanedFiles.count) orphaned image files")
AppLogger.info(
"Cleaned up \(orphanedFiles.count) orphaned image files",
tag: LogTag.climbingData)
}
}
}
@@ -1145,7 +1189,7 @@ extension ClimbingDataManager {
}
func forceImageRecovery() {
print("User initiated force image recovery")
AppLogger.info("User initiated force image recovery", tag: LogTag.climbingData)
ImageManager.shared.forceRecoveryMigration()
// Refresh the UI after recovery
@@ -1153,7 +1197,7 @@ extension ClimbingDataManager {
}
func emergencyImageRestore() {
print("User initiated emergency image restore")
AppLogger.info("User initiated emergency image restore", tag: LogTag.climbingData)
ImageManager.shared.emergencyImageRestore()
// Refresh the UI after restore
@@ -1179,15 +1223,15 @@ extension ClimbingDataManager {
}
func testLiveActivity() {
print("🧪 Testing Live Activity functionality...")
AppLogger.info("Testing Live Activity functionality...", tag: LogTag.climbingData)
// Check Live Activity availability
let status = LiveActivityManager.shared.checkLiveActivityAvailability()
print(status)
AppLogger.info(status, tag: LogTag.climbingData)
// Test with dummy data if we have a gym
guard let testGym = gyms.first else {
print("ERROR: No gyms available for testing")
AppLogger.error("No gyms available for testing", tag: LogTag.climbingData)
return
}
@@ -1218,15 +1262,18 @@ extension ClimbingDataManager {
// Only restart if session is actually active
guard activeSession.status == .active else {
print(
"WARNING: Session exists but is not active (status: \(activeSession.status)), ending Live Activity"
AppLogger.warning(
"Session exists but is not active (status: \(activeSession.status)), ending Live Activity",
tag: LogTag.climbingData
)
await LiveActivityManager.shared.endLiveActivity()
return
}
if let gym = gym(withId: activeSession.gymId) {
print("Checking Live Activity for active session at \(gym.name)")
AppLogger.info(
"Checking Live Activity for active session at \(gym.name)", tag: LogTag.climbingData
)
// First cleanup any dismissed activities
await LiveActivityManager.shared.cleanupDismissedActivities()
@@ -1241,7 +1288,9 @@ extension ClimbingDataManager {
/// Call this when app becomes active to check for Live Activity restart
func onAppBecomeActive() {
print("App became active - checking Live Activity status")
let logTag = "ClimbingData"
AppLogger.info(
"App became active - checking Live Activity status", tag: logTag)
Task {
await checkAndRestartLiveActivity()
}
@@ -1249,35 +1298,46 @@ extension ClimbingDataManager {
/// Call this when app enters background to update Live Activity
func onAppEnterBackground() {
print("App entering background - updating Live Activity if needed")
let logTag = "ClimbingData"
AppLogger.info(
"App entering background - updating Live Activity if needed", tag: logTag)
Task {
await updateLiveActivityData()
}
}
/// Setup notifications for Live Activity events
private func setupLiveActivityNotifications() {
nonisolated private func setupLiveActivityNotifications() {
let notificationName = Notification.Name("liveActivityDismissed")
let logTag = "ClimbingData"
liveActivityObserver = NotificationCenter.default.addObserver(
forName: .liveActivityDismissed,
forName: notificationName,
object: nil,
queue: .main
) { [weak self] _ in
print("🔔 Received Live Activity dismissed notification - attempting restart")
Task { @MainActor in
AppLogger.info(
"Received Live Activity dismissed notification - attempting restart",
tag: logTag)
await self?.handleLiveActivityDismissed()
}
}
}
private func setupMigrationNotifications() {
nonisolated private func setupMigrationNotifications() {
let logTag = "ClimbingData"
migrationObserver = NotificationCenter.default.addObserver(
forName: NSNotification.Name("ImageMigrationCompleted"),
object: nil,
queue: .main
) { [weak self] notification in
if let updateCount = notification.userInfo?["updateCount"] as? Int {
print("🔔 Image migration completed with \(updateCount) updates - reloading data")
Task { @MainActor in
AppLogger.info(
"Image migration completed with \(updateCount) updates - reloading data",
tag: logTag)
self?.loadProblems()
}
}
@@ -1293,7 +1353,9 @@ extension ClimbingDataManager {
return
}
print("Attempting to restart dismissed Live Activity for \(gym.name)")
AppLogger.info(
"Attempting to restart dismissed Live Activity for \(gym.name)",
tag: LogTag.climbingData)
// Wait a bit before restarting to avoid frequency limits
try? await Task.sleep(nanoseconds: 2_000_000_000) // 2 seconds
@@ -1333,11 +1395,20 @@ extension ClimbingDataManager {
activeSession.status == .active,
let gym = gym(withId: activeSession.gymId)
else {
print("WARNING: Live Activity update skipped - no active session or gym")
AppLogger.warning(
"Live Activity update skipped - no active session or gym",
tag: LogTag.climbingData
)
if let session = activeSession {
print(" Session ID: \(session.id)")
print(" Session Status: \(session.status)")
print(" Gym ID: \(session.gymId)")
AppLogger.debug(
"""
Skipped session details:
Session ID: \(session.id)
Session Status: \(session.status)
Gym ID: \(session.gymId)
""",
tag: LogTag.climbingData
)
}
return
}
@@ -1357,14 +1428,17 @@ extension ClimbingDataManager {
elapsedInterval = 0
}
print("Live Activity Update Debug:")
print(" Session ID: \(activeSession.id)")
print(" Gym: \(gym.name)")
print(" Total attempts in session: \(totalAttempts)")
print(" Completed problems: \(completedProblems)")
print(" Elapsed time: \(elapsedInterval) seconds")
print(
" All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })"
AppLogger.debug(
"""
Live Activity Update Debug:
Session ID: \(activeSession.id)
Gym: \(gym.name)
Total attempts in session: \(totalAttempts)
Completed problems: \(completedProblems)
Elapsed time: \(elapsedInterval) seconds
All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })
""",
tag: LogTag.climbingData
)
Task {

74
ios/Ascently/ViewModels/LiveActivityManager.swift
View File

@@ -8,6 +8,7 @@ extension Notification.Name {
@MainActor
final class LiveActivityManager {
static let shared = LiveActivityManager()
private static let logTag = "LiveActivity"
private init() {}
nonisolated(unsafe) private var currentActivity: Activity<SessionActivityAttributes>?
@@ -30,11 +31,12 @@ final class LiveActivityManager {
let isStillActive = activities.contains { $0.id == currentActivity.id }
if isStillActive {
print("Live Activity still running: \(currentActivity.id)")
AppLogger.debug("Live Activity still running: \(currentActivity.id)", tag: Self.logTag)
return
} else {
print(
"WARNING: Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference"
AppLogger.warning(
"Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference",
tag: Self.logTag
)
self.currentActivity = nil
}
@@ -43,18 +45,18 @@ final class LiveActivityManager {
// Check if there are ANY active Live Activities for this session
let existingActivities = Activity<SessionActivityAttributes>.activities
if let existingActivity = existingActivities.first {
print("Found existing Live Activity: \(existingActivity.id), using it")
AppLogger.info("Found existing Live Activity: \(existingActivity.id), using it", tag: Self.logTag)
self.currentActivity = existingActivity
return
}
print("No Live Activity found, restarting for existing session")
AppLogger.info("No Live Activity found, restarting for existing session", tag: Self.logTag)
await startLiveActivity(for: activeSession, gymName: gymName)
}
/// Call this when a ClimbSession starts to begin a Live Activity
func startLiveActivity(for session: ClimbSession, gymName: String) async {
print("Starting Live Activity for gym: \(gymName)")
AppLogger.info("Starting Live Activity for gym: \(gymName)", tag: Self.logTag)
await endLiveActivity()
@@ -80,18 +82,26 @@ final class LiveActivityManager {
pushType: nil
)
self.currentActivity = activity
print("Live Activity started successfully: \(activity.id)")
AppLogger.info("Live Activity started successfully: \(activity.id)", tag: Self.logTag)
} catch {
print("ERROR: Failed to start live activity: \(error)")
print("Error details: \(error.localizedDescription)")
AppLogger.error(
"""
Failed to start live activity: \(error)
Details: \(error.localizedDescription)
""",
tag: Self.logTag
)
// Check specific error types
if error.localizedDescription.contains("authorization") {
print("Authorization error - check Live Activity permissions in Settings")
AppLogger.warning(
"Authorization error - check Live Activity permissions in Settings",
tag: Self.logTag
)
} else if error.localizedDescription.contains("content") {
print("Content error - check ActivityAttributes structure")
AppLogger.warning("Content error - check ActivityAttributes structure", tag: Self.logTag)
} else if error.localizedDescription.contains("frequencyLimited") {
print("Frequency limited - too many Live Activities started recently")
AppLogger.warning("Frequency limited - too many Live Activities started recently", tag: Self.logTag)
}
}
}
@@ -100,7 +110,7 @@ final class LiveActivityManager {
func updateLiveActivity(elapsed: TimeInterval, totalAttempts: Int, completedProblems: Int) async
{
guard let currentActivity = currentActivity else {
print("WARNING: No current activity to update")
AppLogger.warning("No current activity to update", tag: Self.logTag)
return
}
@@ -109,15 +119,17 @@ final class LiveActivityManager {
let isStillActive = activities.contains { $0.id == currentActivity.id }
if !isStillActive {
print(
"WARNING: Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference"
AppLogger.warning(
"Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference",
tag: Self.logTag
)
self.currentActivity = nil
return
}
print(
"Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)"
AppLogger.debug(
"Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)",
tag: Self.logTag
)
let updatedContentState = SessionActivityAttributes.ContentState(
@@ -137,26 +149,26 @@ final class LiveActivityManager {
// First end the tracked activity if it exists
if let currentActivity {
print("Ending tracked Live Activity: \(currentActivity.id)")
AppLogger.info("Ending tracked Live Activity: \(currentActivity.id)", tag: Self.logTag)
nonisolated(unsafe) let activity = currentActivity
await activity.end(nil, dismissalPolicy: .immediate)
self.currentActivity = nil
print("Tracked Live Activity ended successfully")
AppLogger.info("Tracked Live Activity ended successfully", tag: Self.logTag)
}
// Force end ALL active activities of our type to ensure cleanup
print("Checking for any remaining active activities...")
AppLogger.debug("Checking for any remaining active activities...", tag: Self.logTag)
let activities = Activity<SessionActivityAttributes>.activities
if activities.isEmpty {
print("No additional activities found")
AppLogger.debug("No additional activities found", tag: Self.logTag)
} else {
print("Found \(activities.count) additional active activities, ending them...")
AppLogger.info("Found \(activities.count) additional active activities, ending them...", tag: Self.logTag)
for activity in activities {
print("Force ending activity: \(activity.id)")
AppLogger.debug("Force ending activity: \(activity.id)", tag: Self.logTag)
await activity.end(nil, dismissalPolicy: .immediate)
}
print("All Live Activities ended successfully")
AppLogger.info("All Live Activities ended successfully", tag: Self.logTag)
}
}
@@ -174,7 +186,7 @@ final class LiveActivityManager {
• All Active Activities: \(allActivities.count)
"""
print(message)
AppLogger.info(message, tag: Self.logTag)
return message
}
@@ -185,7 +197,7 @@ final class LiveActivityManager {
if let currentActivity = currentActivity {
let isStillActive = activities.contains { $0.id == currentActivity.id }
if !isStillActive {
print("Cleaning up dismissed Live Activity: \(currentActivity.id)")
AppLogger.info("Cleaning up dismissed Live Activity: \(currentActivity.id)", tag: Self.logTag)
self.currentActivity = nil
}
}
@@ -195,7 +207,7 @@ final class LiveActivityManager {
func startHealthChecks() {
stopHealthChecks() // Stop any existing timer
print("🩺 Starting Live Activity health checks")
AppLogger.debug("🩺 Starting Live Activity health checks", tag: Self.logTag)
healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) {
[weak self] _ in
Task { @MainActor [weak self] in
@@ -208,7 +220,7 @@ final class LiveActivityManager {
func stopHealthChecks() {
healthCheckTimer?.invalidate()
healthCheckTimer = nil
print("Stopped Live Activity health checks")
AppLogger.debug("Stopped Live Activity health checks", tag: Self.logTag)
}
/// Perform a health check on the current Live Activity
@@ -221,14 +233,14 @@ final class LiveActivityManager {
// Only perform health check if it's been at least 25 seconds
guard timeSinceLastCheck >= 25 else { return }
print("🩺 Performing Live Activity health check")
AppLogger.debug("🩺 Performing Live Activity health check", tag: Self.logTag)
lastHealthCheck = now
let activities = Activity<SessionActivityAttributes>.activities
let isStillActive = activities.contains { $0.id == currentActivity.id }
if !isStillActive {
print("Health check failed - Live Activity was dismissed")
AppLogger.warning("Health check failed - Live Activity was dismissed", tag: Self.logTag)
self.currentActivity = nil
// Notify that we need to restart
@@ -237,7 +249,7 @@ final class LiveActivityManager {
object: nil
)
} else {
print("Live Activity health check passed")
AppLogger.debug("Live Activity health check passed", tag: Self.logTag)
}
}

2
ios/Ascently/Views/LiveActivityDebugView.swift
View File

@@ -196,7 +196,7 @@ struct LiveActivityDebugView: View {
}
isTestRunning = true
appendDebugOutput("🧪 Starting Live Activity test...")
appendDebugOutput("Starting Live Activity test...")
Task {
defer {

1
ios/Ascently/Views/ProblemsView.swift
View File

@@ -317,7 +317,6 @@ struct ProblemsList: View {
}
Button {
// Use a spring animation for more natural movement
withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1))
{
let updatedProblem = problem.updated(isActive: !problem.isActive)

49
ios/Ascently/Views/SettingsView.swift
View File

@@ -84,6 +84,8 @@ struct DataManagementSection: View {
@State private var isDeletingImages = false
@State private var showingDeleteImagesAlert = false
private static let logTag = "DataManagementSection"
var body: some View {
Section("Data Management") {
// Export Data
@@ -217,13 +219,14 @@ struct DataManagementSection: View {
try fileManager.removeItem(at: imageFile)
deletedCount += 1
} catch {
print("Failed to delete image: \(imageFile.lastPathComponent)")
AppLogger.error(
"Failed to delete image: \(imageFile.lastPathComponent)", tag: Self.logTag)
}
}
print("Deleted \(deletedCount) image files")
AppLogger.info("Deleted \(deletedCount) image files", tag: Self.logTag)
} catch {
print("Failed to access images directory: \(error)")
AppLogger.error("Failed to access images directory: \(error)", tag: Self.logTag)
}
// Delete all images from backup directory
@@ -235,7 +238,7 @@ struct DataManagementSection: View {
try? fileManager.removeItem(at: backupFile)
}
} catch {
print("Failed to access backup directory: \(error)")
AppLogger.error("Failed to access backup directory: \(error)", tag: Self.logTag)
}
// Clear image paths from all problems
@@ -260,20 +263,6 @@ struct AppInfoSection: View {
var body: some View {
Section("App Information") {
HStack {
Image("AppLogo")
.resizable()
.frame(width: 24, height: 24)
VStack(alignment: .leading) {
Text("Ascently")
.font(.headline)
Text("Track your climbing progress")
.font(.caption)
.foregroundColor(.secondary)
}
Spacer()
}
HStack {
Image(systemName: "info.circle")
.foregroundColor(.blue)
@@ -292,11 +281,13 @@ struct ExportDataView: View {
@State private var tempFileURL: URL?
@State private var isCreatingFile = true
private static let logTag = "ExportDataView"
var body: some View {
NavigationStack {
VStack(spacing: 30) {
if isCreatingFile {
// Loading state - more prominent
// Loading state
VStack(spacing: 20) {
ProgressView()
.scaleEffect(1.5)
@@ -380,6 +371,7 @@ struct ExportDataView: View {
}
private func createTempFile() {
let logTag = Self.logTag // Capture before entering background queue
DispatchQueue.global(qos: .userInitiated).async {
do {
let formatter = ISO8601DateFormatter()
@@ -394,7 +386,9 @@ struct ExportDataView: View {
for: .documentDirectory, in: .userDomainMask
).first
else {
print("Could not access Documents directory")
Task { @MainActor in
AppLogger.error("Could not access Documents directory", tag: logTag)
}
DispatchQueue.main.async {
self.isCreatingFile = false
}
@@ -410,7 +404,9 @@ struct ExportDataView: View {
self.isCreatingFile = false
}
} catch {
print("Failed to create export file: \(error)")
Task { @MainActor in
AppLogger.error("Failed to create export file: \(error)", tag: logTag)
}
DispatchQueue.main.async {
self.isCreatingFile = false
}
@@ -420,10 +416,12 @@ struct ExportDataView: View {
private func cleanupTempFile() {
if let fileURL = tempFileURL {
let logTag = Self.logTag // Capture before entering async closure
// Clean up after a delay to ensure sharing is complete
DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
try? FileManager.default.removeItem(at: fileURL)
print("Cleaned up export file: \(fileURL.lastPathComponent)")
AppLogger.debug(
"Cleaned up export file: \(fileURL.lastPathComponent)", tag: logTag)
}
}
}
@@ -435,6 +433,8 @@ struct SyncSection: View {
@State private var showingSyncSettings = false
@State private var showingDisconnectAlert = false
private static let logTag = "SyncSection"
var body: some View {
Section("Sync") {
// Sync Status
@@ -579,11 +579,14 @@ struct SyncSection: View {
}
private func performSync() {
let logTag = Self.logTag // Capture before entering async context
Task {
do {
try await syncService.syncWithServer(dataManager: dataManager)
} catch {
print("Sync failed: \(error)")
await MainActor.run {
AppLogger.error("Sync failed: \(error)", tag: logTag)
}
}
}
}