refactor: logging

mobile-v2/lib/domain/models/log.model.dart

@@ -4,22 +4,24 @@ import 'package:logging/logging.dart';
 /// Log levels according to dart logging [Level]
 enum LogLevel {
   // do not change this order!
-  all,
-  finest,
-  finer,
-  fine,
-  config,
+  verbose,
+  debug,
   info,
   warning,
-  severe,
-  shout,
-  off,
+  error,
+  wtf,
 }
 
 extension LevelExtension on Level {
-  LogLevel toLogLevel() =>
-      LogLevel.values.elementAtOrNull(Level.LEVELS.indexOf(this)) ??
-      LogLevel.info;
+  LogLevel toLogLevel() => switch (this) {
+        Level.FINEST => LogLevel.verbose,
+        Level.FINE => LogLevel.debug,
+        Level.INFO => LogLevel.info,
+        Level.WARNING => LogLevel.warning,
+        Level.SEVERE => LogLevel.error,
+        Level.SHOUT => LogLevel.wtf,
+        _ => LogLevel.info,
+      };
 }
 
 @immutable

mobile-v2/lib/domain/repositories/asset.repository.dart

@@ -8,9 +8,9 @@ import 'package:immich_mobile/domain/models/render_list.model.dart';
 import 'package:immich_mobile/domain/models/render_list_element.model.dart';
 import 'package:immich_mobile/domain/repositories/database.repository.dart';
 import 'package:immich_mobile/utils/extensions/drift.extension.dart';
-import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
+import 'package:immich_mobile/utils/mixins/log.mixin.dart';
 
-class RemoteAssetDriftRepository with LogContext implements IAssetRepository {
+class RemoteAssetDriftRepository with LogMixin implements IAssetRepository {
   final DriftDatabaseRepository _db;
 
   const RemoteAssetDriftRepository(this._db);
@@ -25,7 +25,7 @@ class RemoteAssetDriftRepository with LogContext implements IAssetRepository {
 
       return true;
     } catch (e, s) {
-      log.severe("Cannot insert remote assets into table", e, s);
+      log.e("Cannot insert remote assets into table", e, s);
       return false;
     }
   }
@@ -36,7 +36,7 @@ class RemoteAssetDriftRepository with LogContext implements IAssetRepository {
       await _db.asset.deleteAll();
       return true;
     } catch (e, s) {
-      log.severe("Cannot clear remote assets", e, s);
+      log.e("Cannot clear remote assets", e, s);
       return false;
     }
   }

mobile-v2/lib/domain/repositories/store.repository.dart

@@ -5,9 +5,9 @@ import 'package:immich_mobile/domain/entities/store.entity.drift.dart';
 import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/repositories/database.repository.dart';
-import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
+import 'package:immich_mobile/utils/mixins/log.mixin.dart';
 
-class StoreDriftRepository with LogContext implements IStoreRepository {
+class StoreDriftRepository with LogMixin implements IStoreRepository {
   final DriftDatabaseRepository _db;
 
   const StoreDriftRepository(this._db);
@@ -42,7 +42,7 @@ class StoreDriftRepository with LogContext implements IStoreRepository {
           ));
       return true;
     } catch (e, s) {
-      log.severe("Cannot set store value - ${key.name}; id - ${key.id}", e, s);
+      log.e("Cannot set store value - ${key.name}; id - ${key.id}", e, s);
       return false;
     }
   }

mobile-v2/lib/domain/repositories/user.repository.dart

@@ -5,9 +5,9 @@ import 'package:immich_mobile/domain/entities/user.entity.drift.dart';
 import 'package:immich_mobile/domain/interfaces/user.interface.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/repositories/database.repository.dart';
-import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
+import 'package:immich_mobile/utils/mixins/log.mixin.dart';
 
-class UserDriftRepository with LogContext implements IUserRepository {
+class UserDriftRepository with LogMixin implements IUserRepository {
   final DriftDatabaseRepository _db;
 
   const UserDriftRepository(this._db);
@@ -40,7 +40,7 @@ class UserDriftRepository with LogContext implements IUserRepository {
           );
       return true;
     } catch (e, s) {
-      log.severe("Cannot insert User into table - $user", e, s);
+      log.e("Cannot insert User into table - $user", e, s);
       return false;
     }
   }

mobile-v2/lib/domain/services/asset_sync.service.dart

@@ -9,11 +9,11 @@ import 'package:immich_mobile/utils/collection_util.dart';
 import 'package:immich_mobile/utils/constants/globals.dart';
 import 'package:immich_mobile/utils/immich_api_client.dart';
 import 'package:immich_mobile/utils/isolate_helper.dart';
-import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
-import 'package:logging/logging.dart';
+import 'package:immich_mobile/utils/log_manager.dart';
+import 'package:immich_mobile/utils/mixins/log.mixin.dart';
 import 'package:openapi/api.dart';
 
-class AssetSyncService with LogContext {
+class AssetSyncService with LogMixin {
   const AssetSyncService();
 
   Future<bool> doFullRemoteSyncForUserDrift(
@@ -23,7 +23,7 @@ class AssetSyncService with LogContext {
   }) async {
     return await IsolateHelper.run(() async {
       try {
-        final logger = Logger("SyncService <Isolate>");
+        final logger = LogManager.I.get("SyncService <Isolate>");
         final syncClient = di<ImmichApiClient>().getSyncApi();
 
         final chunkSize = limit ?? kFullSyncChunkSize;
@@ -32,7 +32,7 @@ class AssetSyncService with LogContext {
         String? lastAssetId;
 
         while (true) {
-          logger.info(
+          logger.d(
             "Requesting more chunks from lastId - ${lastAssetId ?? "<initial_fetch>"}",
           );
 
@@ -67,7 +67,7 @@ class AssetSyncService with LogContext {
 
         return true;
       } catch (e, s) {
-        log.severe("Error performing full sync for user - ${user.name}", e, s);
+        log.e("Error performing full sync for user - ${user.name}", e, s);
       }
       return false;
     });

mobile-v2/lib/domain/services/login.service.dart

@@ -9,10 +9,10 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/service_locator.dart';
 import 'package:immich_mobile/utils/immich_api_client.dart';
-import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
+import 'package:immich_mobile/utils/mixins/log.mixin.dart';
 import 'package:openapi/api.dart';
 
-class LoginService with LogContext {
+class LoginService with LogMixin {
   const LoginService();
 
   Future<bool> isEndpointAvailable(Uri uri, {ImmichApiClient? client}) async {
@@ -27,7 +27,7 @@ class LoginService with LogContext {
     try {
       await serverAPI.pingServer();
     } catch (e) {
-      log.severe("Exception occured while validating endpoint", e);
+      log.e("Exception occured while validating endpoint", e);
       return false;
     }
     return true;
@@ -52,7 +52,7 @@ class LoginService with LogContext {
         return endpoint.startsWith('/') ? "$baseUrl$endpoint" : endpoint;
       }
     } catch (e) {
-      log.fine("Could not locate /.well-known/immich at $baseUrl", e);
+      log.e("Could not locate /.well-known/immich at $baseUrl", e);
     }
 
     // No well-known, return the baseUrl
@@ -68,7 +68,7 @@ class LoginService with LogContext {
 
       return loginResponse?.accessToken;
     } catch (e, s) {
-      log.severe("Exception occured while performing password login", e, s);
+      log.e("Exception occured while performing password login", e, s);
     }
     return null;
   }
@@ -85,7 +85,7 @@ class LoginService with LogContext {
 
       final oAuthUrlRes = oAuthUrl?.url;
       if (oAuthUrlRes == null) {
-        log.severe(
+        log.e(
           "oAuth Server URL not available. Kindly ensure oAuth login is enabled in the server",
         );
         return null;
@@ -102,7 +102,7 @@ class LoginService with LogContext {
 
       return loginResponse?.accessToken;
     } catch (e) {
-      log.severe("Exception occured while performing oauth login", e);
+      log.e("Exception occured while performing oauth login", e);
     }
     return null;
   }

mobile-v2/lib/domain/services/server_info.service.dart

@@ -1,9 +1,9 @@
 import 'package:immich_mobile/domain/models/server-info/server_config.model.dart';
 import 'package:immich_mobile/domain/models/server-info/server_features.model.dart';
-import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
+import 'package:immich_mobile/utils/mixins/log.mixin.dart';
 import 'package:openapi/api.dart';
 
-class ServerInfoService with LogContext {
+class ServerInfoService with LogMixin {
   final ServerApi _serverInfo;
 
   const ServerInfoService(this._serverInfo);
@@ -15,7 +15,7 @@ class ServerInfoService with LogContext {
         return ServerFeatures.fromDto(dto);
       }
     } catch (e, s) {
-      log.severe("Error while fetching server features", e, s);
+      log.e("Error while fetching server features", e, s);
     }
     return null;
   }
@@ -27,7 +27,7 @@ class ServerInfoService with LogContext {
         return ServerConfig.fromDto(dto);
       }
     } catch (e, s) {
-      log.severe("Error while fetching server config", e, s);
+      log.e("Error while fetching server config", e, s);
     }
     return null;
   }

mobile-v2/lib/domain/services/user.service.dart

@@ -1,8 +1,8 @@
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/utils/mixins/log_context.mixin.dart';
+import 'package:immich_mobile/utils/mixins/log.mixin.dart';
 import 'package:openapi/api.dart';
 
-class UserService with LogContext {
+class UserService with LogMixin {
   final UsersApi _userApi;
 
   const UserService(this._userApi);
@@ -18,13 +18,13 @@ class UserService with LogContext {
       ]);
 
       if (userDto == null) {
-        log.severe("Cannot fetch my user.");
+        log.e("Cannot fetch my user.");
         return null;
       }
 
       return User.fromAdminDto(userDto, preferencesDto);
     } catch (e, s) {
-      log.severe("Error while fetching my user", e, s);
+      log.e("Error while fetching my user", e, s);
     }
     return null;
   }