diff --git a/app/lib/account.dart b/app/lib/account.dart index 1a85f4d2..f313cf6c 100644 --- a/app/lib/account.dart +++ b/app/lib/account.dart @@ -7,11 +7,13 @@ import 'package:nc_photos/ci_string.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/string_extension.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'account.g.dart'; /// Details of a remote Nextcloud server account +@npLog @toString class Account with EquatableMixin { Account( @@ -117,7 +119,7 @@ class Account with EquatableMixin { /// versioning of this class, use to upgrade old persisted accounts static const version = 2; - static final _log = Logger("account.Account"); + static final _log = _$logAccount; } extension AccountExtension on Account { @@ -139,6 +141,7 @@ abstract class AccountUpgrader { JsonObj? call(JsonObj json); } +@npLog class AccountUpgraderV1 implements AccountUpgrader { const AccountUpgraderV1({ this.logAccountId, @@ -159,6 +162,4 @@ class AccountUpgraderV1 implements AccountUpgrader { /// Account ID for logging only final String? logAccountId; - - static final _log = Logger("account.AccountUpgraderV1"); } diff --git a/app/lib/account.g.dart b/app/lib/account.g.dart index 49e499bc..fa02bdc0 100644 --- a/app/lib/account.g.dart +++ b/app/lib/account.g.dart @@ -2,6 +2,26 @@ part of 'account.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAccount = Logger("account.Account"); + +extension _$AccountNpLog on Account { + // ignore: unused_element + Logger get _log => _$logAccount; +} + +// ignore: non_constant_identifier_names +final _$logAccountUpgraderV1 = Logger("account.AccountUpgraderV1"); + +extension _$AccountUpgraderV1NpLog on AccountUpgraderV1 { + // ignore: unused_element + Logger get _log => _$logAccountUpgraderV1; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/api/api.dart b/app/lib/api/api.dart index c41039f9..128564ce 100644 --- a/app/lib/api/api.dart +++ b/app/lib/api/api.dart @@ -5,6 +5,7 @@ import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; import 'package:nc_photos/account.dart'; import 'package:nc_photos/string_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; import 'package:xml/xml.dart'; @@ -49,6 +50,7 @@ class BasicAuth { final String password; } +@npLog class Api { Api(Account account) : _baseUrl = Uri.parse(account.url), @@ -127,12 +129,11 @@ class Api { final Uri _baseUrl; BasicAuth? _auth; - - static final _log = Logger("api.api.Api"); } bool _isHttpStatusGood(int status) => status ~/ 100 == 2; +@npLog class ApiFiles { ApiFiles(this._api); @@ -468,8 +469,6 @@ class ApiFiles { rethrow; } } - - static final _log = Logger("api.api._Files"); } class ApiOcs { @@ -492,6 +491,7 @@ class ApiOcsDav { final ApiOcs _ocs; } +@npLog class ApiOcsDavDirect { ApiOcsDavDirect(this._dav); @@ -518,8 +518,6 @@ class ApiOcsDavDirect { } final ApiOcsDav _dav; - - static final _log = Logger("api.api._OcsDavDirect"); } class ApiOcsFacerecognition { @@ -533,6 +531,7 @@ class ApiOcsFacerecognition { final ApiOcs _ocs; } +@npLog class ApiOcsFacerecognitionPersons { ApiOcsFacerecognitionPersons(this._facerecognition); @@ -555,8 +554,6 @@ class ApiOcsFacerecognitionPersons { } final ApiOcsFacerecognition _facerecognition; - - static final _log = Logger("api.api._OcsFacerecognitionPersons"); } class ApiOcsFacerecognitionPerson { @@ -569,6 +566,7 @@ class ApiOcsFacerecognitionPerson { final String _name; } +@npLog class ApiOcsFacerecognitionPersonFaces { ApiOcsFacerecognitionPersonFaces(this._person); @@ -591,8 +589,6 @@ class ApiOcsFacerecognitionPersonFaces { } final ApiOcsFacerecognitionPerson _person; - - static final _log = Logger("api.api._OcsFacerecognitionPersonFaces"); } class ApiOcsFilesSharing { @@ -608,6 +604,7 @@ class ApiOcsFilesSharing { final ApiOcs _ocs; } +@npLog class ApiOcsFilesSharingShares { ApiOcsFilesSharingShares(this._filesSharing); @@ -683,10 +680,9 @@ class ApiOcsFilesSharingShares { } final ApiOcsFilesSharing _filesSharing; - - static final _log = Logger("api.api._OcsFilesSharingShares"); } +@npLog class ApiOcsFilesSharingShare { ApiOcsFilesSharingShare(this._filesSharing, this._shareId); @@ -713,10 +709,9 @@ class ApiOcsFilesSharingShare { final ApiOcsFilesSharing _filesSharing; final String _shareId; - - static final _log = Logger("api.api._OcsFilesSharingShare"); } +@npLog class ApiOcsFilesSharingSharees { ApiOcsFilesSharingSharees(this._filesSharing); @@ -751,10 +746,9 @@ class ApiOcsFilesSharingSharees { } final ApiOcsFilesSharing _filesSharing; - - static final _log = Logger("api.api._OcsFilesSharingSharees"); } +@npLog class ApiSystemtags { const ApiSystemtags(this.api); @@ -815,8 +809,6 @@ class ApiSystemtags { } final Api api; - - static final _log = Logger("api.api._Systemtags"); } class ApiSystemtagsRelations { @@ -828,6 +820,7 @@ class ApiSystemtagsRelations { final Api api; } +@npLog class ApiSystemtagsRelationsFiles { const ApiSystemtagsRelationsFiles(this.systemtagsRelations, this.fileId); @@ -894,6 +887,4 @@ class ApiSystemtagsRelationsFiles { final ApiSystemtagsRelations systemtagsRelations; final int fileId; - - static final _log = Logger("api.api._SystemtagsRelationsFiles"); } diff --git a/app/lib/api/api.g.dart b/app/lib/api/api.g.dart index fbea91c7..2361523b 100644 --- a/app/lib/api/api.g.dart +++ b/app/lib/api/api.g.dart @@ -2,6 +2,96 @@ part of 'api.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logApi = Logger("api.api.Api"); + +extension _$ApiNpLog on Api { + // ignore: unused_element + Logger get _log => _$logApi; +} + +// ignore: non_constant_identifier_names +final _$logApiFiles = Logger("api.api.ApiFiles"); + +extension _$ApiFilesNpLog on ApiFiles { + // ignore: unused_element + Logger get _log => _$logApiFiles; +} + +// ignore: non_constant_identifier_names +final _$logApiOcsDavDirect = Logger("api.api.ApiOcsDavDirect"); + +extension _$ApiOcsDavDirectNpLog on ApiOcsDavDirect { + // ignore: unused_element + Logger get _log => _$logApiOcsDavDirect; +} + +// ignore: non_constant_identifier_names +final _$logApiOcsFacerecognitionPersons = + Logger("api.api.ApiOcsFacerecognitionPersons"); + +extension _$ApiOcsFacerecognitionPersonsNpLog on ApiOcsFacerecognitionPersons { + // ignore: unused_element + Logger get _log => _$logApiOcsFacerecognitionPersons; +} + +// ignore: non_constant_identifier_names +final _$logApiOcsFacerecognitionPersonFaces = + Logger("api.api.ApiOcsFacerecognitionPersonFaces"); + +extension _$ApiOcsFacerecognitionPersonFacesNpLog + on ApiOcsFacerecognitionPersonFaces { + // ignore: unused_element + Logger get _log => _$logApiOcsFacerecognitionPersonFaces; +} + +// ignore: non_constant_identifier_names +final _$logApiOcsFilesSharingShares = + Logger("api.api.ApiOcsFilesSharingShares"); + +extension _$ApiOcsFilesSharingSharesNpLog on ApiOcsFilesSharingShares { + // ignore: unused_element + Logger get _log => _$logApiOcsFilesSharingShares; +} + +// ignore: non_constant_identifier_names +final _$logApiOcsFilesSharingShare = Logger("api.api.ApiOcsFilesSharingShare"); + +extension _$ApiOcsFilesSharingShareNpLog on ApiOcsFilesSharingShare { + // ignore: unused_element + Logger get _log => _$logApiOcsFilesSharingShare; +} + +// ignore: non_constant_identifier_names +final _$logApiOcsFilesSharingSharees = + Logger("api.api.ApiOcsFilesSharingSharees"); + +extension _$ApiOcsFilesSharingShareesNpLog on ApiOcsFilesSharingSharees { + // ignore: unused_element + Logger get _log => _$logApiOcsFilesSharingSharees; +} + +// ignore: non_constant_identifier_names +final _$logApiSystemtags = Logger("api.api.ApiSystemtags"); + +extension _$ApiSystemtagsNpLog on ApiSystemtags { + // ignore: unused_element + Logger get _log => _$logApiSystemtags; +} + +// ignore: non_constant_identifier_names +final _$logApiSystemtagsRelationsFiles = + Logger("api.api.ApiSystemtagsRelationsFiles"); + +extension _$ApiSystemtagsRelationsFilesNpLog on ApiSystemtagsRelationsFiles { + // ignore: unused_element + Logger get _log => _$logApiSystemtagsRelationsFiles; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/app_localizations.dart b/app/lib/app_localizations.dart index e2a1b663..ac129342 100644 --- a/app/lib/app_localizations.dart +++ b/app/lib/app_localizations.dart @@ -3,8 +3,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations_en.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/widget/my_app.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'app_localizations.g.dart'; /// Simplify localized string access +@npLog class L10n { static AppLocalizations global() => AppLocalizations.of(MyApp.globalContext)!; @@ -20,5 +24,5 @@ class L10n { } } - static final _log = Logger("app_localizations.L10n"); + static final _log = _$logL10n; } diff --git a/app/lib/app_localizations.g.dart b/app/lib/app_localizations.g.dart new file mode 100644 index 00000000..6f3670cf --- /dev/null +++ b/app/lib/app_localizations.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'app_localizations.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logL10n = Logger("app_localizations.L10n"); + +extension _$L10nNpLog on L10n { + // ignore: unused_element + Logger get _log => _$logL10n; +} diff --git a/app/lib/bloc/app_password_exchange.dart b/app/lib/bloc/app_password_exchange.dart index f3dd77a9..804bb50d 100644 --- a/app/lib/bloc/app_password_exchange.dart +++ b/app/lib/bloc/app_password_exchange.dart @@ -7,6 +7,7 @@ import 'package:nc_photos/account.dart'; import 'package:nc_photos/api/api_util.dart' as api_util; import 'package:nc_photos/ci_string.dart'; import 'package:nc_photos/exception.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'app_password_exchange.g.dart'; @@ -135,6 +136,7 @@ class AppPasswordExchangeBlocResult extends AppPasswordExchangeBlocState { /// -> State [AppPasswordExchangeBlocFailure] /// Event [AppPasswordExchangeBlocAppPwFailed] -> State [AppPasswordExchangeBlocFailure] /// ``` +@npLog class AppPasswordExchangeBloc extends Bloc { AppPasswordExchangeBloc() : super(const AppPasswordExchangeBlocInit()) { @@ -256,9 +258,6 @@ class AppPasswordExchangeBloc emit(const AppPasswordExchangeBlocResult(null)); } - static final _log = - Logger("bloc.app_password_exchange.AppPasswordExchangeBloc"); - StreamSubscription>? _pollPasswordSubscription; bool _isCanceled = false; diff --git a/app/lib/bloc/app_password_exchange.g.dart b/app/lib/bloc/app_password_exchange.g.dart index 58f7e3fe..fc484b20 100644 --- a/app/lib/bloc/app_password_exchange.g.dart +++ b/app/lib/bloc/app_password_exchange.g.dart @@ -2,6 +2,19 @@ part of 'app_password_exchange.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAppPasswordExchangeBloc = + Logger("bloc.app_password_exchange.AppPasswordExchangeBloc"); + +extension _$AppPasswordExchangeBlocNpLog on AppPasswordExchangeBloc { + // ignore: unused_element + Logger get _log => _$logAppPasswordExchangeBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/home_search_suggestion.dart b/app/lib/bloc/home_search_suggestion.dart index 7b05d37f..a1021ddf 100644 --- a/app/lib/bloc/home_search_suggestion.dart +++ b/app/lib/bloc/home_search_suggestion.dart @@ -14,6 +14,7 @@ import 'package:nc_photos/use_case/list_album.dart'; import 'package:nc_photos/use_case/list_location_group.dart'; import 'package:nc_photos/use_case/list_person.dart'; import 'package:nc_photos/use_case/list_tag.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; import 'package:tuple/tuple.dart'; import 'package:woozy_search/woozy_search.dart'; @@ -121,6 +122,7 @@ class HomeSearchSuggestionBlocFailure extends HomeSearchSuggestionBlocState { final Object exception; } +@npLog class HomeSearchSuggestionBloc extends Bloc { HomeSearchSuggestionBloc(this.account) @@ -240,9 +242,6 @@ class HomeSearchSuggestionBloc late final DiContainer _c; final _search = Woozy<_Searcheable>(limit: 10); - - static final _log = - Logger("bloc.album_search_suggestion.HomeSearchSuggestionBloc"); } abstract class _Searcheable { diff --git a/app/lib/bloc/home_search_suggestion.g.dart b/app/lib/bloc/home_search_suggestion.g.dart index 4deda78a..581c33f6 100644 --- a/app/lib/bloc/home_search_suggestion.g.dart +++ b/app/lib/bloc/home_search_suggestion.g.dart @@ -2,6 +2,19 @@ part of 'home_search_suggestion.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logHomeSearchSuggestionBloc = + Logger("bloc.home_search_suggestion.HomeSearchSuggestionBloc"); + +extension _$HomeSearchSuggestionBlocNpLog on HomeSearchSuggestionBloc { + // ignore: unused_element + Logger get _log => _$logHomeSearchSuggestionBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_album.dart b/app/lib/bloc/list_album.dart index 380623c9..0e9d20ea 100644 --- a/app/lib/bloc/list_album.dart +++ b/app/lib/bloc/list_album.dart @@ -15,6 +15,7 @@ import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/list_album.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_album.g.dart'; @@ -93,6 +94,7 @@ class ListAlbumBlocInconsistent extends ListAlbumBlocState { : super(account, items); } +@npLog class ListAlbumBloc extends Bloc { /// Constructor /// @@ -332,5 +334,5 @@ class ListAlbumBloc extends Bloc { late Throttler _refreshThrottler; - static final _log = Logger("bloc.list_album.ListAlbumBloc"); + static final _log = _$logListAlbumBloc; } diff --git a/app/lib/bloc/list_album.g.dart b/app/lib/bloc/list_album.g.dart index 9bb8297c..107dd72e 100644 --- a/app/lib/bloc/list_album.g.dart +++ b/app/lib/bloc/list_album.g.dart @@ -2,6 +2,18 @@ part of 'list_album.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListAlbumBloc = Logger("bloc.list_album.ListAlbumBloc"); + +extension _$ListAlbumBlocNpLog on ListAlbumBloc { + // ignore: unused_element + Logger get _log => _$logListAlbumBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_album_share_outlier.dart b/app/lib/bloc/list_album_share_outlier.dart index 6d2d60fc..5b5260b5 100644 --- a/app/lib/bloc/list_album_share_outlier.dart +++ b/app/lib/bloc/list_album_share_outlier.dart @@ -15,6 +15,7 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/use_case/list_share.dart'; import 'package:nc_photos/use_case/list_sharee.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_album_share_outlier.g.dart'; @@ -158,6 +159,7 @@ class ListAlbumShareOutlierBlocFailure extends ListAlbumShareOutlierBlocState { /// 1. shares between you and the owner for all files added by you /// 2. files added by you: for each participants, any files that are /// added on or after the album share for him/her was created +@npLog class ListAlbumShareOutlierBloc extends Bloc { ListAlbumShareOutlierBloc(this._c) @@ -374,7 +376,4 @@ class ListAlbumShareOutlierBloc extends Bloc _$logListAlbumShareOutlierBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_face_file.dart b/app/lib/bloc/list_face_file.dart index 157b1b93..e833901a 100644 --- a/app/lib/bloc/list_face_file.dart +++ b/app/lib/bloc/list_face_file.dart @@ -9,6 +9,7 @@ import 'package:nc_photos/entity/person.dart'; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/populate_person.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_face_file.g.dart'; @@ -82,6 +83,7 @@ class ListFaceFileBlocInconsistent extends ListFaceFileBlocState { } /// List all people recognized in an account +@npLog class ListFaceFileBloc extends Bloc { ListFaceFileBloc(this._c) @@ -217,6 +219,4 @@ class ListFaceFileBloc }, logTag: "ListFaceFileBloc.refresh", ); - - static final _log = Logger("bloc.list_face_file.ListFaceFileBloc"); } diff --git a/app/lib/bloc/list_face_file.g.dart b/app/lib/bloc/list_face_file.g.dart index 08721d16..69f39dff 100644 --- a/app/lib/bloc/list_face_file.g.dart +++ b/app/lib/bloc/list_face_file.g.dart @@ -2,6 +2,18 @@ part of 'list_face_file.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListFaceFileBloc = Logger("bloc.list_face_file.ListFaceFileBloc"); + +extension _$ListFaceFileBlocNpLog on ListFaceFileBloc { + // ignore: unused_element + Logger get _log => _$logListFaceFileBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_importable_album.dart b/app/lib/bloc/list_importable_album.dart index aa7027a1..20b38793 100644 --- a/app/lib/bloc/list_importable_album.dart +++ b/app/lib/bloc/list_importable_album.dart @@ -12,6 +12,7 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/use_case/list_album.dart'; import 'package:nc_photos/use_case/ls.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_importable_album.g.dart'; @@ -79,6 +80,7 @@ class ListImportableAlbumBlocFailure extends ListImportableAlbumBlocState { } /// Return all directories that potentially could be a new album +@npLog class ListImportableAlbumBloc extends Bloc { ListImportableAlbumBloc(this._c) @@ -168,7 +170,4 @@ class ListImportableAlbumBloc } final DiContainer _c; - - static final _log = - Logger("bloc.list_importable_album.ListImportableAlbumBloc"); } diff --git a/app/lib/bloc/list_importable_album.g.dart b/app/lib/bloc/list_importable_album.g.dart index 206ab9d8..acb83265 100644 --- a/app/lib/bloc/list_importable_album.g.dart +++ b/app/lib/bloc/list_importable_album.g.dart @@ -2,6 +2,19 @@ part of 'list_importable_album.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListImportableAlbumBloc = + Logger("bloc.list_importable_album.ListImportableAlbumBloc"); + +extension _$ListImportableAlbumBlocNpLog on ListImportableAlbumBloc { + // ignore: unused_element + Logger get _log => _$logListImportableAlbumBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_location.dart b/app/lib/bloc/list_location.dart index af8316ea..aa950f46 100644 --- a/app/lib/bloc/list_location.dart +++ b/app/lib/bloc/list_location.dart @@ -9,6 +9,7 @@ import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/list_location_file.dart'; import 'package:nc_photos/use_case/list_location_group.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_location.g.dart'; @@ -83,6 +84,7 @@ class ListLocationBlocInconsistent extends ListLocationBlocState { } /// List all files associated with a specific tag +@npLog class ListLocationBloc extends Bloc { ListLocationBloc(this._c) @@ -170,6 +172,4 @@ class ListLocationBloc }, logTag: "ListLocationBloc.refresh", ); - - static final _log = Logger("bloc.list_location.ListLocationBloc"); } diff --git a/app/lib/bloc/list_location.g.dart b/app/lib/bloc/list_location.g.dart index 43052995..a0e79146 100644 --- a/app/lib/bloc/list_location.g.dart +++ b/app/lib/bloc/list_location.g.dart @@ -2,6 +2,18 @@ part of 'list_location.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListLocationBloc = Logger("bloc.list_location.ListLocationBloc"); + +extension _$ListLocationBlocNpLog on ListLocationBloc { + // ignore: unused_element + Logger get _log => _$logListLocationBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_location_file.dart b/app/lib/bloc/list_location_file.dart index ae47a26f..cbc01d9f 100644 --- a/app/lib/bloc/list_location_file.dart +++ b/app/lib/bloc/list_location_file.dart @@ -8,6 +8,7 @@ import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/list_location_file.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_location_file.g.dart'; @@ -82,6 +83,7 @@ class ListLocationFileBlocInconsistent extends ListLocationFileBlocState { } /// List all files associated with a specific tag +@npLog class ListLocationFileBloc extends Bloc { ListLocationFileBloc(this._c) @@ -176,6 +178,4 @@ class ListLocationFileBloc }, logTag: "ListLocationFileBloc.refresh", ); - - static final _log = Logger("bloc.list_location_file.ListLocationFileBloc"); } diff --git a/app/lib/bloc/list_location_file.g.dart b/app/lib/bloc/list_location_file.g.dart index 30b0d86f..e76313e2 100644 --- a/app/lib/bloc/list_location_file.g.dart +++ b/app/lib/bloc/list_location_file.g.dart @@ -2,6 +2,19 @@ part of 'list_location_file.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListLocationFileBloc = + Logger("bloc.list_location_file.ListLocationFileBloc"); + +extension _$ListLocationFileBlocNpLog on ListLocationFileBloc { + // ignore: unused_element + Logger get _log => _$logListLocationFileBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_person.dart b/app/lib/bloc/list_person.dart index 7421c5ec..5c37004d 100644 --- a/app/lib/bloc/list_person.dart +++ b/app/lib/bloc/list_person.dart @@ -5,6 +5,7 @@ import 'package:nc_photos/account.dart'; import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/person.dart'; import 'package:nc_photos/use_case/list_person.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_person.g.dart'; @@ -61,6 +62,7 @@ class ListPersonBlocFailure extends ListPersonBlocState { } /// List all people recognized in an account +@npLog class ListPersonBloc extends Bloc { ListPersonBloc(this._c) : assert(require(_c)), @@ -94,6 +96,4 @@ class ListPersonBloc extends Bloc { ListPerson(_c.withLocalRepo())(ev.account); final DiContainer _c; - - static final _log = Logger("bloc.list_person.ListPersonBloc"); } diff --git a/app/lib/bloc/list_person.g.dart b/app/lib/bloc/list_person.g.dart index 72f9ac99..5875c3a2 100644 --- a/app/lib/bloc/list_person.g.dart +++ b/app/lib/bloc/list_person.g.dart @@ -2,6 +2,18 @@ part of 'list_person.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListPersonBloc = Logger("bloc.list_person.ListPersonBloc"); + +extension _$ListPersonBlocNpLog on ListPersonBloc { + // ignore: unused_element + Logger get _log => _$logListPersonBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_share.dart b/app/lib/bloc/list_share.dart index 6ab1308d..e9f4cbd3 100644 --- a/app/lib/bloc/list_share.dart +++ b/app/lib/bloc/list_share.dart @@ -5,6 +5,7 @@ import 'package:nc_photos/account.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/share.dart'; import 'package:nc_photos/entity/share/data_source.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_share.g.dart'; @@ -63,6 +64,7 @@ class ListShareBlocFailure extends ListShareBlocState { } /// List all shares from a given file +@npLog class ListShareBloc extends Bloc { ListShareBloc() : super(ListShareBlocInit()) { on(_onEvent); @@ -91,6 +93,4 @@ class ListShareBloc extends Bloc { final shareRepo = ShareRepo(ShareRemoteDataSource()); return shareRepo.list(ev.account, ev.file); } - - static final _log = Logger("bloc.list_share.ListShareBloc"); } diff --git a/app/lib/bloc/list_share.g.dart b/app/lib/bloc/list_share.g.dart index f1cb04c7..a5086cf3 100644 --- a/app/lib/bloc/list_share.g.dart +++ b/app/lib/bloc/list_share.g.dart @@ -2,6 +2,18 @@ part of 'list_share.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListShareBloc = Logger("bloc.list_share.ListShareBloc"); + +extension _$ListShareBlocNpLog on ListShareBloc { + // ignore: unused_element + Logger get _log => _$logListShareBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_sharee.dart b/app/lib/bloc/list_sharee.dart index ee88b775..9633c7fd 100644 --- a/app/lib/bloc/list_sharee.dart +++ b/app/lib/bloc/list_sharee.dart @@ -6,6 +6,7 @@ import 'package:nc_photos/account.dart'; import 'package:nc_photos/bloc/bloc_util.dart' as bloc_util; import 'package:nc_photos/entity/sharee.dart'; import 'package:nc_photos/entity/sharee/data_source.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_sharee.g.dart'; @@ -62,6 +63,7 @@ class ListShareeBlocFailure extends ListShareeBlocState { } /// List all sharees of this account +@npLog class ListShareeBloc extends Bloc { ListShareeBloc() : super(ListShareeBlocInit()) { on(_onEvent); @@ -105,5 +107,5 @@ class ListShareeBloc extends Bloc { return shareeRepo.list(ev.account); } - static final _log = Logger("bloc.list_sharee.ListShareeBloc"); + static final _log = _$logListShareeBloc; } diff --git a/app/lib/bloc/list_sharee.g.dart b/app/lib/bloc/list_sharee.g.dart index bb1467af..a001333e 100644 --- a/app/lib/bloc/list_sharee.g.dart +++ b/app/lib/bloc/list_sharee.g.dart @@ -2,6 +2,18 @@ part of 'list_sharee.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListShareeBloc = Logger("bloc.list_sharee.ListShareeBloc"); + +extension _$ListShareeBlocNpLog on ListShareeBloc { + // ignore: unused_element + Logger get _log => _$logListShareeBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_sharing.dart b/app/lib/bloc/list_sharing.dart index 0dab6b4c..102fa90f 100644 --- a/app/lib/bloc/list_sharing.dart +++ b/app/lib/bloc/list_sharing.dart @@ -18,6 +18,7 @@ import 'package:nc_photos/use_case/find_file.dart'; import 'package:nc_photos/use_case/list_share_with_me.dart'; import 'package:nc_photos/use_case/ls.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; import 'package:to_string/to_string.dart'; @@ -137,6 +138,7 @@ class ListSharingBlocFailure extends ListSharingBlocState { } /// List shares to be shown in [SharingBrowser] +@npLog class ListSharingBloc extends Bloc { ListSharingBloc(this._c) : assert(require(_c)), @@ -417,5 +419,5 @@ class ListSharingBloc extends Bloc { late Throttler _refreshThrottler; - static final _log = Logger("bloc.list_sharing.ListSharingBloc"); + static final _log = _$logListSharingBloc; } diff --git a/app/lib/bloc/list_sharing.g.dart b/app/lib/bloc/list_sharing.g.dart index 6b7318ca..cd4938df 100644 --- a/app/lib/bloc/list_sharing.g.dart +++ b/app/lib/bloc/list_sharing.g.dart @@ -2,6 +2,18 @@ part of 'list_sharing.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListSharingBloc = Logger("bloc.list_sharing.ListSharingBloc"); + +extension _$ListSharingBlocNpLog on ListSharingBloc { + // ignore: unused_element + Logger get _log => _$logListSharingBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_tag.dart b/app/lib/bloc/list_tag.dart index 1d5778fa..54de80f7 100644 --- a/app/lib/bloc/list_tag.dart +++ b/app/lib/bloc/list_tag.dart @@ -7,6 +7,7 @@ import 'package:nc_photos/bloc/bloc_util.dart' as bloc_util; import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/tag.dart'; import 'package:nc_photos/use_case/list_tag.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_tag.g.dart'; @@ -62,6 +63,7 @@ class ListTagBlocFailure extends ListTagBlocState { } /// List all tags for this account +@npLog class ListTagBloc extends Bloc { ListTagBloc(this._c) : assert(require(_c)), @@ -109,5 +111,5 @@ class ListTagBloc extends Bloc { final DiContainer _c; - static final _log = Logger("bloc.list_tag.ListTagBloc"); + static final _log = _$logListTagBloc; } diff --git a/app/lib/bloc/list_tag.g.dart b/app/lib/bloc/list_tag.g.dart index 74c6d7a7..1a1b40fc 100644 --- a/app/lib/bloc/list_tag.g.dart +++ b/app/lib/bloc/list_tag.g.dart @@ -2,6 +2,18 @@ part of 'list_tag.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListTagBloc = Logger("bloc.list_tag.ListTagBloc"); + +extension _$ListTagBlocNpLog on ListTagBloc { + // ignore: unused_element + Logger get _log => _$logListTagBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/list_tag_file.dart b/app/lib/bloc/list_tag_file.dart index 9f17e234..7a346d9d 100644 --- a/app/lib/bloc/list_tag_file.dart +++ b/app/lib/bloc/list_tag_file.dart @@ -9,6 +9,7 @@ import 'package:nc_photos/entity/tag.dart'; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/find_file.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_tag_file.g.dart'; @@ -82,6 +83,7 @@ class ListTagFileBlocInconsistent extends ListTagFileBlocState { } /// List all files associated with a specific tag +@npLog class ListTagFileBloc extends Bloc { ListTagFileBloc(this._c) : assert(require(_c)), @@ -221,6 +223,4 @@ class ListTagFileBloc extends Bloc { }, logTag: "ListTagFileBloc.refresh", ); - - static final _log = Logger("bloc.list_tag_file.ListTagFileBloc"); } diff --git a/app/lib/bloc/list_tag_file.g.dart b/app/lib/bloc/list_tag_file.g.dart index 3a0bc566..e4125897 100644 --- a/app/lib/bloc/list_tag_file.g.dart +++ b/app/lib/bloc/list_tag_file.g.dart @@ -2,6 +2,18 @@ part of 'list_tag_file.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListTagFileBloc = Logger("bloc.list_tag_file.ListTagFileBloc"); + +extension _$ListTagFileBlocNpLog on ListTagFileBloc { + // ignore: unused_element + Logger get _log => _$logListTagFileBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/ls_dir.dart b/app/lib/bloc/ls_dir.dart index 08e0b577..d1a1eb39 100644 --- a/app/lib/bloc/ls_dir.dart +++ b/app/lib/bloc/ls_dir.dart @@ -7,6 +7,7 @@ import 'package:nc_photos/debug_util.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/use_case/ls.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'ls_dir.g.dart'; @@ -133,6 +134,7 @@ class LsDirBlocFailure extends LsDirBlocState { } /// A bloc that return all directories under a dir recursively +@npLog class LsDirBloc extends Bloc { LsDirBloc( this.fileRepo, { @@ -203,6 +205,4 @@ class LsDirBloc extends Bloc { final bool isListMinimal; final _cache = >{}; - - static final _log = Logger("bloc.ls_dir.LsDirBloc"); } diff --git a/app/lib/bloc/ls_dir.g.dart b/app/lib/bloc/ls_dir.g.dart index b4b605c2..45d4a43f 100644 --- a/app/lib/bloc/ls_dir.g.dart +++ b/app/lib/bloc/ls_dir.g.dart @@ -2,6 +2,18 @@ part of 'ls_dir.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logLsDirBloc = Logger("bloc.ls_dir.LsDirBloc"); + +extension _$LsDirBlocNpLog on LsDirBloc { + // ignore: unused_element + Logger get _log => _$logLsDirBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/ls_trashbin.dart b/app/lib/bloc/ls_trashbin.dart index baf77b24..a010c2b6 100644 --- a/app/lib/bloc/ls_trashbin.dart +++ b/app/lib/bloc/ls_trashbin.dart @@ -10,6 +10,7 @@ import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/ls_trashbin.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'ls_trashbin.g.dart'; @@ -81,6 +82,7 @@ class LsTrashbinBlocInconsistent extends LsTrashbinBlocState { : super(account, items); } +@npLog class LsTrashbinBloc extends Bloc { LsTrashbinBloc() : super(LsTrashbinBlocInit()) { _fileRemovedEventListener = @@ -178,5 +180,5 @@ class LsTrashbinBloc extends Bloc { late Throttler _refreshThrottler; - static final _log = Logger("bloc.ls_trashbin.LsTrashbinBloc"); + static final _log = _$logLsTrashbinBloc; } diff --git a/app/lib/bloc/ls_trashbin.g.dart b/app/lib/bloc/ls_trashbin.g.dart index 7b218458..834aa744 100644 --- a/app/lib/bloc/ls_trashbin.g.dart +++ b/app/lib/bloc/ls_trashbin.g.dart @@ -2,6 +2,18 @@ part of 'ls_trashbin.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logLsTrashbinBloc = Logger("bloc.ls_trashbin.LsTrashbinBloc"); + +extension _$LsTrashbinBlocNpLog on LsTrashbinBloc { + // ignore: unused_element + Logger get _log => _$logLsTrashbinBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/progress.dart b/app/lib/bloc/progress.dart index ca421d8d..31dd1d32 100644 --- a/app/lib/bloc/progress.dart +++ b/app/lib/bloc/progress.dart @@ -1,6 +1,7 @@ import 'package:bloc/bloc.dart'; import 'package:equatable/equatable.dart'; import 'package:logging/logging.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'progress.g.dart'; @@ -35,6 +36,7 @@ class ProgressBlocState with EquatableMixin { } /// A generic bloc to bubble progress update for some events +@npLog class ProgressBloc extends Bloc { ProgressBloc() : super(const ProgressBlocState(0, null)) { on(_onEvent); @@ -52,6 +54,4 @@ class ProgressBloc extends Bloc { ProgressBlocUpdate ev, Emitter emit) async { emit(ProgressBlocState(ev.progress, ev.text)); } - - static final _log = Logger("bloc.progress.ProgressBloc"); } diff --git a/app/lib/bloc/progress.g.dart b/app/lib/bloc/progress.g.dart index 6788039e..60809d0e 100644 --- a/app/lib/bloc/progress.g.dart +++ b/app/lib/bloc/progress.g.dart @@ -2,6 +2,18 @@ part of 'progress.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logProgressBloc = Logger("bloc.progress.ProgressBloc"); + +extension _$ProgressBlocNpLog on ProgressBloc { + // ignore: unused_element + Logger get _log => _$logProgressBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/scan_account_dir.dart b/app/lib/bloc/scan_account_dir.dart index 5ee16915..93517eae 100644 --- a/app/lib/bloc/scan_account_dir.dart +++ b/app/lib/bloc/scan_account_dir.dart @@ -23,6 +23,7 @@ import 'package:nc_photos/use_case/ls.dart'; import 'package:nc_photos/use_case/scan_dir.dart'; import 'package:nc_photos/use_case/scan_dir_offline.dart'; import 'package:nc_photos/use_case/sync_dir.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'scan_account_dir.g.dart'; @@ -113,6 +114,7 @@ class ScanAccountDirBlocInconsistent extends ScanAccountDirBlocState { /// A bloc that return all files under a dir recursively /// /// See [ScanDir] +@npLog class ScanAccountDirBloc extends Bloc { ScanAccountDirBloc._(this.account) : super(const ScanAccountDirBlocInit()) { @@ -534,5 +536,5 @@ class ScanAccountDirBloc logTag: "ScanAccountDirBloc.refresh", ); - static final _log = Logger("bloc.scan_dir.ScanAccountDirBloc"); + static final _log = _$logScanAccountDirBloc; } diff --git a/app/lib/bloc/scan_account_dir.g.dart b/app/lib/bloc/scan_account_dir.g.dart index 62926a48..017a7452 100644 --- a/app/lib/bloc/scan_account_dir.g.dart +++ b/app/lib/bloc/scan_account_dir.g.dart @@ -2,6 +2,19 @@ part of 'scan_account_dir.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logScanAccountDirBloc = + Logger("bloc.scan_account_dir.ScanAccountDirBloc"); + +extension _$ScanAccountDirBlocNpLog on ScanAccountDirBloc { + // ignore: unused_element + Logger get _log => _$logScanAccountDirBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/scan_local_dir.dart b/app/lib/bloc/scan_local_dir.dart index 9bf41ee3..575f5866 100644 --- a/app/lib/bloc/scan_local_dir.dart +++ b/app/lib/bloc/scan_local_dir.dart @@ -7,6 +7,7 @@ import 'package:nc_photos/entity/local_file.dart'; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/use_case/scan_local_dir.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'scan_local_dir.g.dart'; @@ -70,6 +71,7 @@ class ScanLocalDirBlocFailure extends ScanLocalDirBlocState { final dynamic exception; } +@npLog class ScanLocalDirBloc extends Bloc { ScanLocalDirBloc() : super(const ScanLocalDirBlocInit()) { @@ -127,6 +129,4 @@ class ScanLocalDirBloc late final _fileDeletedEventListener = AppEventListener(_onFileDeletedEvent); - - static final _log = Logger("bloc.scan_local_dir.ScanLocalDirBloc"); } diff --git a/app/lib/bloc/scan_local_dir.g.dart b/app/lib/bloc/scan_local_dir.g.dart index ed203c92..9688e167 100644 --- a/app/lib/bloc/scan_local_dir.g.dart +++ b/app/lib/bloc/scan_local_dir.g.dart @@ -2,6 +2,18 @@ part of 'scan_local_dir.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logScanLocalDirBloc = Logger("bloc.scan_local_dir.ScanLocalDirBloc"); + +extension _$ScanLocalDirBlocNpLog on ScanLocalDirBloc { + // ignore: unused_element + Logger get _log => _$logScanLocalDirBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/search.dart b/app/lib/bloc/search.dart index 979e9a7d..d11ae8da 100644 --- a/app/lib/bloc/search.dart +++ b/app/lib/bloc/search.dart @@ -9,6 +9,7 @@ import 'package:nc_photos/entity/search.dart'; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/search.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'search.g.dart'; @@ -95,6 +96,7 @@ class SearchBlocInconsistent extends SearchBlocState { : super(account, criteria, items); } +@npLog class SearchBloc extends Bloc { SearchBloc(this._c) : assert(require(_c)), @@ -223,6 +225,4 @@ class SearchBloc extends Bloc { }, logTag: "SearchBloc.refresh", ); - - static final _log = Logger("bloc.search.SearchBloc"); } diff --git a/app/lib/bloc/search.g.dart b/app/lib/bloc/search.g.dart index 746075c9..437142ce 100644 --- a/app/lib/bloc/search.g.dart +++ b/app/lib/bloc/search.g.dart @@ -2,6 +2,18 @@ part of 'search.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSearchBloc = Logger("bloc.search.SearchBloc"); + +extension _$SearchBlocNpLog on SearchBloc { + // ignore: unused_element + Logger get _log => _$logSearchBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/search_landing.dart b/app/lib/bloc/search_landing.dart index b5003fc3..fd007362 100644 --- a/app/lib/bloc/search_landing.dart +++ b/app/lib/bloc/search_landing.dart @@ -6,6 +6,7 @@ import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/person.dart'; import 'package:nc_photos/use_case/list_location_group.dart'; import 'package:nc_photos/use_case/list_person.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'search_landing.g.dart'; @@ -65,6 +66,7 @@ class SearchLandingBlocFailure extends SearchLandingBlocState { final Object exception; } +@npLog class SearchLandingBloc extends Bloc { SearchLandingBloc(this._c) @@ -121,6 +123,4 @@ class SearchLandingBloc ListLocationGroup(_c.withLocalRepo())(ev.account); final DiContainer _c; - - static final _log = Logger("bloc.search_landing.SearchLandingBloc"); } diff --git a/app/lib/bloc/search_landing.g.dart b/app/lib/bloc/search_landing.g.dart index e6275a54..3aedd358 100644 --- a/app/lib/bloc/search_landing.g.dart +++ b/app/lib/bloc/search_landing.g.dart @@ -2,6 +2,18 @@ part of 'search_landing.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSearchLandingBloc = Logger("bloc.search_landing.SearchLandingBloc"); + +extension _$SearchLandingBlocNpLog on SearchLandingBloc { + // ignore: unused_element + Logger get _log => _$logSearchLandingBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/bloc/search_suggestion.dart b/app/lib/bloc/search_suggestion.dart index bdd6510f..0b34fab9 100644 --- a/app/lib/bloc/search_suggestion.dart +++ b/app/lib/bloc/search_suggestion.dart @@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/ci_string.dart'; import 'package:nc_photos/iterable_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; import 'package:tuple/tuple.dart'; import 'package:woozy_search/woozy_search.dart'; @@ -57,6 +58,7 @@ class SearchSuggestionBlocSuccess extends SearchSuggestionBlocState { const SearchSuggestionBlocSuccess(List results) : super(results); } +@npLog class SearchSuggestionBloc extends Bloc> { SearchSuggestionBloc({ @@ -125,7 +127,4 @@ class SearchSuggestionBloc final _search = Woozy(limit: 5); SearchSuggestionBlocSearchEvent? _lastSearch; - - static final _log = - Logger("bloc.album_search_suggestion.SearchSuggestionBloc"); } diff --git a/app/lib/bloc/search_suggestion.g.dart b/app/lib/bloc/search_suggestion.g.dart index fbd2857e..2a00662b 100644 --- a/app/lib/bloc/search_suggestion.g.dart +++ b/app/lib/bloc/search_suggestion.g.dart @@ -2,6 +2,19 @@ part of 'search_suggestion.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSearchSuggestionBloc = + Logger("bloc.search_suggestion.SearchSuggestionBloc"); + +extension _$SearchSuggestionBlocNpLog on SearchSuggestionBloc { + // ignore: unused_element + Logger get _log => _$logSearchSuggestionBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/download_handler.dart b/app/lib/download_handler.dart index 5cbaab4d..1e8a87a7 100644 --- a/app/lib/download_handler.dart +++ b/app/lib/download_handler.dart @@ -20,8 +20,11 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/use_case/download_file.dart'; import 'package:nc_photos/use_case/inflate_file_descriptor.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:tuple/tuple.dart'; +part 'download_handler.g.dart'; + class DownloadHandler { DownloadHandler(this._c) : assert(require(_c)), @@ -59,6 +62,7 @@ abstract class _DownloadHandlerBase { }); } +@npLog class _DownlaodHandlerAndroid extends _DownloadHandlerBase { @override downloadFiles( @@ -157,10 +161,9 @@ class _DownlaodHandlerAndroid extends _DownloadHandlerBase { notificationId: notificationId, )); } - - static final _log = Logger("download_handler._DownloadHandlerAndroid"); } +@npLog class _DownloadHandlerWeb extends _DownloadHandlerBase { @override downloadFiles( @@ -211,6 +214,4 @@ class _DownloadHandlerWeb extends _DownloadHandlerBase { )); } } - - static final _log = Logger("download_handler._DownloadHandlerWeb"); } diff --git a/app/lib/download_handler.g.dart b/app/lib/download_handler.g.dart new file mode 100644 index 00000000..f15ecda1 --- /dev/null +++ b/app/lib/download_handler.g.dart @@ -0,0 +1,24 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'download_handler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_DownlaodHandlerAndroid = + Logger("download_handler._DownlaodHandlerAndroid"); + +extension _$_DownlaodHandlerAndroidNpLog on _DownlaodHandlerAndroid { + // ignore: unused_element + Logger get _log => _$log_DownlaodHandlerAndroid; +} + +// ignore: non_constant_identifier_names +final _$log_DownloadHandlerWeb = Logger("download_handler._DownloadHandlerWeb"); + +extension _$_DownloadHandlerWebNpLog on _DownloadHandlerWeb { + // ignore: unused_element + Logger get _log => _$log_DownloadHandlerWeb; +} diff --git a/app/lib/entity/album.dart b/app/lib/entity/album.dart index 00a54c32..fddf39cb 100644 --- a/app/lib/entity/album.dart +++ b/app/lib/entity/album.dart @@ -11,11 +11,13 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'album.g.dart'; /// Immutable object that represents an album +@npLog class Album with EquatableMixin { /// Create a new album /// @@ -216,7 +218,7 @@ class Album with EquatableMixin { /// versioning of this class, use to upgrade old persisted album static const version = 8; - static final _log = Logger("entity.album.Album"); + static final _log = _$logAlbum; } @toString diff --git a/app/lib/entity/album.g.dart b/app/lib/entity/album.g.dart index 117f9c1f..e7504252 100644 --- a/app/lib/entity/album.g.dart +++ b/app/lib/entity/album.g.dart @@ -2,6 +2,18 @@ part of 'album.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbum = Logger("entity.album.Album"); + +extension _$AlbumNpLog on Album { + // ignore: unused_element + Logger get _log => _$logAlbum; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/entity/album/cover_provider.dart b/app/lib/entity/album/cover_provider.dart index f455371e..f2d03ba7 100644 --- a/app/lib/entity/album/cover_provider.dart +++ b/app/lib/entity/album/cover_provider.dart @@ -8,10 +8,12 @@ import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'cover_provider.g.dart'; +@npLog abstract class AlbumCoverProvider with EquatableMixin { const AlbumCoverProvider(); @@ -57,7 +59,7 @@ abstract class AlbumCoverProvider with EquatableMixin { JsonObj _toContentJson(); - static final _log = Logger("entity.album.cover_provider.AlbumCoverProvider"); + static final _log = _$logAlbumCoverProvider; } /// Cover selected automatically by us diff --git a/app/lib/entity/album/cover_provider.g.dart b/app/lib/entity/album/cover_provider.g.dart index de6483ff..9134a5b3 100644 --- a/app/lib/entity/album/cover_provider.g.dart +++ b/app/lib/entity/album/cover_provider.g.dart @@ -2,6 +2,19 @@ part of 'cover_provider.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbumCoverProvider = + Logger("entity.album.cover_provider.AlbumCoverProvider"); + +extension _$AlbumCoverProviderNpLog on AlbumCoverProvider { + // ignore: unused_element + Logger get _log => _$logAlbumCoverProvider; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/entity/album/data_source.dart b/app/lib/entity/album/data_source.dart index 81e79108..7a7c63af 100644 --- a/app/lib/entity/album/data_source.dart +++ b/app/lib/entity/album/data_source.dart @@ -23,7 +23,11 @@ import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/use_case/get_file_binary.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; import 'package:nc_photos/use_case/put_file_binary.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'data_source.g.dart'; + +@npLog class AlbumRemoteDataSource implements AlbumDataSource { @override get(Account account, File albumFile) async { @@ -95,10 +99,9 @@ class AlbumRemoteDataSource implements AlbumDataSource { final random = Random().nextInt(0xFFFFFF); return "${timestamp.toRadixString(16)}-${random.toRadixString(16).padLeft(6, '0')}.nc_album.json"; } - - static final _log = Logger("entity.album.AlbumRemoteDataSource"); } +@npLog class AlbumSqliteDbDataSource implements AlbumDataSource { AlbumSqliteDbDataSource(this._c); @@ -233,10 +236,9 @@ class AlbumSqliteDbDataSource implements AlbumDataSource { } final DiContainer _c; - - static final _log = Logger("entity.album.AlbumSqliteDbDataSource"); } +@npLog class AlbumCachedDataSource implements AlbumDataSource { AlbumCachedDataSource(DiContainer c) : _sqliteDbSrc = AlbumSqliteDbDataSource(c); @@ -303,6 +305,4 @@ class AlbumCachedDataSource implements AlbumDataSource { final _remoteSrc = AlbumRemoteDataSource(); final AlbumSqliteDbDataSource _sqliteDbSrc; - - static final _log = Logger("entity.album.AlbumCachedDataSource"); } diff --git a/app/lib/entity/album/data_source.g.dart b/app/lib/entity/album/data_source.g.dart new file mode 100644 index 00000000..226c215e --- /dev/null +++ b/app/lib/entity/album/data_source.g.dart @@ -0,0 +1,34 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbumRemoteDataSource = + Logger("entity.album.data_source.AlbumRemoteDataSource"); + +extension _$AlbumRemoteDataSourceNpLog on AlbumRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logAlbumRemoteDataSource; +} + +// ignore: non_constant_identifier_names +final _$logAlbumSqliteDbDataSource = + Logger("entity.album.data_source.AlbumSqliteDbDataSource"); + +extension _$AlbumSqliteDbDataSourceNpLog on AlbumSqliteDbDataSource { + // ignore: unused_element + Logger get _log => _$logAlbumSqliteDbDataSource; +} + +// ignore: non_constant_identifier_names +final _$logAlbumCachedDataSource = + Logger("entity.album.data_source.AlbumCachedDataSource"); + +extension _$AlbumCachedDataSourceNpLog on AlbumCachedDataSource { + // ignore: unused_element + Logger get _log => _$logAlbumCachedDataSource; +} diff --git a/app/lib/entity/album/item.dart b/app/lib/entity/album/item.dart index 7a24af32..46fc0bd5 100644 --- a/app/lib/entity/album/item.dart +++ b/app/lib/entity/album/item.dart @@ -5,10 +5,12 @@ import 'package:nc_photos/ci_string.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'item.g.dart'; +@npLog @toString abstract class AlbumItem with EquatableMixin { AlbumItem({ @@ -67,7 +69,7 @@ abstract class AlbumItem with EquatableMixin { final CiString addedBy; final DateTime addedAt; - static final _log = Logger("entity.album.AlbumItem"); + static final _log = _$logAlbumItem; } @toString diff --git a/app/lib/entity/album/item.g.dart b/app/lib/entity/album/item.g.dart index 67e7900b..294b94db 100644 --- a/app/lib/entity/album/item.g.dart +++ b/app/lib/entity/album/item.g.dart @@ -2,6 +2,18 @@ part of 'item.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbumItem = Logger("entity.album.item.AlbumItem"); + +extension _$AlbumItemNpLog on AlbumItem { + // ignore: unused_element + Logger get _log => _$logAlbumItem; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/entity/album/provider.dart b/app/lib/entity/album/provider.dart index 81fa7d22..ab79245d 100644 --- a/app/lib/entity/album/provider.dart +++ b/app/lib/entity/album/provider.dart @@ -10,10 +10,12 @@ import 'package:nc_photos/entity/tag.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'provider.g.dart'; +@npLog abstract class AlbumProvider with EquatableMixin { const AlbumProvider(); @@ -63,7 +65,7 @@ abstract class AlbumProvider with EquatableMixin { AlbumProvider copyWith(); - static final _log = Logger("entity.album.provider.AlbumProvider"); + static final _log = _$logAlbumProvider; } abstract class AlbumProviderBase extends AlbumProvider { diff --git a/app/lib/entity/album/provider.g.dart b/app/lib/entity/album/provider.g.dart index 48c50132..eca228f7 100644 --- a/app/lib/entity/album/provider.g.dart +++ b/app/lib/entity/album/provider.g.dart @@ -2,6 +2,18 @@ part of 'provider.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbumProvider = Logger("entity.album.provider.AlbumProvider"); + +extension _$AlbumProviderNpLog on AlbumProvider { + // ignore: unused_element + Logger get _log => _$logAlbumProvider; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/entity/album/sort_provider.dart b/app/lib/entity/album/sort_provider.dart index ad2b42ad..ac53e3d3 100644 --- a/app/lib/entity/album/sort_provider.dart +++ b/app/lib/entity/album/sort_provider.dart @@ -6,11 +6,13 @@ import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; import 'package:tuple/tuple.dart'; part 'sort_provider.g.dart'; +@npLog abstract class AlbumSortProvider with EquatableMixin { const AlbumSortProvider(); @@ -55,7 +57,7 @@ abstract class AlbumSortProvider with EquatableMixin { JsonObj _toContentJson(); - static final _log = Logger("entity.album.sort_provider.AlbumSortProvider"); + static final _log = _$logAlbumSortProvider; } /// Sort provider that does nothing diff --git a/app/lib/entity/album/sort_provider.g.dart b/app/lib/entity/album/sort_provider.g.dart index a69025b2..ff12c2cd 100644 --- a/app/lib/entity/album/sort_provider.g.dart +++ b/app/lib/entity/album/sort_provider.g.dart @@ -2,6 +2,19 @@ part of 'sort_provider.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbumSortProvider = + Logger("entity.album.sort_provider.AlbumSortProvider"); + +extension _$AlbumSortProviderNpLog on AlbumSortProvider { + // ignore: unused_element + Logger get _log => _$logAlbumSortProvider; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/entity/album/upgrader.dart b/app/lib/entity/album/upgrader.dart index d413e496..882be2c0 100644 --- a/app/lib/entity/album/upgrader.dart +++ b/app/lib/entity/album/upgrader.dart @@ -5,13 +5,17 @@ import 'package:nc_photos/ci_string.dart'; import 'package:nc_photos/entity/exif.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:tuple/tuple.dart'; +part 'upgrader.g.dart'; + abstract class AlbumUpgrader { JsonObj? call(JsonObj json); } /// Upgrade v1 Album to v2 +@npLog class AlbumUpgraderV1 implements AlbumUpgrader { AlbumUpgraderV1({ this.logFilePath, @@ -28,11 +32,10 @@ class AlbumUpgraderV1 implements AlbumUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.album.upgrader.AlbumUpgraderV1"); } /// Upgrade v2 Album to v3 +@npLog class AlbumUpgraderV2 implements AlbumUpgrader { AlbumUpgraderV2({ this.logFilePath, @@ -61,11 +64,10 @@ class AlbumUpgraderV2 implements AlbumUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.album.upgrader.AlbumUpgraderV2"); } /// Upgrade v3 Album to v4 +@npLog class AlbumUpgraderV3 implements AlbumUpgrader { AlbumUpgraderV3({ this.logFilePath, @@ -88,11 +90,10 @@ class AlbumUpgraderV3 implements AlbumUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.album.upgrader.AlbumUpgraderV3"); } /// Upgrade v4 Album to v5 +@npLog class AlbumUpgraderV4 implements AlbumUpgrader { AlbumUpgraderV4({ this.logFilePath, @@ -157,11 +158,10 @@ class AlbumUpgraderV4 implements AlbumUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.album.upgrader.AlbumUpgraderV4"); } /// Upgrade v5 Album to v6 +@npLog class AlbumUpgraderV5 implements AlbumUpgrader { const AlbumUpgraderV5( this.account, { @@ -202,11 +202,10 @@ class AlbumUpgraderV5 implements AlbumUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.album.upgrader.AlbumUpgraderV5"); } /// Upgrade v6 Album to v7 +@npLog class AlbumUpgraderV6 implements AlbumUpgrader { const AlbumUpgraderV6({ this.logFilePath, @@ -218,13 +217,12 @@ class AlbumUpgraderV6 implements AlbumUpgrader { return json; } - static final _log = Logger("entity.album.upgrader.AlbumUpgraderV6"); - /// File path for logging only final String? logFilePath; } /// Upgrade v7 Album to v8 +@npLog class AlbumUpgraderV7 implements AlbumUpgrader { const AlbumUpgraderV7({ this.logFilePath, @@ -236,8 +234,6 @@ class AlbumUpgraderV7 implements AlbumUpgrader { return json; } - static final _log = Logger("entity.album.upgrader.AlbumUpgraderV7"); - /// File path for logging only final String? logFilePath; } diff --git a/app/lib/entity/album/upgrader.g.dart b/app/lib/entity/album/upgrader.g.dart new file mode 100644 index 00000000..2664977f --- /dev/null +++ b/app/lib/entity/album/upgrader.g.dart @@ -0,0 +1,63 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'upgrader.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbumUpgraderV1 = Logger("entity.album.upgrader.AlbumUpgraderV1"); + +extension _$AlbumUpgraderV1NpLog on AlbumUpgraderV1 { + // ignore: unused_element + Logger get _log => _$logAlbumUpgraderV1; +} + +// ignore: non_constant_identifier_names +final _$logAlbumUpgraderV2 = Logger("entity.album.upgrader.AlbumUpgraderV2"); + +extension _$AlbumUpgraderV2NpLog on AlbumUpgraderV2 { + // ignore: unused_element + Logger get _log => _$logAlbumUpgraderV2; +} + +// ignore: non_constant_identifier_names +final _$logAlbumUpgraderV3 = Logger("entity.album.upgrader.AlbumUpgraderV3"); + +extension _$AlbumUpgraderV3NpLog on AlbumUpgraderV3 { + // ignore: unused_element + Logger get _log => _$logAlbumUpgraderV3; +} + +// ignore: non_constant_identifier_names +final _$logAlbumUpgraderV4 = Logger("entity.album.upgrader.AlbumUpgraderV4"); + +extension _$AlbumUpgraderV4NpLog on AlbumUpgraderV4 { + // ignore: unused_element + Logger get _log => _$logAlbumUpgraderV4; +} + +// ignore: non_constant_identifier_names +final _$logAlbumUpgraderV5 = Logger("entity.album.upgrader.AlbumUpgraderV5"); + +extension _$AlbumUpgraderV5NpLog on AlbumUpgraderV5 { + // ignore: unused_element + Logger get _log => _$logAlbumUpgraderV5; +} + +// ignore: non_constant_identifier_names +final _$logAlbumUpgraderV6 = Logger("entity.album.upgrader.AlbumUpgraderV6"); + +extension _$AlbumUpgraderV6NpLog on AlbumUpgraderV6 { + // ignore: unused_element + Logger get _log => _$logAlbumUpgraderV6; +} + +// ignore: non_constant_identifier_names +final _$logAlbumUpgraderV7 = Logger("entity.album.upgrader.AlbumUpgraderV7"); + +extension _$AlbumUpgraderV7NpLog on AlbumUpgraderV7 { + // ignore: unused_element + Logger get _log => _$logAlbumUpgraderV7; +} diff --git a/app/lib/entity/exif.dart b/app/lib/entity/exif.dart index 52cde8f6..d213afee 100644 --- a/app/lib/entity/exif.dart +++ b/app/lib/entity/exif.dart @@ -3,7 +3,11 @@ import 'package:exifdart/exifdart.dart'; import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'exif.g.dart'; + +@npLog class Exif with EquatableMixin { Exif(this.data); @@ -138,6 +142,4 @@ class Exif with EquatableMixin { final Map data; static final dateTimeFormat = DateFormat("yyyy:MM:dd HH:mm:ss"); - - static final _log = Logger("entity.exif.Exif"); } diff --git a/app/lib/entity/exif.g.dart b/app/lib/entity/exif.g.dart new file mode 100644 index 00000000..1398537b --- /dev/null +++ b/app/lib/entity/exif.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'exif.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logExif = Logger("entity.exif.Exif"); + +extension _$ExifNpLog on Exif { + // ignore: unused_element + Logger get _log => _$logExif; +} diff --git a/app/lib/entity/face/data_source.dart b/app/lib/entity/face/data_source.dart index fe0eee23..ac4cdc39 100644 --- a/app/lib/entity/face/data_source.dart +++ b/app/lib/entity/face/data_source.dart @@ -7,7 +7,11 @@ import 'package:nc_photos/entity/face.dart'; import 'package:nc_photos/entity/person.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'data_source.g.dart'; + +@npLog class FaceRemoteDataSource implements FaceDataSource { const FaceRemoteDataSource(); @@ -32,10 +36,9 @@ class FaceRemoteDataSource implements FaceDataSource { final List dataJson = json["ocs"]["data"].cast(); return _FaceParser().parseList(dataJson); } - - static final _log = Logger("entity.face.data_source.FaceRemoteDataSource"); } +@npLog class _FaceParser { List parseList(List jsons) { final product = []; @@ -55,6 +58,4 @@ class _FaceParser { fileId: json["fileId"], ); } - - static final _log = Logger("entity.face.data_source._FaceParser"); } diff --git a/app/lib/entity/face/data_source.g.dart b/app/lib/entity/face/data_source.g.dart new file mode 100644 index 00000000..b05dc16e --- /dev/null +++ b/app/lib/entity/face/data_source.g.dart @@ -0,0 +1,24 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logFaceRemoteDataSource = + Logger("entity.face.data_source.FaceRemoteDataSource"); + +extension _$FaceRemoteDataSourceNpLog on FaceRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logFaceRemoteDataSource; +} + +// ignore: non_constant_identifier_names +final _$log_FaceParser = Logger("entity.face.data_source._FaceParser"); + +extension _$_FaceParserNpLog on _FaceParser { + // ignore: unused_element + Logger get _log => _$log_FaceParser; +} diff --git a/app/lib/entity/favorite/data_source.dart b/app/lib/entity/favorite/data_source.dart index 932c66b1..0ea7a68c 100644 --- a/app/lib/entity/favorite/data_source.dart +++ b/app/lib/entity/favorite/data_source.dart @@ -5,8 +5,12 @@ import 'package:nc_photos/entity/favorite.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/webdav_response_parser.dart'; import 'package:nc_photos/exception.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:xml/xml.dart'; +part 'data_source.g.dart'; + +@npLog class FavoriteRemoteDataSource implements FavoriteDataSource { const FavoriteRemoteDataSource(); @@ -28,7 +32,4 @@ class FavoriteRemoteDataSource implements FavoriteDataSource { final xml = XmlDocument.parse(response.body); return WebdavResponseParser().parseFavorites(xml); } - - static final _log = - Logger("entity.favorite.data_source.FavoriteRemoteDataSource"); } diff --git a/app/lib/entity/favorite/data_source.g.dart b/app/lib/entity/favorite/data_source.g.dart new file mode 100644 index 00000000..c1716a40 --- /dev/null +++ b/app/lib/entity/favorite/data_source.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logFavoriteRemoteDataSource = + Logger("entity.favorite.data_source.FavoriteRemoteDataSource"); + +extension _$FavoriteRemoteDataSourceNpLog on FavoriteRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logFavoriteRemoteDataSource; +} diff --git a/app/lib/entity/file.dart b/app/lib/entity/file.dart index 3079145c..dff969b2 100644 --- a/app/lib/entity/file.dart +++ b/app/lib/entity/file.dart @@ -11,6 +11,7 @@ import 'package:nc_photos/json_util.dart' as json_util; import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/string_extension.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'file.g.dart'; @@ -83,6 +84,7 @@ class ImageLocation with EquatableMixin { } /// Immutable object that hold metadata of a [File] +@npLog @ToString(ignoreNull: true) class Metadata with EquatableMixin { Metadata({ @@ -206,7 +208,7 @@ class Metadata with EquatableMixin { /// versioning of this class, use to upgrade old persisted metadata static const version = 4; - static final _log = Logger("entity.file.Metadata"); + static final _log = _$logMetadata; } abstract class MetadataUpgrader { @@ -214,6 +216,7 @@ abstract class MetadataUpgrader { } /// Upgrade v1 Metadata to v2 +@npLog class MetadataUpgraderV1 implements MetadataUpgrader { MetadataUpgraderV1({ required this.fileContentType, @@ -235,11 +238,10 @@ class MetadataUpgraderV1 implements MetadataUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.file.MetadataUpgraderV1"); } /// Upgrade v2 Metadata to v3 +@npLog class MetadataUpgraderV2 implements MetadataUpgrader { MetadataUpgraderV2({ required this.fileContentType, @@ -268,11 +270,10 @@ class MetadataUpgraderV2 implements MetadataUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.file.MetadataUpgraderV2"); } /// Upgrade v3 Metadata to v4 +@npLog class MetadataUpgraderV3 implements MetadataUpgrader { const MetadataUpgraderV3({ required this.fileContentType, @@ -297,8 +298,6 @@ class MetadataUpgraderV3 implements MetadataUpgrader { /// File path for logging only final String? logFilePath; - - static final _log = Logger("entity.file.MetadataUpgraderV3"); } @ToString(ignoreNull: true) diff --git a/app/lib/entity/file.g.dart b/app/lib/entity/file.g.dart index 6ba69a83..0b0043d8 100644 --- a/app/lib/entity/file.g.dart +++ b/app/lib/entity/file.g.dart @@ -2,6 +2,42 @@ part of 'file.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logMetadata = Logger("entity.file.Metadata"); + +extension _$MetadataNpLog on Metadata { + // ignore: unused_element + Logger get _log => _$logMetadata; +} + +// ignore: non_constant_identifier_names +final _$logMetadataUpgraderV1 = Logger("entity.file.MetadataUpgraderV1"); + +extension _$MetadataUpgraderV1NpLog on MetadataUpgraderV1 { + // ignore: unused_element + Logger get _log => _$logMetadataUpgraderV1; +} + +// ignore: non_constant_identifier_names +final _$logMetadataUpgraderV2 = Logger("entity.file.MetadataUpgraderV2"); + +extension _$MetadataUpgraderV2NpLog on MetadataUpgraderV2 { + // ignore: unused_element + Logger get _log => _$logMetadataUpgraderV2; +} + +// ignore: non_constant_identifier_names +final _$logMetadataUpgraderV3 = Logger("entity.file.MetadataUpgraderV3"); + +extension _$MetadataUpgraderV3NpLog on MetadataUpgraderV3 { + // ignore: unused_element + Logger get _log => _$logMetadataUpgraderV3; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/entity/file/data_source.dart b/app/lib/entity/file/data_source.dart index a7e7c2be..0e5ec09f 100644 --- a/app/lib/entity/file/data_source.dart +++ b/app/lib/entity/file/data_source.dart @@ -19,9 +19,13 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/use_case/compat/v32.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; import 'package:xml/xml.dart'; +part 'data_source.g.dart'; + +@npLog class FileWebdavDataSource implements FileDataSource { const FileWebdavDataSource(); @@ -352,10 +356,9 @@ class FileWebdavDataSource implements FileDataSource { } } } - - static final _log = Logger("entity.file.data_source.FileWebdavDataSource"); } +@npLog class FileSqliteDbDataSource implements FileDataSource { FileSqliteDbDataSource(this._c); @@ -564,8 +567,6 @@ class FileSqliteDbDataSource implements FileDataSource { } final DiContainer _c; - - static final _log = Logger("entity.file.data_source.FileSqliteDbDataSource"); } class IntermediateSyncState { @@ -584,6 +585,7 @@ class IntermediateSyncState { final bool shouldCache; } +@npLog class FileCachedDataSource implements FileDataSource { FileCachedDataSource( this._c, { @@ -799,8 +801,6 @@ class FileCachedDataSource implements FileDataSource { final _remoteSrc = const FileWebdavDataSource(); final FileSqliteDbDataSource _sqliteDbSrc; - - static final _log = Logger("entity.file.data_source.FileCachedDataSource"); } bool _validateFile(File f) { diff --git a/app/lib/entity/file/data_source.g.dart b/app/lib/entity/file/data_source.g.dart new file mode 100644 index 00000000..86cb3dd9 --- /dev/null +++ b/app/lib/entity/file/data_source.g.dart @@ -0,0 +1,34 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logFileWebdavDataSource = + Logger("entity.file.data_source.FileWebdavDataSource"); + +extension _$FileWebdavDataSourceNpLog on FileWebdavDataSource { + // ignore: unused_element + Logger get _log => _$logFileWebdavDataSource; +} + +// ignore: non_constant_identifier_names +final _$logFileSqliteDbDataSource = + Logger("entity.file.data_source.FileSqliteDbDataSource"); + +extension _$FileSqliteDbDataSourceNpLog on FileSqliteDbDataSource { + // ignore: unused_element + Logger get _log => _$logFileSqliteDbDataSource; +} + +// ignore: non_constant_identifier_names +final _$logFileCachedDataSource = + Logger("entity.file.data_source.FileCachedDataSource"); + +extension _$FileCachedDataSourceNpLog on FileCachedDataSource { + // ignore: unused_element + Logger get _log => _$logFileCachedDataSource; +} diff --git a/app/lib/entity/file/file_cache_manager.dart b/app/lib/entity/file/file_cache_manager.dart index c9871bc3..9d759c8e 100644 --- a/app/lib/entity/file/file_cache_manager.dart +++ b/app/lib/entity/file/file_cache_manager.dart @@ -15,7 +15,11 @@ import 'package:nc_photos/exception.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/list_util.dart' as list_util; import 'package:nc_photos/object_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'file_cache_manager.g.dart'; + +@npLog class FileCacheLoader { FileCacheLoader( this._c, { @@ -81,10 +85,9 @@ class FileCacheLoader { var _isGood = false; String? _remoteEtag; - - static final _log = Logger("entity.file.file_cache_manager.FileCacheLoader"); } +@npLog class FileSqliteCacheUpdater { FileSqliteCacheUpdater(this._c) : assert(require(_c)); @@ -348,9 +351,6 @@ class FileSqliteCacheUpdater { int? _dirRowId; final _childRowIds = []; - - static final _log = - Logger("entity.file.file_cache_manager.FileSqliteCacheUpdater"); } class FileSqliteCacheRemover { diff --git a/app/lib/entity/file/file_cache_manager.g.dart b/app/lib/entity/file/file_cache_manager.g.dart new file mode 100644 index 00000000..292f7b88 --- /dev/null +++ b/app/lib/entity/file/file_cache_manager.g.dart @@ -0,0 +1,25 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'file_cache_manager.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logFileCacheLoader = + Logger("entity.file.file_cache_manager.FileCacheLoader"); + +extension _$FileCacheLoaderNpLog on FileCacheLoader { + // ignore: unused_element + Logger get _log => _$logFileCacheLoader; +} + +// ignore: non_constant_identifier_names +final _$logFileSqliteCacheUpdater = + Logger("entity.file.file_cache_manager.FileSqliteCacheUpdater"); + +extension _$FileSqliteCacheUpdaterNpLog on FileSqliteCacheUpdater { + // ignore: unused_element + Logger get _log => _$logFileSqliteCacheUpdater; +} diff --git a/app/lib/entity/local_file/data_source.dart b/app/lib/entity/local_file/data_source.dart index eb97e4cc..88d17643 100644 --- a/app/lib/entity/local_file/data_source.dart +++ b/app/lib/entity/local_file/data_source.dart @@ -9,7 +9,11 @@ import 'package:nc_photos/mobile/share.dart'; import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/stream_extension.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'data_source.g.dart'; + +@npLog class LocalFileMediaStoreDataSource implements LocalFileDataSource { const LocalFileMediaStoreDataSource(); @@ -118,7 +122,4 @@ class LocalFileMediaStoreDataSource implements LocalFileDataSource { mime: r.mimeType, dateTaken: r.dateTaken?.run(DateTime.fromMillisecondsSinceEpoch), ); - - static final _log = - Logger("entity.local_file.data_source.LocalFileMediaStoreDataSource"); } diff --git a/app/lib/entity/local_file/data_source.g.dart b/app/lib/entity/local_file/data_source.g.dart new file mode 100644 index 00000000..2ca0443a --- /dev/null +++ b/app/lib/entity/local_file/data_source.g.dart @@ -0,0 +1,17 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logLocalFileMediaStoreDataSource = + Logger("entity.local_file.data_source.LocalFileMediaStoreDataSource"); + +extension _$LocalFileMediaStoreDataSourceNpLog + on LocalFileMediaStoreDataSource { + // ignore: unused_element + Logger get _log => _$logLocalFileMediaStoreDataSource; +} diff --git a/app/lib/entity/person/data_source.dart b/app/lib/entity/person/data_source.dart index 4b839a32..187894a7 100644 --- a/app/lib/entity/person/data_source.dart +++ b/app/lib/entity/person/data_source.dart @@ -4,12 +4,16 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/account.dart'; import 'package:nc_photos/api/api.dart'; import 'package:nc_photos/entity/person.dart'; +import 'package:nc_photos/entity/sqlite_table.dart' as sql; import 'package:nc_photos/entity/sqlite_table_converter.dart'; +import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/type.dart'; -import 'package:nc_photos/entity/sqlite_table.dart' as sql; -import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; +import 'package:np_codegen/np_codegen.dart'; +part 'data_source.g.dart'; + +@npLog class PersonRemoteDataSource implements PersonDataSource { const PersonRemoteDataSource(); @@ -29,11 +33,9 @@ class PersonRemoteDataSource implements PersonDataSource { final List dataJson = json["ocs"]["data"].cast(); return _PersonParser().parseList(dataJson); } - - static final _log = - Logger("entity.person.data_source.PersonRemoteDataSource"); } +@npLog class PersonSqliteDbDataSource implements PersonDataSource { const PersonSqliteDbDataSource(this.sqliteDb); @@ -47,11 +49,9 @@ class PersonSqliteDbDataSource implements PersonDataSource { } final sql.SqliteDb sqliteDb; - - static final _log = - Logger("entity.person.data_source.PersonSqliteDbDataSource"); } +@npLog class _PersonParser { List parseList(List jsons) { final product = []; @@ -72,6 +72,4 @@ class _PersonParser { count: json["count"], ); } - - static final _log = Logger("entity.person.data_source._PersonParser"); } diff --git a/app/lib/entity/person/data_source.g.dart b/app/lib/entity/person/data_source.g.dart new file mode 100644 index 00000000..ed943dc6 --- /dev/null +++ b/app/lib/entity/person/data_source.g.dart @@ -0,0 +1,33 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logPersonRemoteDataSource = + Logger("entity.person.data_source.PersonRemoteDataSource"); + +extension _$PersonRemoteDataSourceNpLog on PersonRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logPersonRemoteDataSource; +} + +// ignore: non_constant_identifier_names +final _$logPersonSqliteDbDataSource = + Logger("entity.person.data_source.PersonSqliteDbDataSource"); + +extension _$PersonSqliteDbDataSourceNpLog on PersonSqliteDbDataSource { + // ignore: unused_element + Logger get _log => _$logPersonSqliteDbDataSource; +} + +// ignore: non_constant_identifier_names +final _$log_PersonParser = Logger("entity.person.data_source._PersonParser"); + +extension _$_PersonParserNpLog on _PersonParser { + // ignore: unused_element + Logger get _log => _$log_PersonParser; +} diff --git a/app/lib/entity/search/data_source.dart b/app/lib/entity/search/data_source.dart index 4f69ca65..92045171 100644 --- a/app/lib/entity/search/data_source.dart +++ b/app/lib/entity/search/data_source.dart @@ -13,7 +13,11 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/use_case/list_tagged_file.dart'; import 'package:nc_photos/use_case/populate_person.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'data_source.g.dart'; + +@npLog class SearchSqliteDbDataSource implements SearchDataSource { SearchSqliteDbDataSource(this._c); @@ -182,7 +186,4 @@ class SearchSqliteDbDataSource implements SearchDataSource { } final DiContainer _c; - - static final _log = - Logger("entity.search.data_source.SearchSqliteDbDataSource"); } diff --git a/app/lib/entity/search/data_source.g.dart b/app/lib/entity/search/data_source.g.dart new file mode 100644 index 00000000..d6d64b5a --- /dev/null +++ b/app/lib/entity/search/data_source.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSearchSqliteDbDataSource = + Logger("entity.search.data_source.SearchSqliteDbDataSource"); + +extension _$SearchSqliteDbDataSourceNpLog on SearchSqliteDbDataSource { + // ignore: unused_element + Logger get _log => _$logSearchSqliteDbDataSource; +} diff --git a/app/lib/entity/share/data_source.dart b/app/lib/entity/share/data_source.dart index e2e87da2..2738dfbd 100644 --- a/app/lib/entity/share/data_source.dart +++ b/app/lib/entity/share/data_source.dart @@ -9,7 +9,11 @@ import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/entity/share.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'data_source.g.dart'; + +@npLog class ShareRemoteDataSource implements ShareDataSource { @override list( @@ -134,10 +138,9 @@ class ShareRemoteDataSource implements ShareDataSource { final List dataJson = json["ocs"]["data"].cast(); return _ShareParser().parseList(dataJson); } - - static final _log = Logger("entity.share.data_source.ShareRemoteDataSource"); } +@npLog class _ShareParser { List parseList(List jsons) { final product = []; @@ -174,6 +177,4 @@ class _ShareParser { url: json["url"], ); } - - static final _log = Logger("entity.share.data_source._ShareParser"); } diff --git a/app/lib/entity/share/data_source.g.dart b/app/lib/entity/share/data_source.g.dart new file mode 100644 index 00000000..ff6c1e33 --- /dev/null +++ b/app/lib/entity/share/data_source.g.dart @@ -0,0 +1,24 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logShareRemoteDataSource = + Logger("entity.share.data_source.ShareRemoteDataSource"); + +extension _$ShareRemoteDataSourceNpLog on ShareRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logShareRemoteDataSource; +} + +// ignore: non_constant_identifier_names +final _$log_ShareParser = Logger("entity.share.data_source._ShareParser"); + +extension _$_ShareParserNpLog on _ShareParser { + // ignore: unused_element + Logger get _log => _$log_ShareParser; +} diff --git a/app/lib/entity/sharee/data_source.dart b/app/lib/entity/sharee/data_source.dart index 61d379c2..761985e6 100644 --- a/app/lib/entity/sharee/data_source.dart +++ b/app/lib/entity/sharee/data_source.dart @@ -7,7 +7,11 @@ import 'package:nc_photos/ci_string.dart'; import 'package:nc_photos/entity/sharee.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'data_source.g.dart'; + +@npLog class ShareeRemoteDataSource implements ShareeDataSource { @override list(Account account) async { @@ -28,11 +32,9 @@ class ShareeRemoteDataSource implements ShareeDataSource { final sharees = _ShareeParser()(json); return sharees; } - - static final _log = - Logger("entity.sharee.data_source.ShareeRemoteDataSource"); } +@npLog class _ShareeParser { List call(JsonObj json) { final JsonObj dataJson = json["ocs"]["data"]; @@ -55,8 +57,6 @@ class _ShareeParser { return product; } - static final _log = Logger("entity.sharee.data_source._ShareeParser"); - static const _keyTypes = { "users": ShareeType.user, "groups": ShareeType.group, diff --git a/app/lib/entity/sharee/data_source.g.dart b/app/lib/entity/sharee/data_source.g.dart new file mode 100644 index 00000000..58ae343d --- /dev/null +++ b/app/lib/entity/sharee/data_source.g.dart @@ -0,0 +1,24 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logShareeRemoteDataSource = + Logger("entity.sharee.data_source.ShareeRemoteDataSource"); + +extension _$ShareeRemoteDataSourceNpLog on ShareeRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logShareeRemoteDataSource; +} + +// ignore: non_constant_identifier_names +final _$log_ShareeParser = Logger("entity.sharee.data_source._ShareeParser"); + +extension _$_ShareeParserNpLog on _ShareeParser { + // ignore: unused_element + Logger get _log => _$log_ShareeParser; +} diff --git a/app/lib/entity/sqlite_table.dart b/app/lib/entity/sqlite_table.dart index 54b2ff55..5a3fb648 100644 --- a/app/lib/entity/sqlite_table.dart +++ b/app/lib/entity/sqlite_table.dart @@ -2,6 +2,7 @@ import 'package:drift/drift.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/mobile/platform.dart' if (dart.library.html) 'package:nc_photos/web/platform.dart' as platform; +import 'package:np_codegen/np_codegen.dart'; part 'sqlite_table.g.dart'; @@ -196,6 +197,7 @@ class Persons extends Table { } // remember to also update the truncate method after adding a new table +@npLog @DriftDatabase( tables: [ Servers, @@ -302,8 +304,6 @@ class SqliteDb extends _$SqliteDb { await m.createIndex(Index("image_locations_admin2_index", "CREATE INDEX image_locations_admin2_index ON image_locations(admin2);")); } - - static final _log = Logger("entity.sqlite_table.SqliteDb"); } class _DateTimeConverter extends TypeConverter { diff --git a/app/lib/entity/sqlite_table.g.dart b/app/lib/entity/sqlite_table.g.dart index bbe0e43f..e349a55a 100644 --- a/app/lib/entity/sqlite_table.g.dart +++ b/app/lib/entity/sqlite_table.g.dart @@ -4190,3 +4190,15 @@ abstract class _$SqliteDb extends GeneratedDatabase { persons ]; } + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSqliteDb = Logger("entity.sqlite_table.SqliteDb"); + +extension _$SqliteDbNpLog on SqliteDb { + // ignore: unused_element + Logger get _log => _$logSqliteDb; +} diff --git a/app/lib/entity/sqlite_table_extension.dart b/app/lib/entity/sqlite_table_extension.dart index 665b13fd..81556418 100644 --- a/app/lib/entity/sqlite_table_extension.dart +++ b/app/lib/entity/sqlite_table_extension.dart @@ -16,6 +16,9 @@ import 'package:nc_photos/mobile/platform.dart' if (dart.library.html) 'package:nc_photos/web/platform.dart' as platform; import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/platform/k.dart' as platform_k; +import 'package:np_codegen/np_codegen.dart'; + +part 'sqlite_table_extension.g.dart'; const maxByFileIdsSize = 30000; @@ -92,6 +95,7 @@ class AccountFileRowIdsWithFileId { final int fileId; } +@npLog extension SqliteDbExtension on SqliteDb { /// Start a transaction and run [block] /// @@ -586,8 +590,6 @@ extension SqliteDbExtension on SqliteDb { .map>((m) => files.contentType.equals(m)) .reduce((value, element) => value | element); } - - static final _log = Logger("entity.sqlite_table_extension.SqliteDbExtension"); } enum FilesQueryMode { diff --git a/app/lib/entity/sqlite_table_extension.g.dart b/app/lib/entity/sqlite_table_extension.g.dart new file mode 100644 index 00000000..fd727b63 --- /dev/null +++ b/app/lib/entity/sqlite_table_extension.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sqlite_table_extension.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSqliteDbExtension = + Logger("entity.sqlite_table_extension.SqliteDbExtension"); + +extension _$SqliteDbExtensionNpLog on SqliteDb { + // ignore: unused_element + Logger get _log => _$logSqliteDbExtension; +} diff --git a/app/lib/entity/tag/data_source.dart b/app/lib/entity/tag/data_source.dart index 14c0b9f2..6fa3c07f 100644 --- a/app/lib/entity/tag/data_source.dart +++ b/app/lib/entity/tag/data_source.dart @@ -8,8 +8,12 @@ import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/entity/tag.dart'; import 'package:nc_photos/entity/webdav_response_parser.dart'; import 'package:nc_photos/exception.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:xml/xml.dart'; +part 'data_source.g.dart'; + +@npLog class TagRemoteDataSource implements TagDataSource { const TagRemoteDataSource(); @@ -55,10 +59,9 @@ class TagRemoteDataSource implements TagDataSource { final xml = XmlDocument.parse(response.body); return WebdavResponseParser().parseTags(xml); } - - static final _log = Logger("entity.tag.data_source.TagRemoteDataSource"); } +@npLog class TagSqliteDbDataSource implements TagDataSource { const TagSqliteDbDataSource(this.sqliteDb); @@ -78,6 +81,4 @@ class TagSqliteDbDataSource implements TagDataSource { } final sql.SqliteDb sqliteDb; - - static final _log = Logger("entity.tag.data_source.TagSqliteDbDataSource"); } diff --git a/app/lib/entity/tag/data_source.g.dart b/app/lib/entity/tag/data_source.g.dart new file mode 100644 index 00000000..301c9c2d --- /dev/null +++ b/app/lib/entity/tag/data_source.g.dart @@ -0,0 +1,25 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logTagRemoteDataSource = + Logger("entity.tag.data_source.TagRemoteDataSource"); + +extension _$TagRemoteDataSourceNpLog on TagRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logTagRemoteDataSource; +} + +// ignore: non_constant_identifier_names +final _$logTagSqliteDbDataSource = + Logger("entity.tag.data_source.TagSqliteDbDataSource"); + +extension _$TagSqliteDbDataSourceNpLog on TagSqliteDbDataSource { + // ignore: unused_element + Logger get _log => _$logTagSqliteDbDataSource; +} diff --git a/app/lib/entity/tagged_file/data_source.dart b/app/lib/entity/tagged_file/data_source.dart index e66b82e3..5586a4ae 100644 --- a/app/lib/entity/tagged_file/data_source.dart +++ b/app/lib/entity/tagged_file/data_source.dart @@ -7,8 +7,12 @@ import 'package:nc_photos/entity/tagged_file.dart'; import 'package:nc_photos/entity/webdav_response_parser.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/iterable_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:xml/xml.dart'; +part 'data_source.g.dart'; + +@npLog class TaggedFileRemoteDataSource implements TaggedFileDataSource { const TaggedFileRemoteDataSource(); @@ -31,7 +35,4 @@ class TaggedFileRemoteDataSource implements TaggedFileDataSource { final xml = XmlDocument.parse(response.body); return WebdavResponseParser().parseTaggedFiles(xml); } - - static final _log = - Logger("entity.tagged_file.data_source.TaggedFileRemoteDataSource"); } diff --git a/app/lib/entity/tagged_file/data_source.g.dart b/app/lib/entity/tagged_file/data_source.g.dart new file mode 100644 index 00000000..dd493c0d --- /dev/null +++ b/app/lib/entity/tagged_file/data_source.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'data_source.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logTaggedFileRemoteDataSource = + Logger("entity.tagged_file.data_source.TaggedFileRemoteDataSource"); + +extension _$TaggedFileRemoteDataSourceNpLog on TaggedFileRemoteDataSource { + // ignore: unused_element + Logger get _log => _$logTaggedFileRemoteDataSource; +} diff --git a/app/lib/entity/webdav_response_parser.dart b/app/lib/entity/webdav_response_parser.dart index e63a274a..8655f4ef 100644 --- a/app/lib/entity/webdav_response_parser.dart +++ b/app/lib/entity/webdav_response_parser.dart @@ -10,8 +10,12 @@ import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/tag.dart'; import 'package:nc_photos/entity/tagged_file.dart'; import 'package:nc_photos/string_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:xml/xml.dart'; +part 'webdav_response_parser.g.dart'; + +@npLog class WebdavResponseParser { Future> parseFiles(XmlDocument xml) => compute(_parseFilesIsolate, xml); @@ -295,9 +299,6 @@ class WebdavResponseParser { } var _namespaces = {}; - - static final _log = - Logger("entity.webdav_response_parser.WebdavResponseParser"); } class _FilePropParser { diff --git a/app/lib/entity/webdav_response_parser.g.dart b/app/lib/entity/webdav_response_parser.g.dart new file mode 100644 index 00000000..8d634d87 --- /dev/null +++ b/app/lib/entity/webdav_response_parser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'webdav_response_parser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logWebdavResponseParser = + Logger("entity.webdav_response_parser.WebdavResponseParser"); + +extension _$WebdavResponseParserNpLog on WebdavResponseParser { + // ignore: unused_element + Logger get _log => _$logWebdavResponseParser; +} diff --git a/app/lib/event/native_event.dart b/app/lib/event/native_event.dart index 62031b0f..7854b214 100644 --- a/app/lib/event/native_event.dart +++ b/app/lib/event/native_event.dart @@ -42,7 +42,7 @@ class NativeEventListener { final void Function(T) listener; StreamSubscription? _subscription; - final _log = Logger("native_event.NativeEventListener<${T.runtimeType}>"); + final _log = Logger("event.native_event.NativeEventListener<${T.runtimeType}>"); } class FileExifUpdatedEvent { diff --git a/app/lib/legacy/app_password_exchange_bloc.dart b/app/lib/legacy/app_password_exchange_bloc.dart index b03f9e28..1ecaa8f1 100644 --- a/app/lib/legacy/app_password_exchange_bloc.dart +++ b/app/lib/legacy/app_password_exchange_bloc.dart @@ -6,6 +6,7 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/account.dart'; import 'package:nc_photos/api/api.dart'; import 'package:nc_photos/exception.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'app_password_exchange_bloc.g.dart'; @@ -54,6 +55,7 @@ class AppPasswordExchangeBlocFailure extends AppPasswordExchangeBlocState { } /// Legacy sign in support, may be removed any time in the future +@npLog class AppPasswordExchangeBloc extends Bloc { AppPasswordExchangeBloc() : super(const AppPasswordExchangeBlocInit()) { @@ -126,6 +128,5 @@ class AppPasswordExchangeBloc } } - static final _log = - Logger("legacy.app_password_exchange_bloc.AppPasswordExchangeBloc"); + static final _log = _$logAppPasswordExchangeBloc; } diff --git a/app/lib/legacy/app_password_exchange_bloc.g.dart b/app/lib/legacy/app_password_exchange_bloc.g.dart index a09ce287..28fc9de1 100644 --- a/app/lib/legacy/app_password_exchange_bloc.g.dart +++ b/app/lib/legacy/app_password_exchange_bloc.g.dart @@ -2,6 +2,19 @@ part of 'app_password_exchange_bloc.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAppPasswordExchangeBloc = + Logger("legacy.app_password_exchange_bloc.AppPasswordExchangeBloc"); + +extension _$AppPasswordExchangeBlocNpLog on AppPasswordExchangeBloc { + // ignore: unused_element + Logger get _log => _$logAppPasswordExchangeBloc; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/legacy/connect.dart b/app/lib/legacy/connect.dart index 00ecee02..1e330648 100644 --- a/app/lib/legacy/connect.dart +++ b/app/lib/legacy/connect.dart @@ -20,6 +20,9 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/string_extension.dart'; import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'connect.g.dart'; class ConnectArguments { ConnectArguments(this.account); @@ -52,6 +55,7 @@ class Connect extends StatefulWidget { final Account account; } +@npLog class _ConnectState extends State { @override initState() { @@ -241,8 +245,6 @@ class _ConnectState extends State { } final _bloc = AppPasswordExchangeBloc(); - - static final _log = Logger("widget.connect._ConnectState"); } class _WebDavUrlDialog extends StatefulWidget { diff --git a/app/lib/legacy/connect.g.dart b/app/lib/legacy/connect.g.dart new file mode 100644 index 00000000..0a1f1ff2 --- /dev/null +++ b/app/lib/legacy/connect.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'connect.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ConnectState = Logger("legacy.connect._ConnectState"); + +extension _$_ConnectStateNpLog on _ConnectState { + // ignore: unused_element + Logger get _log => _$log_ConnectState; +} diff --git a/app/lib/legacy/sign_in.dart b/app/lib/legacy/sign_in.dart index 5aa54819..7d4161d3 100644 --- a/app/lib/legacy/sign_in.dart +++ b/app/lib/legacy/sign_in.dart @@ -19,6 +19,9 @@ import 'package:nc_photos/theme.dart'; import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/widget/home.dart'; import 'package:nc_photos/widget/root_picker.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'sign_in.g.dart'; class SignIn extends StatefulWidget { static const routeName = "/sign-in-legacy"; @@ -31,6 +34,7 @@ class SignIn extends StatefulWidget { createState() => _SignInState(); } +@npLog class _SignInState extends State { @override build(BuildContext context) { @@ -324,8 +328,6 @@ class _SignInState extends State { var _isConnecting = false; final _formValue = _FormValue(); - - static final _log = Logger("widget.sign_in._SignInState"); } enum _Scheme { diff --git a/app/lib/legacy/sign_in.g.dart b/app/lib/legacy/sign_in.g.dart new file mode 100644 index 00000000..ca37f2ae --- /dev/null +++ b/app/lib/legacy/sign_in.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sign_in.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SignInState = Logger("legacy.sign_in._SignInState"); + +extension _$_SignInStateNpLog on _SignInState { + // ignore: unused_element + Logger get _log => _$log_SignInState; +} diff --git a/app/lib/main.dart b/app/lib/main.dart index 5a21441e..612cfe63 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -8,6 +8,9 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/app_init.dart' as app_init; import 'package:nc_photos/platform/k.dart' as platform_k; import 'package:nc_photos/widget/my_app.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'main.g.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -27,12 +30,11 @@ void main() async { ); } +@npLog class _BlocObserver extends BlocObserver { @override onChange(BlocBase bloc, Change change) { super.onChange(bloc, change); _log.finer("${bloc.runtimeType} $change"); } - - static final _log = Logger("main._BlocObserver"); } diff --git a/app/lib/main.g.dart b/app/lib/main.g.dart new file mode 100644 index 00000000..9aec442c --- /dev/null +++ b/app/lib/main.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'main.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_BlocObserver = Logger("main._BlocObserver"); + +extension _$_BlocObserverNpLog on _BlocObserver { + // ignore: unused_element + Logger get _log => _$log_BlocObserver; +} diff --git a/app/lib/metadata_task_manager.dart b/app/lib/metadata_task_manager.dart index 98e33e5a..a645fb27 100644 --- a/app/lib/metadata_task_manager.dart +++ b/app/lib/metadata_task_manager.dart @@ -11,11 +11,13 @@ import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/pref.dart'; import 'package:nc_photos/reverse_geocoder.dart'; import 'package:nc_photos/use_case/update_missing_metadata.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'metadata_task_manager.g.dart'; /// Task to update metadata for missing files +@npLog @ToString(ignorePrivate: true) class MetadataTask { MetadataTask(this._c, this.account, this.pref) : assert(require(_c)); @@ -73,11 +75,10 @@ class MetadataTask { final Account account; @ignore final AccountPref pref; - - static final _log = Logger("metadata_task_manager.MetadataTask"); } /// Manage metadata tasks to run concurrently +@npLog class MetadataTaskManager { factory MetadataTaskManager() { _inst ??= MetadataTaskManager._(); @@ -121,8 +122,6 @@ class MetadataTaskManager { AppEventListener( _onMetadataTaskStateChanged); - static final _log = Logger("metadata_task_manager.MetadataTaskManager"); - static MetadataTaskManager? _inst; } diff --git a/app/lib/metadata_task_manager.g.dart b/app/lib/metadata_task_manager.g.dart index 1d4fe0b6..3eaa56e0 100644 --- a/app/lib/metadata_task_manager.g.dart +++ b/app/lib/metadata_task_manager.g.dart @@ -2,6 +2,27 @@ part of 'metadata_task_manager.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logMetadataTask = Logger("metadata_task_manager.MetadataTask"); + +extension _$MetadataTaskNpLog on MetadataTask { + // ignore: unused_element + Logger get _log => _$logMetadataTask; +} + +// ignore: non_constant_identifier_names +final _$logMetadataTaskManager = + Logger("metadata_task_manager.MetadataTaskManager"); + +extension _$MetadataTaskManagerNpLog on MetadataTaskManager { + // ignore: unused_element + Logger get _log => _$logMetadataTaskManager; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/mobile/android/android_info.dart b/app/lib/mobile/android/android_info.dart index 48aa357a..040378bd 100644 --- a/app/lib/mobile/android/android_info.dart +++ b/app/lib/mobile/android/android_info.dart @@ -1,6 +1,7 @@ import 'package:device_info_plus/device_info_plus.dart'; import 'package:logging/logging.dart'; import 'package:memory_info/memory_info.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'android_info.g.dart'; @@ -9,6 +10,7 @@ part 'android_info.g.dart'; /// /// Only meaningful when running on Android. Must call [init] before accessing /// the data fields +@npLog @toString class AndroidInfo { factory AndroidInfo() => _inst; @@ -41,7 +43,7 @@ class AndroidInfo { final int sdkInt; final double totalMemMb; - static final _log = Logger("mobile.android.android_info.AndroidInfo"); + static final _log = _$logAndroidInfo; } abstract class AndroidVersion { diff --git a/app/lib/mobile/android/android_info.g.dart b/app/lib/mobile/android/android_info.g.dart index 56540cec..29e7646d 100644 --- a/app/lib/mobile/android/android_info.g.dart +++ b/app/lib/mobile/android/android_info.g.dart @@ -2,6 +2,18 @@ part of 'android_info.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAndroidInfo = Logger("mobile.android.android_info.AndroidInfo"); + +extension _$AndroidInfoNpLog on AndroidInfo { + // ignore: unused_element + Logger get _log => _$logAndroidInfo; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/mobile/download.dart b/app/lib/mobile/download.dart index d25fc30c..2621b6e3 100644 --- a/app/lib/mobile/download.dart +++ b/app/lib/mobile/download.dart @@ -7,9 +7,12 @@ import 'package:nc_photos/exception.dart'; import 'package:nc_photos/platform/download.dart' as itf; import 'package:nc_photos/platform/k.dart' as platform_k; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path_provider/path_provider.dart'; import 'package:uuid/uuid.dart'; +part 'download.g.dart'; + class DownloadBuilder extends itf.DownloadBuilder { @override build({ @@ -35,6 +38,7 @@ class DownloadBuilder extends itf.DownloadBuilder { } } +@npLog class _AndroidDownload extends itf.Download { _AndroidDownload({ required this.url, @@ -152,6 +156,4 @@ class _AndroidDownload extends itf.Download { bool shouldInterrupt = false; static bool _isInitialDownload = true; - - static final _log = Logger("mobile.download._AndroidDownload"); } diff --git a/app/lib/mobile/download.g.dart b/app/lib/mobile/download.g.dart new file mode 100644 index 00000000..31116dc0 --- /dev/null +++ b/app/lib/mobile/download.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'download.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_AndroidDownload = Logger("mobile.download._AndroidDownload"); + +extension _$_AndroidDownloadNpLog on _AndroidDownload { + // ignore: unused_element + Logger get _log => _$log_AndroidDownload; +} diff --git a/app/lib/mobile/notification.dart b/app/lib/mobile/notification.dart index 6b66ac82..77b2ec41 100644 --- a/app/lib/mobile/notification.dart +++ b/app/lib/mobile/notification.dart @@ -1,7 +1,11 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/platform/notification.dart' as itf; import 'package:nc_photos_plugin/nc_photos_plugin.dart' as plugin; +import 'package:np_codegen/np_codegen.dart'; +part 'notification.g.dart'; + +@npLog class NotificationManager implements itf.NotificationManager { @override notify(itf.Notification n) { @@ -27,8 +31,6 @@ class NotificationManager implements itf.NotificationManager { return; } } - - static final _log = Logger("mobile.notification.NotificationManager"); } class AndroidDownloadSuccessfulNotification implements itf.Notification { diff --git a/app/lib/mobile/notification.g.dart b/app/lib/mobile/notification.g.dart new file mode 100644 index 00000000..90a76c4d --- /dev/null +++ b/app/lib/mobile/notification.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'notification.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logNotificationManager = + Logger("mobile.notification.NotificationManager"); + +extension _$NotificationManagerNpLog on NotificationManager { + // ignore: unused_element + Logger get _log => _$logNotificationManager; +} diff --git a/app/lib/mobile/self_signed_cert_manager.dart b/app/lib/mobile/self_signed_cert_manager.dart index d9f5e321..04d163b2 100644 --- a/app/lib/mobile/self_signed_cert_manager.dart +++ b/app/lib/mobile/self_signed_cert_manager.dart @@ -5,10 +5,14 @@ import 'dart:typed_data'; import 'package:logging/logging.dart'; import 'package:nc_photos/mobile/android/self_signed_cert.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; import 'package:path_provider/path_provider.dart'; import 'package:uuid/uuid.dart'; +part 'self_signed_cert_manager.g.dart'; + +@npLog class SelfSignedCertManager { factory SelfSignedCertManager() => _inst; @@ -108,9 +112,6 @@ class SelfSignedCertManager { var _whitelist = <_CertInfo>[]; static final _inst = SelfSignedCertManager._(); - - static final _log = - Logger("mobile.self_signed_cert_manager.SelfSignedCertManager"); } // Modifications to this class must also reflect on Android side @@ -167,6 +168,7 @@ class _BadCertInfo { final int port; } +@npLog class _CustomHttpOverrides extends HttpOverrides { @override HttpClient createHttpClient(SecurityContext? context) { @@ -186,9 +188,6 @@ class _CustomHttpOverrides extends HttpOverrides { return false; }; } - - static final _log = - Logger("mobile.self_signed_cert_manager._CustomHttpOverrides"); } String _sha1BytesToString(Uint8List bytes) => diff --git a/app/lib/mobile/self_signed_cert_manager.g.dart b/app/lib/mobile/self_signed_cert_manager.g.dart new file mode 100644 index 00000000..e66ae5ef --- /dev/null +++ b/app/lib/mobile/self_signed_cert_manager.g.dart @@ -0,0 +1,25 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'self_signed_cert_manager.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSelfSignedCertManager = + Logger("mobile.self_signed_cert_manager.SelfSignedCertManager"); + +extension _$SelfSignedCertManagerNpLog on SelfSignedCertManager { + // ignore: unused_element + Logger get _log => _$logSelfSignedCertManager; +} + +// ignore: non_constant_identifier_names +final _$log_CustomHttpOverrides = + Logger("mobile.self_signed_cert_manager._CustomHttpOverrides"); + +extension _$_CustomHttpOverridesNpLog on _CustomHttpOverrides { + // ignore: unused_element + Logger get _log => _$log_CustomHttpOverrides; +} diff --git a/app/lib/pref.dart b/app/lib/pref.dart index 230aeac5..adb138aa 100644 --- a/app/lib/pref.dart +++ b/app/lib/pref.dart @@ -10,8 +10,12 @@ import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/mobile/platform.dart' if (dart.library.html) 'package:nc_photos/web/platform.dart' as platform; import 'package:nc_photos/use_case/compat/v34.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:shared_preferences/shared_preferences.dart'; +part 'pref.g.dart'; + +@npLog class Pref { factory Pref() { _inst ??= Pref.scoped(PrefMemoryProvider()); @@ -294,8 +298,6 @@ class Pref { final PrefProvider provider; static Pref? _inst; - - static final _log = Logger("pref.Pref"); } class AccountPref { diff --git a/app/lib/pref.g.dart b/app/lib/pref.g.dart new file mode 100644 index 00000000..cc00ddc1 --- /dev/null +++ b/app/lib/pref.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'pref.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logPref = Logger("pref.Pref"); + +extension _$PrefNpLog on Pref { + // ignore: unused_element + Logger get _log => _$logPref; +} diff --git a/app/lib/reverse_geocoder.dart b/app/lib/reverse_geocoder.dart index bf954387..5b7133b3 100644 --- a/app/lib/reverse_geocoder.dart +++ b/app/lib/reverse_geocoder.dart @@ -7,6 +7,7 @@ import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/math_util.dart' as math_util; import 'package:nc_photos/mobile/platform.dart' if (dart.library.html) 'package:nc_photos/web/platform.dart' as platform; +import 'package:np_codegen/np_codegen.dart'; import 'package:sqlite3/common.dart'; import 'package:to_string/to_string.dart'; @@ -28,6 +29,7 @@ class ReverseGeocoderLocation { final String? admin2; } +@npLog class ReverseGeocoder { Future init() async { final s = Stopwatch()..start(); @@ -105,8 +107,6 @@ class ReverseGeocoder { late final CommonDatabase _db; late final KDTree _searchTree; - - static final _log = Logger("reverse_geocoder.ReverseGeocoder"); } extension ReverseGeocoderExtension on ReverseGeocoderLocation { diff --git a/app/lib/reverse_geocoder.g.dart b/app/lib/reverse_geocoder.g.dart index 83ae49ef..34e77643 100644 --- a/app/lib/reverse_geocoder.g.dart +++ b/app/lib/reverse_geocoder.g.dart @@ -2,6 +2,18 @@ part of 'reverse_geocoder.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logReverseGeocoder = Logger("reverse_geocoder.ReverseGeocoder"); + +extension _$ReverseGeocoderNpLog on ReverseGeocoder { + // ignore: unused_element + Logger get _log => _$logReverseGeocoder; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/service.dart b/app/lib/service.dart index d6c4add9..a9eb5b28 100644 --- a/app/lib/service.dart +++ b/app/lib/service.dart @@ -23,10 +23,13 @@ import 'package:nc_photos/pref.dart'; import 'package:nc_photos/reverse_geocoder.dart'; import 'package:nc_photos/use_case/update_missing_metadata.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'service.g.dart'; /// Start the background service Future startService() async { - _log.info("[startService] Starting service"); + _C.log.info("[startService] Starting service"); final service = FlutterBackgroundService(); await service.configure( androidConfiguration: AndroidConfiguration( @@ -49,7 +52,7 @@ Future startService() async { /// Ask the background service to stop ASAP void stopService() { - _log.info("[stopService] Stopping service"); + _C.log.info("[stopService] Stopping service"); FlutterBackgroundService().sendData({ _dataKeyEvent: _eventStop, }); @@ -70,6 +73,7 @@ class ServiceConfig { } } +@npLog class _Service { Future call() async { final service = FlutterBackgroundService(); @@ -178,10 +182,10 @@ class _Service { bool? _isPaused; static final _shouldRun = ValueNotifier(true); - static final _log = Logger("service._Service"); } /// Access localized string out of the main isolate +@npLog class _L10n { factory _L10n() => _inst; @@ -219,10 +223,9 @@ class _L10n { static final _inst = _L10n._(); late AppLocalizations _l10n; - - static final _log = Logger("service._L10n"); } +@npLog class _MetadataTask { _MetadataTask(this.service, this.account, this.accountPref); @@ -328,8 +331,6 @@ class _MetadataTask { var _shouldRun = true; var _count = 0; var _processedIds = []; - - static final _log = Logger("service._MetadataTask"); } class _UpdateMissingMetadataConfigProvider @@ -342,10 +343,13 @@ class _UpdateMissingMetadataConfigProvider .notNull(); } +class _C { + // needed to work with generator logger + static final log = Logger("service"); +} + const _dataKeyEvent = "event"; const _eventStop = "stop"; const _servicePref = "service"; const _servicePrefProcessWifiOnly = "shouldProcessWifiOnly"; - -final _log = Logger("service"); diff --git a/app/lib/service.g.dart b/app/lib/service.g.dart new file mode 100644 index 00000000..3c9ef3e4 --- /dev/null +++ b/app/lib/service.g.dart @@ -0,0 +1,31 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'service.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_Service = Logger("service._Service"); + +extension _$_ServiceNpLog on _Service { + // ignore: unused_element + Logger get _log => _$log_Service; +} + +// ignore: non_constant_identifier_names +final _$log_L10n = Logger("service._L10n"); + +extension _$_L10nNpLog on _L10n { + // ignore: unused_element + Logger get _log => _$log_L10n; +} + +// ignore: non_constant_identifier_names +final _$log_MetadataTask = Logger("service._MetadataTask"); + +extension _$_MetadataTaskNpLog on _MetadataTask { + // ignore: unused_element + Logger get _log => _$log_MetadataTask; +} diff --git a/app/lib/share_handler.dart b/app/lib/share_handler.dart index 04c8f421..a517078a 100644 --- a/app/lib/share_handler.dart +++ b/app/lib/share_handler.dart @@ -34,9 +34,13 @@ import 'package:nc_photos/widget/share_link_multiple_files_dialog.dart'; import 'package:nc_photos/widget/share_method_dialog.dart'; import 'package:nc_photos/widget/simple_input_dialog.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:tuple/tuple.dart'; +part 'share_handler.g.dart'; + /// Handle sharing to other apps +@npLog class ShareHandler { ShareHandler( this._c, { @@ -347,6 +351,4 @@ class ShareHandler { final BuildContext context; final VoidCallback? clearSelection; var isSelectionCleared = false; - - static final _log = Logger("share_handler.ShareHandler"); } diff --git a/app/lib/share_handler.g.dart b/app/lib/share_handler.g.dart new file mode 100644 index 00000000..d9cede87 --- /dev/null +++ b/app/lib/share_handler.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'share_handler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logShareHandler = Logger("share_handler.ShareHandler"); + +extension _$ShareHandlerNpLog on ShareHandler { + // ignore: unused_element + Logger get _log => _$logShareHandler; +} diff --git a/app/lib/snack_bar_manager.dart b/app/lib/snack_bar_manager.dart index 8255294f..dabb1552 100644 --- a/app/lib/snack_bar_manager.dart +++ b/app/lib/snack_bar_manager.dart @@ -2,12 +2,16 @@ import 'dart:collection'; import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'snack_bar_manager.g.dart'; /// Showing snack bars /// /// This manager helps showing a snack bar even after the context was /// invalidated by having another widget (presumably top-level) to handle such /// request in a decoupled way +@npLog class SnackBarManager { factory SnackBarManager() => _inst; @@ -85,8 +89,6 @@ class SnackBarManager { _Item? _currentItem; static final _inst = SnackBarManager.scoped(); - - static final _log = Logger("snack_bar_manager.SnackBarManager"); } abstract class SnackBarHandler { diff --git a/app/lib/snack_bar_manager.g.dart b/app/lib/snack_bar_manager.g.dart new file mode 100644 index 00000000..4b2d8c82 --- /dev/null +++ b/app/lib/snack_bar_manager.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'snack_bar_manager.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSnackBarManager = Logger("snack_bar_manager.SnackBarManager"); + +extension _$SnackBarManagerNpLog on SnackBarManager { + // ignore: unused_element + Logger get _log => _$logSnackBarManager; +} diff --git a/app/lib/throttler.dart b/app/lib/throttler.dart index 46d5fb86..9aeb6779 100644 --- a/app/lib/throttler.dart +++ b/app/lib/throttler.dart @@ -3,12 +3,16 @@ import 'dart:math' as math; import 'package:logging/logging.dart'; import 'package:nc_photos/int_util.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'throttler.g.dart'; /// Throttle how many times an event could be triggered /// /// Events can be filtered by 2 ways: /// 1. Time passed after the last event /// 2. Number of events +@npLog class Throttler { Throttler({ required this.onTriggered, @@ -88,8 +92,6 @@ class Throttler { int _count = 0; int? _maxCount; var _data = []; - - static final _log = Logger("throttler.Throttler"); } Duration _minDuration(Duration a, Duration b) { diff --git a/app/lib/throttler.g.dart b/app/lib/throttler.g.dart new file mode 100644 index 00000000..0895cb92 --- /dev/null +++ b/app/lib/throttler.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'throttler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logThrottler = Logger("throttler.Throttler"); + +extension _$ThrottlerNpLog on Throttler { + // ignore: unused_element + Logger get _log => _$logThrottler; +} diff --git a/app/lib/touch_manager.dart b/app/lib/touch_manager.dart index 25c73480..bd6f10c8 100644 --- a/app/lib/touch_manager.dart +++ b/app/lib/touch_manager.dart @@ -13,14 +13,18 @@ import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; import 'package:nc_photos/use_case/put_file_binary.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; import 'package:uuid/uuid.dart'; +part 'touch_manager.g.dart'; + /// Manage touch events for files /// /// Touch events are used to broadcast file changes that don't trigger an ETag /// update to other devices. Such changes include custom properties like /// metadata +@npLog class TouchManager { TouchManager(this._c) : assert(require(_c)); @@ -186,8 +190,6 @@ class TouchManager { final DiContainer _c; final _throttlers = >{}; final _resultCache = >{}; - - static final _log = Logger("touch_token_manager.TouchManager"); } class _ThrottlerData { diff --git a/app/lib/touch_manager.g.dart b/app/lib/touch_manager.g.dart new file mode 100644 index 00000000..465402d7 --- /dev/null +++ b/app/lib/touch_manager.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'touch_manager.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logTouchManager = Logger("touch_manager.TouchManager"); + +extension _$TouchManagerNpLog on TouchManager { + // ignore: unused_element + Logger get _log => _$logTouchManager; +} diff --git a/app/lib/use_case/add_to_album.dart b/app/lib/use_case/add_to_album.dart index 8c6c204f..03fc7068 100644 --- a/app/lib/use_case/add_to_album.dart +++ b/app/lib/use_case/add_to_album.dart @@ -14,7 +14,11 @@ import 'package:nc_photos/use_case/list_share.dart'; import 'package:nc_photos/use_case/preprocess_album.dart'; import 'package:nc_photos/use_case/update_album.dart'; import 'package:nc_photos/use_case/update_album_with_actual_items.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'add_to_album.g.dart'; + +@npLog class AddToAlbum { AddToAlbum(this._c) : assert(require(_c)), @@ -110,8 +114,6 @@ class AddToAlbum { } final DiContainer _c; - - static final _log = Logger("use_case.add_to_album.AddToAlbum"); } bool _isItemFileEqual(AlbumItem a, AlbumItem b) { diff --git a/app/lib/use_case/add_to_album.g.dart b/app/lib/use_case/add_to_album.g.dart new file mode 100644 index 00000000..2de141de --- /dev/null +++ b/app/lib/use_case/add_to_album.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'add_to_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAddToAlbum = Logger("use_case.add_to_album.AddToAlbum"); + +extension _$AddToAlbumNpLog on AddToAlbum { + // ignore: unused_element + Logger get _log => _$logAddToAlbum; +} diff --git a/app/lib/use_case/cache_favorite.dart b/app/lib/use_case/cache_favorite.dart index e50808e5..1b15aee0 100644 --- a/app/lib/use_case/cache_favorite.dart +++ b/app/lib/use_case/cache_favorite.dart @@ -11,7 +11,11 @@ import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/list_util.dart' as list_util; import 'package:nc_photos/object_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'cache_favorite.g.dart'; + +@npLog class CacheFavorite { CacheFavorite(this._c) : assert(require(_c)); @@ -101,8 +105,6 @@ class CacheFavorite { } final DiContainer _c; - - static final _log = Logger("use_case.cache_favorite.CacheFavorite"); } class _FileRowIdWithFileId { diff --git a/app/lib/use_case/cache_favorite.g.dart b/app/lib/use_case/cache_favorite.g.dart new file mode 100644 index 00000000..4152cca0 --- /dev/null +++ b/app/lib/use_case/cache_favorite.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'cache_favorite.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logCacheFavorite = Logger("use_case.cache_favorite.CacheFavorite"); + +extension _$CacheFavoriteNpLog on CacheFavorite { + // ignore: unused_element + Logger get _log => _$logCacheFavorite; +} diff --git a/app/lib/use_case/compat/v15.dart b/app/lib/use_case/compat/v15.dart index 355c5bc6..a536afe9 100644 --- a/app/lib/use_case/compat/v15.dart +++ b/app/lib/use_case/compat/v15.dart @@ -7,6 +7,9 @@ import 'package:nc_photos/exception.dart'; import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/use_case/create_dir.dart'; import 'package:nc_photos/use_case/ls.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'v15.g.dart'; /// Compatibility helper for v15 class CompatV15 { @@ -20,6 +23,7 @@ class CompatV15 { } } +@npLog class _MigrateAlbumFiles { _MigrateAlbumFiles(this.fileRepo); @@ -76,6 +80,4 @@ class _MigrateAlbumFiles { "${api_util.getWebdavRootUrlRelative(account)}/.com.nkming.nc_photos"; final FileRepo fileRepo; - - static final _log = Logger("use_case.compat.v15._MigrateAlbumFiles"); } diff --git a/app/lib/use_case/compat/v15.g.dart b/app/lib/use_case/compat/v15.g.dart new file mode 100644 index 00000000..fc2b5b34 --- /dev/null +++ b/app/lib/use_case/compat/v15.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'v15.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_MigrateAlbumFiles = + Logger("use_case.compat.v15._MigrateAlbumFiles"); + +extension _$_MigrateAlbumFilesNpLog on _MigrateAlbumFiles { + // ignore: unused_element + Logger get _log => _$log_MigrateAlbumFiles; +} diff --git a/app/lib/use_case/compat/v25.dart b/app/lib/use_case/compat/v25.dart index 179d3c9e..60fe82ce 100644 --- a/app/lib/use_case/compat/v25.dart +++ b/app/lib/use_case/compat/v25.dart @@ -3,8 +3,11 @@ import 'package:nc_photos/account.dart'; import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/use_case/move.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; +part 'v25.g.dart'; + /// Compatibility helper for v25 class CompatV25 { /// Return whether the album file need to be migrated to the new naming scheme @@ -17,6 +20,7 @@ class CompatV25 { _MigrateAlbumFile(c)(account, albumFile); } +@npLog class _MigrateAlbumFile { _MigrateAlbumFile(this._c) : assert(require(_c)), @@ -37,6 +41,4 @@ class _MigrateAlbumFile { } final DiContainer _c; - - static final _log = Logger("use_case.compat.v25._MigrateAlbumFile"); } diff --git a/app/lib/use_case/compat/v25.g.dart b/app/lib/use_case/compat/v25.g.dart new file mode 100644 index 00000000..af85936c --- /dev/null +++ b/app/lib/use_case/compat/v25.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'v25.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_MigrateAlbumFile = Logger("use_case.compat.v25._MigrateAlbumFile"); + +extension _$_MigrateAlbumFileNpLog on _MigrateAlbumFile { + // ignore: unused_element + Logger get _log => _$log_MigrateAlbumFile; +} diff --git a/app/lib/use_case/compat/v32.dart b/app/lib/use_case/compat/v32.dart index 43f984ea..d71d2295 100644 --- a/app/lib/use_case/compat/v32.dart +++ b/app/lib/use_case/compat/v32.dart @@ -3,9 +3,13 @@ import 'dart:convert'; import 'package:logging/logging.dart'; import 'package:nc_photos/entity/exif.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:shared_preferences/shared_preferences.dart'; +part 'v32.g.dart'; + /// Compatibility helper for v32 +@npLog class CompatV32 { static Future isPrefNeedMigration() async { final pref = await SharedPreferences.getInstance(); @@ -49,5 +53,5 @@ class CompatV32 { return Exif(newData); } - static final _log = Logger("use_case.compat.v32.CompatV32"); + static final _log = _$logCompatV32; } diff --git a/app/lib/use_case/compat/v32.g.dart b/app/lib/use_case/compat/v32.g.dart new file mode 100644 index 00000000..2a5d1079 --- /dev/null +++ b/app/lib/use_case/compat/v32.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'v32.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logCompatV32 = Logger("use_case.compat.v32.CompatV32"); + +extension _$CompatV32NpLog on CompatV32 { + // ignore: unused_element + Logger get _log => _$logCompatV32; +} diff --git a/app/lib/use_case/compat/v34.dart b/app/lib/use_case/compat/v34.dart index 07f5eb80..ca435811 100644 --- a/app/lib/use_case/compat/v34.dart +++ b/app/lib/use_case/compat/v34.dart @@ -4,9 +4,13 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/account.dart'; import 'package:nc_photos/platform/universal_storage.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:shared_preferences/shared_preferences.dart'; +part 'v34.g.dart'; + /// Compatibility helper for v34 +@npLog class CompatV34 { static Future isPrefNeedMigration() async { final pref = await SharedPreferences.getInstance(); @@ -71,5 +75,5 @@ class CompatV34 { } } - static final _log = Logger("use_case.compat.v34.CompatV34"); + static final _log = _$logCompatV34; } diff --git a/app/lib/use_case/compat/v34.g.dart b/app/lib/use_case/compat/v34.g.dart new file mode 100644 index 00000000..521dd00a --- /dev/null +++ b/app/lib/use_case/compat/v34.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'v34.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logCompatV34 = Logger("use_case.compat.v34.CompatV34"); + +extension _$CompatV34NpLog on CompatV34 { + // ignore: unused_element + Logger get _log => _$logCompatV34; +} diff --git a/app/lib/use_case/compat/v46.dart b/app/lib/use_case/compat/v46.dart index 29904a64..4aaf57ca 100644 --- a/app/lib/use_case/compat/v46.dart +++ b/app/lib/use_case/compat/v46.dart @@ -2,7 +2,11 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/entity/sqlite_table.dart' as sql; import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/pref.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'v46.g.dart'; + +@npLog class CompatV46 { static Future insertDbAccounts(Pref pref, sql.SqliteDb sqliteDb) async { _log.info("[insertDbAccounts] Insert current accounts to Sqlite database"); @@ -15,5 +19,5 @@ class CompatV46 { }); } - static final _log = Logger("use_case.compat.v46.CompatV46"); + static final _log = _$logCompatV46; } diff --git a/app/lib/use_case/compat/v46.g.dart b/app/lib/use_case/compat/v46.g.dart new file mode 100644 index 00000000..c32764ff --- /dev/null +++ b/app/lib/use_case/compat/v46.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'v46.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logCompatV46 = Logger("use_case.compat.v46.CompatV46"); + +extension _$CompatV46NpLog on CompatV46 { + // ignore: unused_element + Logger get _log => _$logCompatV46; +} diff --git a/app/lib/use_case/compat/v55.dart b/app/lib/use_case/compat/v55.dart index 9451dd7a..209f4eff 100644 --- a/app/lib/use_case/compat/v55.dart +++ b/app/lib/use_case/compat/v55.dart @@ -5,8 +5,12 @@ import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/entity/sqlite_table.dart' as sql; import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/iterable_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:tuple/tuple.dart'; +part 'v55.g.dart'; + +@npLog class CompatV55 { static Future migrateDb( sql.SqliteDb db, { @@ -93,5 +97,5 @@ class CompatV55 { }); } - static final _log = Logger("use_case.compat.v55.CompatV55"); + static final _log = _$logCompatV55; } diff --git a/app/lib/use_case/compat/v55.g.dart b/app/lib/use_case/compat/v55.g.dart new file mode 100644 index 00000000..a2e3774e --- /dev/null +++ b/app/lib/use_case/compat/v55.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'v55.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logCompatV55 = Logger("use_case.compat.v55.CompatV55"); + +extension _$CompatV55NpLog on CompatV55 { + // ignore: unused_element + Logger get _log => _$logCompatV55; +} diff --git a/app/lib/use_case/copy.dart b/app/lib/use_case/copy.dart index 1b9c60b0..760affab 100644 --- a/app/lib/use_case/copy.dart +++ b/app/lib/use_case/copy.dart @@ -4,8 +4,12 @@ import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/use_case/create_dir.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; +part 'copy.g.dart'; + +@npLog class Copy { Copy(this.fileRepo); @@ -79,6 +83,4 @@ class Copy { } final FileRepo fileRepo; - - static final _log = Logger("use_case.copy.Copy"); } diff --git a/app/lib/use_case/copy.g.dart b/app/lib/use_case/copy.g.dart new file mode 100644 index 00000000..d61791d2 --- /dev/null +++ b/app/lib/use_case/copy.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'copy.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logCopy = Logger("use_case.copy.Copy"); + +extension _$CopyNpLog on Copy { + // ignore: unused_element + Logger get _log => _$logCopy; +} diff --git a/app/lib/use_case/delete_local.dart b/app/lib/use_case/delete_local.dart index 82e10267..077740ce 100644 --- a/app/lib/use_case/delete_local.dart +++ b/app/lib/use_case/delete_local.dart @@ -4,7 +4,11 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/local_file.dart'; import 'package:nc_photos/event/event.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'delete_local.g.dart'; + +@npLog class DeleteLocal { DeleteLocal(this._c) : assert(require(_c)); @@ -27,6 +31,4 @@ class DeleteLocal { } final DiContainer _c; - - static final _log = Logger("use_case.delete_local.DeleteLocal"); } diff --git a/app/lib/use_case/delete_local.g.dart b/app/lib/use_case/delete_local.g.dart new file mode 100644 index 00000000..5b14c0fd --- /dev/null +++ b/app/lib/use_case/delete_local.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'delete_local.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logDeleteLocal = Logger("use_case.delete_local.DeleteLocal"); + +extension _$DeleteLocalNpLog on DeleteLocal { + // ignore: unused_element + Logger get _log => _$logDeleteLocal; +} diff --git a/app/lib/use_case/find_file.dart b/app/lib/use_case/find_file.dart index eca16279..3adf4a8d 100644 --- a/app/lib/use_case/find_file.dart +++ b/app/lib/use_case/find_file.dart @@ -4,7 +4,11 @@ import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/iterable_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'find_file.g.dart'; + +@npLog class FindFile { FindFile(this._c) : assert(require(_c)); @@ -47,6 +51,4 @@ class FindFile { } final DiContainer _c; - - static final _log = Logger("use_case.find_file.FindFile"); } diff --git a/app/lib/use_case/find_file.g.dart b/app/lib/use_case/find_file.g.dart new file mode 100644 index 00000000..017ccafc --- /dev/null +++ b/app/lib/use_case/find_file.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'find_file.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logFindFile = Logger("use_case.find_file.FindFile"); + +extension _$FindFileNpLog on FindFile { + // ignore: unused_element + Logger get _log => _$logFindFile; +} diff --git a/app/lib/use_case/import_potential_shared_album.dart b/app/lib/use_case/import_potential_shared_album.dart index 40c2101e..f6917973 100644 --- a/app/lib/use_case/import_potential_shared_album.dart +++ b/app/lib/use_case/import_potential_shared_album.dart @@ -7,8 +7,12 @@ import 'package:nc_photos/pref.dart'; import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/use_case/list_potential_shared_album.dart'; import 'package:nc_photos/use_case/move.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'import_potential_shared_album.g.dart'; /// Import new shared albums to the pending dir +@npLog class ImportPotentialSharedAlbum { ImportPotentialSharedAlbum(this._c) : assert(require(_c)), @@ -44,7 +48,4 @@ class ImportPotentialSharedAlbum { } final DiContainer _c; - - static final _log = Logger( - "user_case.import_potential_shared_album.ImportPotentialSharedAlbum"); } diff --git a/app/lib/use_case/import_potential_shared_album.g.dart b/app/lib/use_case/import_potential_shared_album.g.dart new file mode 100644 index 00000000..9ea6b497 --- /dev/null +++ b/app/lib/use_case/import_potential_shared_album.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'import_potential_shared_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logImportPotentialSharedAlbum = + Logger("use_case.import_potential_shared_album.ImportPotentialSharedAlbum"); + +extension _$ImportPotentialSharedAlbumNpLog on ImportPotentialSharedAlbum { + // ignore: unused_element + Logger get _log => _$logImportPotentialSharedAlbum; +} diff --git a/app/lib/use_case/list_favorite.dart b/app/lib/use_case/list_favorite.dart index f0c88e71..7dba4612 100644 --- a/app/lib/use_case/list_favorite.dart +++ b/app/lib/use_case/list_favorite.dart @@ -5,7 +5,11 @@ import 'package:nc_photos/entity/favorite.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/use_case/find_file.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'list_favorite.g.dart'; + +@npLog class ListFavorite { ListFavorite(this._c) : assert(require(_c)), @@ -36,6 +40,4 @@ class ListFavorite { } final DiContainer _c; - - static final _log = Logger("use_case.list_favorite.ListFavorite"); } diff --git a/app/lib/use_case/list_favorite.g.dart b/app/lib/use_case/list_favorite.g.dart new file mode 100644 index 00000000..ea355781 --- /dev/null +++ b/app/lib/use_case/list_favorite.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'list_favorite.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListFavorite = Logger("use_case.list_favorite.ListFavorite"); + +extension _$ListFavoriteNpLog on ListFavorite { + // ignore: unused_element + Logger get _log => _$logListFavorite; +} diff --git a/app/lib/use_case/list_location_group.dart b/app/lib/use_case/list_location_group.dart index dcb1c011..eba8d182 100644 --- a/app/lib/use_case/list_location_group.dart +++ b/app/lib/use_case/list_location_group.dart @@ -6,6 +6,7 @@ import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/sqlite_table.dart' as sql; import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/location_util.dart' as location_util; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'list_location_group.g.dart'; @@ -56,6 +57,7 @@ class LocationGroupResult with EquatableMixin { final List countryCode; } +@npLog class ListLocationGroup { ListLocationGroup(this._c) : assert(require(_c)); @@ -225,6 +227,4 @@ class ListLocationGroup { } final DiContainer _c; - - static final _log = Logger("use_case.list_location_group.ListLocationGroup"); } diff --git a/app/lib/use_case/list_location_group.g.dart b/app/lib/use_case/list_location_group.g.dart index 547f6a92..92d754a9 100644 --- a/app/lib/use_case/list_location_group.g.dart +++ b/app/lib/use_case/list_location_group.g.dart @@ -2,6 +2,19 @@ part of 'list_location_group.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListLocationGroup = + Logger("use_case.list_location_group.ListLocationGroup"); + +extension _$ListLocationGroupNpLog on ListLocationGroup { + // ignore: unused_element + Logger get _log => _$logListLocationGroup; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/use_case/list_potential_shared_album.dart b/app/lib/use_case/list_potential_shared_album.dart index 583e317d..35da903c 100644 --- a/app/lib/use_case/list_potential_shared_album.dart +++ b/app/lib/use_case/list_potential_shared_album.dart @@ -5,10 +5,14 @@ import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/pref.dart'; import 'package:nc_photos/use_case/ls.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'list_potential_shared_album.g.dart'; /// List all shared files that are potentially albums /// /// Beware that it's NOT guaranteed that they are actually albums +@npLog class ListPotentialSharedAlbum { ListPotentialSharedAlbum(this.fileRepo); @@ -59,7 +63,4 @@ class ListPotentialSharedAlbum { final FileRepo fileRepo; final _regex = RegExp(r"^([0-9a-fA-F]+)-([0-9a-fA-F]+)\.nc_album\.json$"); - - static final _log = - Logger("user_case.list_potential_shared_album.ListPotentialSharedAlbum"); } diff --git a/app/lib/use_case/list_potential_shared_album.g.dart b/app/lib/use_case/list_potential_shared_album.g.dart new file mode 100644 index 00000000..5c59b41f --- /dev/null +++ b/app/lib/use_case/list_potential_shared_album.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'list_potential_shared_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListPotentialSharedAlbum = + Logger("use_case.list_potential_shared_album.ListPotentialSharedAlbum"); + +extension _$ListPotentialSharedAlbumNpLog on ListPotentialSharedAlbum { + // ignore: unused_element + Logger get _log => _$logListPotentialSharedAlbum; +} diff --git a/app/lib/use_case/list_share.dart b/app/lib/use_case/list_share.dart index 896208ff..20ffc049 100644 --- a/app/lib/use_case/list_share.dart +++ b/app/lib/use_case/list_share.dart @@ -6,8 +6,12 @@ import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/entity/share.dart'; import 'package:nc_photos/use_case/find_file.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'list_share.g.dart'; /// List all shares from a given file +@npLog class ListShare { ListShare(this._c) : assert(require(_c)), @@ -36,6 +40,4 @@ class ListShare { } final DiContainer _c; - - static final _log = Logger("use_case.list_share.ListShare"); } diff --git a/app/lib/use_case/list_share.g.dart b/app/lib/use_case/list_share.g.dart new file mode 100644 index 00000000..bead57ea --- /dev/null +++ b/app/lib/use_case/list_share.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'list_share.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListShare = Logger("use_case.list_share.ListShare"); + +extension _$ListShareNpLog on ListShare { + // ignore: unused_element + Logger get _log => _$logListShare; +} diff --git a/app/lib/use_case/list_tagged_file.dart b/app/lib/use_case/list_tagged_file.dart index 2e000a24..0bb5480f 100644 --- a/app/lib/use_case/list_tagged_file.dart +++ b/app/lib/use_case/list_tagged_file.dart @@ -6,7 +6,11 @@ import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/entity/tag.dart'; import 'package:nc_photos/entity/tagged_file.dart'; import 'package:nc_photos/use_case/find_file.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'list_tagged_file.g.dart'; + +@npLog class ListTaggedFile { ListTaggedFile(this._c) : assert(require(_c)), @@ -34,6 +38,4 @@ class ListTaggedFile { } final DiContainer _c; - - static final _log = Logger("use_case.list_tagged_file.ListTaggedFile"); } diff --git a/app/lib/use_case/list_tagged_file.g.dart b/app/lib/use_case/list_tagged_file.g.dart new file mode 100644 index 00000000..5edf347a --- /dev/null +++ b/app/lib/use_case/list_tagged_file.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'list_tagged_file.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logListTaggedFile = Logger("use_case.list_tagged_file.ListTaggedFile"); + +extension _$ListTaggedFileNpLog on ListTaggedFile { + // ignore: unused_element + Logger get _log => _$logListTaggedFile; +} diff --git a/app/lib/use_case/load_metadata.dart b/app/lib/use_case/load_metadata.dart index f9a2cefb..0138c2ce 100644 --- a/app/lib/use_case/load_metadata.dart +++ b/app/lib/use_case/load_metadata.dart @@ -13,7 +13,11 @@ import 'package:nc_photos/entity/file.dart' as app; import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/file_extension.dart'; import 'package:nc_photos/image_size_getter_util.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'load_metadata.g.dart'; + +@npLog class LoadMetadata { /// Load metadata of [binary], which is the content of [file] Future loadRemote( @@ -119,6 +123,4 @@ class LoadMetadata { exif: exif, ); } - - static final _log = Logger("use_case.load_metadata.LoadMetadata"); } diff --git a/app/lib/use_case/load_metadata.g.dart b/app/lib/use_case/load_metadata.g.dart new file mode 100644 index 00000000..a6acd8a0 --- /dev/null +++ b/app/lib/use_case/load_metadata.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'load_metadata.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logLoadMetadata = Logger("use_case.load_metadata.LoadMetadata"); + +extension _$LoadMetadataNpLog on LoadMetadata { + // ignore: unused_element + Logger get _log => _$logLoadMetadata; +} diff --git a/app/lib/use_case/move.dart b/app/lib/use_case/move.dart index a4838614..556f2419 100644 --- a/app/lib/use_case/move.dart +++ b/app/lib/use_case/move.dart @@ -8,8 +8,12 @@ import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/use_case/create_dir.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; +part 'move.g.dart'; + +@npLog class Move { Move(this._c) : assert(require(_c)); @@ -89,6 +93,4 @@ class Move { } final DiContainer _c; - - static final _log = Logger("use_case.move.Move"); } diff --git a/app/lib/use_case/move.g.dart b/app/lib/use_case/move.g.dart new file mode 100644 index 00000000..58cc42ba --- /dev/null +++ b/app/lib/use_case/move.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'move.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logMove = Logger("use_case.move.Move"); + +extension _$MoveNpLog on Move { + // ignore: unused_element + Logger get _log => _$logMove; +} diff --git a/app/lib/use_case/populate_album.dart b/app/lib/use_case/populate_album.dart index e8707b1a..0815f79e 100644 --- a/app/lib/use_case/populate_album.dart +++ b/app/lib/use_case/populate_album.dart @@ -12,7 +12,11 @@ import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/exception_event.dart'; import 'package:nc_photos/use_case/list_tagged_file.dart'; import 'package:nc_photos/use_case/scan_dir.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'populate_album.g.dart'; + +@npLog class PopulateAlbum { PopulateAlbum(this._c) : assert(require(_c)); @@ -96,6 +100,4 @@ class PopulateAlbum { } final DiContainer _c; - - static final _log = Logger("use_case.populate_album.PopulateAlbum"); } diff --git a/app/lib/use_case/populate_album.g.dart b/app/lib/use_case/populate_album.g.dart new file mode 100644 index 00000000..1984419d --- /dev/null +++ b/app/lib/use_case/populate_album.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'populate_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logPopulateAlbum = Logger("use_case.populate_album.PopulateAlbum"); + +extension _$PopulateAlbumNpLog on PopulateAlbum { + // ignore: unused_element + Logger get _log => _$logPopulateAlbum; +} diff --git a/app/lib/use_case/populate_person.dart b/app/lib/use_case/populate_person.dart index 1d1aeca1..82b1edca 100644 --- a/app/lib/use_case/populate_person.dart +++ b/app/lib/use_case/populate_person.dart @@ -5,7 +5,11 @@ import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/face.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; +import 'package:np_codegen/np_codegen.dart'; +part 'populate_person.g.dart'; + +@npLog class PopulatePerson { PopulatePerson(this._c) : assert(require(_c)); @@ -33,6 +37,4 @@ class PopulatePerson { } final DiContainer _c; - - static final _log = Logger("use_case.populate_person.PopulatePerson"); } diff --git a/app/lib/use_case/populate_person.g.dart b/app/lib/use_case/populate_person.g.dart new file mode 100644 index 00000000..ff00e038 --- /dev/null +++ b/app/lib/use_case/populate_person.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'populate_person.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logPopulatePerson = Logger("use_case.populate_person.PopulatePerson"); + +extension _$PopulatePersonNpLog on PopulatePerson { + // ignore: unused_element + Logger get _log => _$logPopulatePerson; +} diff --git a/app/lib/use_case/put_file_binary.dart b/app/lib/use_case/put_file_binary.dart index 24cef12c..e1e4298f 100644 --- a/app/lib/use_case/put_file_binary.dart +++ b/app/lib/use_case/put_file_binary.dart @@ -5,8 +5,12 @@ import 'package:nc_photos/account.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/use_case/create_dir.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; +part 'put_file_binary.g.dart'; + +@npLog class PutFileBinary { PutFileBinary(this.fileRepo); @@ -34,6 +38,4 @@ class PutFileBinary { } final FileRepo fileRepo; - - static final _log = Logger("use_case.put_file_binary.PutFileBinary"); } diff --git a/app/lib/use_case/put_file_binary.g.dart b/app/lib/use_case/put_file_binary.g.dart new file mode 100644 index 00000000..9832dda7 --- /dev/null +++ b/app/lib/use_case/put_file_binary.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'put_file_binary.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logPutFileBinary = Logger("use_case.put_file_binary.PutFileBinary"); + +extension _$PutFileBinaryNpLog on PutFileBinary { + // ignore: unused_element + Logger get _log => _$logPutFileBinary; +} diff --git a/app/lib/use_case/remove.dart b/app/lib/use_case/remove.dart index 0c0b55fd..afc7249a 100644 --- a/app/lib/use_case/remove.dart +++ b/app/lib/use_case/remove.dart @@ -17,7 +17,11 @@ import 'package:nc_photos/use_case/list_album.dart'; import 'package:nc_photos/use_case/list_share.dart'; import 'package:nc_photos/use_case/remove_from_album.dart'; import 'package:nc_photos/use_case/remove_share.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'remove.g.dart'; + +@npLog class Remove { Remove(this._c) : assert(require(_c)), @@ -110,6 +114,4 @@ class Remove { } final DiContainer _c; - - static final _log = Logger("use_case.remove.Remove"); } diff --git a/app/lib/use_case/remove.g.dart b/app/lib/use_case/remove.g.dart new file mode 100644 index 00000000..329ac6a6 --- /dev/null +++ b/app/lib/use_case/remove.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'remove.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logRemove = Logger("use_case.remove.Remove"); + +extension _$RemoveNpLog on Remove { + // ignore: unused_element + Logger get _log => _$logRemove; +} diff --git a/app/lib/use_case/remove_album.dart b/app/lib/use_case/remove_album.dart index 16d57c26..46f07573 100644 --- a/app/lib/use_case/remove_album.dart +++ b/app/lib/use_case/remove_album.dart @@ -11,7 +11,11 @@ import 'package:nc_photos/use_case/remove.dart'; import 'package:nc_photos/use_case/remove_share.dart'; import 'package:nc_photos/use_case/unshare_file_from_album.dart'; import 'package:nc_photos/use_case/update_album.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'remove_album.g.dart'; + +@npLog class RemoveAlbum { RemoveAlbum(this._c) : assert(require(_c)), @@ -87,6 +91,4 @@ class RemoveAlbum { } final DiContainer _c; - - static final _log = Logger("use_case.remove_album.RemoveAlbum"); } diff --git a/app/lib/use_case/remove_album.g.dart b/app/lib/use_case/remove_album.g.dart new file mode 100644 index 00000000..dc78d204 --- /dev/null +++ b/app/lib/use_case/remove_album.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'remove_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logRemoveAlbum = Logger("use_case.remove_album.RemoveAlbum"); + +extension _$RemoveAlbumNpLog on RemoveAlbum { + // ignore: unused_element + Logger get _log => _$logRemoveAlbum; +} diff --git a/app/lib/use_case/remove_from_album.dart b/app/lib/use_case/remove_from_album.dart index 7c2ef42b..55e0cec2 100644 --- a/app/lib/use_case/remove_from_album.dart +++ b/app/lib/use_case/remove_from_album.dart @@ -12,7 +12,11 @@ import 'package:nc_photos/use_case/preprocess_album.dart'; import 'package:nc_photos/use_case/unshare_file_from_album.dart'; import 'package:nc_photos/use_case/update_album.dart'; import 'package:nc_photos/use_case/update_album_with_actual_items.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'remove_from_album.g.dart'; + +@npLog class RemoveFromAlbum { RemoveFromAlbum(this._c) : assert(require(_c)), @@ -113,6 +117,4 @@ class RemoveFromAlbum { } final DiContainer _c; - - static final _log = Logger("use_case.remove_from_album.RemoveFromAlbum"); } diff --git a/app/lib/use_case/remove_from_album.g.dart b/app/lib/use_case/remove_from_album.g.dart new file mode 100644 index 00000000..134253fc --- /dev/null +++ b/app/lib/use_case/remove_from_album.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'remove_from_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logRemoveFromAlbum = + Logger("use_case.remove_from_album.RemoveFromAlbum"); + +extension _$RemoveFromAlbumNpLog on RemoveFromAlbum { + // ignore: unused_element + Logger get _log => _$logRemoveFromAlbum; +} diff --git a/app/lib/use_case/request_public_link.dart b/app/lib/use_case/request_public_link.dart index 7b41def2..ebcc83aa 100644 --- a/app/lib/use_case/request_public_link.dart +++ b/app/lib/use_case/request_public_link.dart @@ -6,7 +6,11 @@ import 'package:nc_photos/api/api.dart'; import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/type.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'request_public_link.g.dart'; + +@npLog class RequestPublicLink { /// Request a temporary unique public link to [file] Future call(Account account, FileDescriptor file) async { @@ -30,6 +34,4 @@ class RequestPublicLink { } return json["data"]["url"]; } - - static final _log = Logger("use_case.request_public_link.RequestPublicLink"); } diff --git a/app/lib/use_case/request_public_link.g.dart b/app/lib/use_case/request_public_link.g.dart new file mode 100644 index 00000000..181d3bdb --- /dev/null +++ b/app/lib/use_case/request_public_link.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'request_public_link.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logRequestPublicLink = + Logger("use_case.request_public_link.RequestPublicLink"); + +extension _$RequestPublicLinkNpLog on RequestPublicLink { + // ignore: unused_element + Logger get _log => _$logRequestPublicLink; +} diff --git a/app/lib/use_case/resync_album.dart b/app/lib/use_case/resync_album.dart index 9c20ef01..ad9a5a63 100644 --- a/app/lib/use_case/resync_album.dart +++ b/app/lib/use_case/resync_album.dart @@ -7,8 +7,12 @@ import 'package:nc_photos/entity/album.dart'; import 'package:nc_photos/entity/album/item.dart'; import 'package:nc_photos/entity/album/provider.dart'; import 'package:nc_photos/use_case/find_file.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'resync_album.g.dart'; /// Resync files inside an album with the file db +@npLog class ResyncAlbum { ResyncAlbum(this._c) : assert(require(_c)), @@ -62,6 +66,4 @@ class ResyncAlbum { } final DiContainer _c; - - static final _log = Logger("use_case.resync_album.ResyncAlbum"); } diff --git a/app/lib/use_case/resync_album.g.dart b/app/lib/use_case/resync_album.g.dart new file mode 100644 index 00000000..8c18bbea --- /dev/null +++ b/app/lib/use_case/resync_album.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'resync_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logResyncAlbum = Logger("use_case.resync_album.ResyncAlbum"); + +extension _$ResyncAlbumNpLog on ResyncAlbum { + // ignore: unused_element + Logger get _log => _$logResyncAlbum; +} diff --git a/app/lib/use_case/scan_dir.dart b/app/lib/use_case/scan_dir.dart index eb8c5137..6ad2fd0c 100644 --- a/app/lib/use_case/scan_dir.dart +++ b/app/lib/use_case/scan_dir.dart @@ -7,7 +7,11 @@ import 'package:nc_photos/exception.dart'; import 'package:nc_photos/exception_event.dart'; import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/use_case/ls.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'scan_dir.g.dart'; + +@npLog class ScanDir { ScanDir(this.fileRepo); @@ -38,6 +42,4 @@ class ScanDir { } final FileRepo fileRepo; - - static final _log = Logger("use_case.scan_dir.ScanDir"); } diff --git a/app/lib/use_case/scan_dir.g.dart b/app/lib/use_case/scan_dir.g.dart new file mode 100644 index 00000000..645b4194 --- /dev/null +++ b/app/lib/use_case/scan_dir.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'scan_dir.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logScanDir = Logger("use_case.scan_dir.ScanDir"); + +extension _$ScanDirNpLog on ScanDir { + // ignore: unused_element + Logger get _log => _$logScanDir; +} diff --git a/app/lib/use_case/share_album_with_user.dart b/app/lib/use_case/share_album_with_user.dart index 30aef72c..3de28b89 100644 --- a/app/lib/use_case/share_album_with_user.dart +++ b/app/lib/use_case/share_album_with_user.dart @@ -12,7 +12,11 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/or_null.dart'; import 'package:nc_photos/use_case/create_share.dart'; import 'package:nc_photos/use_case/update_album.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'share_album_with_user.g.dart'; + +@npLog class ShareAlbumWithUser { ShareAlbumWithUser(this.shareRepo, this.albumRepo); @@ -84,7 +88,4 @@ class ShareAlbumWithUser { final ShareRepo shareRepo; final AlbumRepo albumRepo; - - static final _log = - Logger("use_case.share_album_with_user.ShareAlbumWithUser"); } diff --git a/app/lib/use_case/share_album_with_user.g.dart b/app/lib/use_case/share_album_with_user.g.dart new file mode 100644 index 00000000..7396cb25 --- /dev/null +++ b/app/lib/use_case/share_album_with_user.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'share_album_with_user.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logShareAlbumWithUser = + Logger("use_case.share_album_with_user.ShareAlbumWithUser"); + +extension _$ShareAlbumWithUserNpLog on ShareAlbumWithUser { + // ignore: unused_element + Logger get _log => _$logShareAlbumWithUser; +} diff --git a/app/lib/use_case/share_local.dart b/app/lib/use_case/share_local.dart index f24b3bcc..2f06f635 100644 --- a/app/lib/use_case/share_local.dart +++ b/app/lib/use_case/share_local.dart @@ -1,7 +1,11 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/di_container.dart'; import 'package:nc_photos/entity/local_file.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'share_local.g.dart'; + +@npLog class ShareLocal { ShareLocal(this._c) : assert(require(_c)); @@ -21,6 +25,4 @@ class ShareLocal { } final DiContainer _c; - - static final _log = Logger("use_case.share_local.ShareLocal"); } diff --git a/app/lib/use_case/share_local.g.dart b/app/lib/use_case/share_local.g.dart new file mode 100644 index 00000000..7e1d112a --- /dev/null +++ b/app/lib/use_case/share_local.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'share_local.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logShareLocal = Logger("use_case.share_local.ShareLocal"); + +extension _$ShareLocalNpLog on ShareLocal { + // ignore: unused_element + Logger get _log => _$logShareLocal; +} diff --git a/app/lib/use_case/startup_sync.dart b/app/lib/use_case/startup_sync.dart index 1c45b5fd..4899e5d0 100644 --- a/app/lib/use_case/startup_sync.dart +++ b/app/lib/use_case/startup_sync.dart @@ -13,8 +13,12 @@ import 'package:nc_photos/type.dart'; import 'package:nc_photos/use_case/sync_favorite.dart'; import 'package:nc_photos/use_case/sync_person.dart'; import 'package:nc_photos/use_case/sync_tag.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'startup_sync.g.dart'; /// Sync various properties with server during startup +@npLog class StartupSync { StartupSync(this._c) : assert(require(_c)), @@ -74,8 +78,6 @@ class StartupSync { } final DiContainer _c; - - static final _log = Logger("use_case.startup_sync.StartupSync"); } class SyncResult { diff --git a/app/lib/use_case/startup_sync.g.dart b/app/lib/use_case/startup_sync.g.dart new file mode 100644 index 00000000..4eb541c5 --- /dev/null +++ b/app/lib/use_case/startup_sync.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'startup_sync.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logStartupSync = Logger("use_case.startup_sync.StartupSync"); + +extension _$StartupSyncNpLog on StartupSync { + // ignore: unused_element + Logger get _log => _$logStartupSync; +} diff --git a/app/lib/use_case/sync_dir.dart b/app/lib/use_case/sync_dir.dart index d96b3fcd..250ac474 100644 --- a/app/lib/use_case/sync_dir.dart +++ b/app/lib/use_case/sync_dir.dart @@ -11,8 +11,12 @@ import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/progress_util.dart'; import 'package:nc_photos/remote_storage_util.dart' as remote_storage_util; import 'package:nc_photos/use_case/ls_single_file.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:tuple/tuple.dart'; +part 'sync_dir.g.dart'; + +@npLog class SyncDir { SyncDir(this._c) : assert(require(_c)); @@ -135,6 +139,4 @@ class SyncDir { } final DiContainer _c; - - static final _log = Logger("use_case.sync_dir.SyncDir"); } diff --git a/app/lib/use_case/sync_dir.g.dart b/app/lib/use_case/sync_dir.g.dart new file mode 100644 index 00000000..0cfaa871 --- /dev/null +++ b/app/lib/use_case/sync_dir.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sync_dir.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSyncDir = Logger("use_case.sync_dir.SyncDir"); + +extension _$SyncDirNpLog on SyncDir { + // ignore: unused_element + Logger get _log => _$logSyncDir; +} diff --git a/app/lib/use_case/sync_favorite.dart b/app/lib/use_case/sync_favorite.dart index c6d0aa88..6293cd12 100644 --- a/app/lib/use_case/sync_favorite.dart +++ b/app/lib/use_case/sync_favorite.dart @@ -5,7 +5,11 @@ import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/file_util.dart' as file_util; import 'package:nc_photos/pref.dart'; import 'package:nc_photos/use_case/cache_favorite.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'sync_favorite.g.dart'; + +@npLog class SyncFavorite { SyncFavorite(this._c) : assert(require(_c)), @@ -45,6 +49,4 @@ class SyncFavorite { } final DiContainer _c; - - static final _log = Logger("use_case.sync_favorite.SyncFavorite"); } diff --git a/app/lib/use_case/sync_favorite.g.dart b/app/lib/use_case/sync_favorite.g.dart new file mode 100644 index 00000000..4d09a2b7 --- /dev/null +++ b/app/lib/use_case/sync_favorite.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sync_favorite.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSyncFavorite = Logger("use_case.sync_favorite.SyncFavorite"); + +extension _$SyncFavoriteNpLog on SyncFavorite { + // ignore: unused_element + Logger get _log => _$logSyncFavorite; +} diff --git a/app/lib/use_case/sync_person.dart b/app/lib/use_case/sync_person.dart index df291d45..7459df98 100644 --- a/app/lib/use_case/sync_person.dart +++ b/app/lib/use_case/sync_person.dart @@ -10,7 +10,11 @@ import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/exception.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/list_util.dart' as list_util; +import 'package:np_codegen/np_codegen.dart'; +part 'sync_person.g.dart'; + +@npLog class SyncPerson { SyncPerson(this._c) : assert(require(_c)); @@ -78,6 +82,4 @@ class SyncPerson { } final DiContainer _c; - - static final _log = Logger("use_case.sync_person.SyncPerson"); } diff --git a/app/lib/use_case/sync_person.g.dart b/app/lib/use_case/sync_person.g.dart new file mode 100644 index 00000000..14ddd076 --- /dev/null +++ b/app/lib/use_case/sync_person.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sync_person.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSyncPerson = Logger("use_case.sync_person.SyncPerson"); + +extension _$SyncPersonNpLog on SyncPerson { + // ignore: unused_element + Logger get _log => _$logSyncPerson; +} diff --git a/app/lib/use_case/sync_tag.dart b/app/lib/use_case/sync_tag.dart index 2152c20f..edbd4700 100644 --- a/app/lib/use_case/sync_tag.dart +++ b/app/lib/use_case/sync_tag.dart @@ -9,7 +9,11 @@ import 'package:nc_photos/entity/sqlite_table_extension.dart' as sql; import 'package:nc_photos/entity/tag.dart'; import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/list_util.dart' as list_util; +import 'package:np_codegen/np_codegen.dart'; +part 'sync_tag.g.dart'; + +@npLog class SyncTag { SyncTag(this._c) : assert(require(_c)); @@ -67,6 +71,4 @@ class SyncTag { } final DiContainer _c; - - static final _log = Logger("use_case.sync_tag.SyncTag"); } diff --git a/app/lib/use_case/sync_tag.g.dart b/app/lib/use_case/sync_tag.g.dart new file mode 100644 index 00000000..17848598 --- /dev/null +++ b/app/lib/use_case/sync_tag.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sync_tag.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSyncTag = Logger("use_case.sync_tag.SyncTag"); + +extension _$SyncTagNpLog on SyncTag { + // ignore: unused_element + Logger get _log => _$logSyncTag; +} diff --git a/app/lib/use_case/unshare_album_with_user.dart b/app/lib/use_case/unshare_album_with_user.dart index 60ce85f1..77fc6457 100644 --- a/app/lib/use_case/unshare_album_with_user.dart +++ b/app/lib/use_case/unshare_album_with_user.dart @@ -12,7 +12,11 @@ import 'package:nc_photos/use_case/list_share.dart'; import 'package:nc_photos/use_case/remove_share.dart'; import 'package:nc_photos/use_case/unshare_file_from_album.dart'; import 'package:nc_photos/use_case/update_album.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'unshare_album_with_user.g.dart'; + +@npLog class UnshareAlbumWithUser { UnshareAlbumWithUser(this._c) : assert(require(_c)), @@ -82,7 +86,4 @@ class UnshareAlbumWithUser { } final DiContainer _c; - - static final _log = - Logger("use_case.unshare_album_with_user.UnshareAlbumWithUser"); } diff --git a/app/lib/use_case/unshare_album_with_user.g.dart b/app/lib/use_case/unshare_album_with_user.g.dart new file mode 100644 index 00000000..47c1b434 --- /dev/null +++ b/app/lib/use_case/unshare_album_with_user.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'unshare_album_with_user.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logUnshareAlbumWithUser = + Logger("use_case.unshare_album_with_user.UnshareAlbumWithUser"); + +extension _$UnshareAlbumWithUserNpLog on UnshareAlbumWithUser { + // ignore: unused_element + Logger get _log => _$logUnshareAlbumWithUser; +} diff --git a/app/lib/use_case/unshare_file_from_album.dart b/app/lib/use_case/unshare_file_from_album.dart index 652d2cb4..7119196d 100644 --- a/app/lib/use_case/unshare_file_from_album.dart +++ b/app/lib/use_case/unshare_file_from_album.dart @@ -13,7 +13,11 @@ import 'package:nc_photos/stream_extension.dart'; import 'package:nc_photos/use_case/list_album.dart'; import 'package:nc_photos/use_case/list_share.dart'; import 'package:nc_photos/use_case/remove_share.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'unshare_file_from_album.g.dart'; + +@npLog class UnshareFileFromAlbum { UnshareFileFromAlbum(this._c) : assert(require(_c)), @@ -94,7 +98,4 @@ class UnshareFileFromAlbum { } final DiContainer _c; - - static final _log = - Logger("use_case.unshare_file_from_album.UnshareFileFromAlbum"); } diff --git a/app/lib/use_case/unshare_file_from_album.g.dart b/app/lib/use_case/unshare_file_from_album.g.dart new file mode 100644 index 00000000..5a340808 --- /dev/null +++ b/app/lib/use_case/unshare_file_from_album.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'unshare_file_from_album.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logUnshareFileFromAlbum = + Logger("use_case.unshare_file_from_album.UnshareFileFromAlbum"); + +extension _$UnshareFileFromAlbumNpLog on UnshareFileFromAlbum { + // ignore: unused_element + Logger get _log => _$logUnshareFileFromAlbum; +} diff --git a/app/lib/use_case/update_album_with_actual_items.dart b/app/lib/use_case/update_album_with_actual_items.dart index d2d8e708..873a43bd 100644 --- a/app/lib/use_case/update_album_with_actual_items.dart +++ b/app/lib/use_case/update_album_with_actual_items.dart @@ -6,7 +6,11 @@ import 'package:nc_photos/entity/album/sort_provider.dart'; import 'package:nc_photos/use_case/update_album.dart'; import 'package:nc_photos/use_case/update_album_time.dart'; import 'package:nc_photos/use_case/update_auto_album_cover.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'update_album_with_actual_items.g.dart'; + +@npLog class UpdateAlbumWithActualItems { UpdateAlbumWithActualItems(this.albumRepo); @@ -44,7 +48,4 @@ class UpdateAlbumWithActualItems { } final AlbumRepo? albumRepo; - - static final _log = Logger( - "use_case.update_album_with_actual_items.UpdateAlbumWithActualItems"); } diff --git a/app/lib/use_case/update_album_with_actual_items.g.dart b/app/lib/use_case/update_album_with_actual_items.g.dart new file mode 100644 index 00000000..dd398da7 --- /dev/null +++ b/app/lib/use_case/update_album_with_actual_items.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'update_album_with_actual_items.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logUpdateAlbumWithActualItems = Logger( + "use_case.update_album_with_actual_items.UpdateAlbumWithActualItems"); + +extension _$UpdateAlbumWithActualItemsNpLog on UpdateAlbumWithActualItems { + // ignore: unused_element + Logger get _log => _$logUpdateAlbumWithActualItems; +} diff --git a/app/lib/use_case/update_missing_metadata.dart b/app/lib/use_case/update_missing_metadata.dart index 6bca7224..d5360588 100644 --- a/app/lib/use_case/update_missing_metadata.dart +++ b/app/lib/use_case/update_missing_metadata.dart @@ -15,11 +15,15 @@ import 'package:nc_photos/use_case/get_file_binary.dart'; import 'package:nc_photos/use_case/load_metadata.dart'; import 'package:nc_photos/use_case/scan_missing_metadata.dart'; import 'package:nc_photos/use_case/update_property.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'update_missing_metadata.g.dart'; abstract class UpdateMissingMetadataConfigProvider { Future isWifiOnly(); } +@npLog class UpdateMissingMetadata { UpdateMissingMetadata(this.fileRepo, this.configProvider, this.geocoder); @@ -164,7 +168,4 @@ class UpdateMissingMetadata { final ReverseGeocoder geocoder; bool _shouldRun = true; - - static final _log = - Logger("use_case.update_missing_metadata.UpdateMissingMetadata"); } diff --git a/app/lib/use_case/update_missing_metadata.g.dart b/app/lib/use_case/update_missing_metadata.g.dart new file mode 100644 index 00000000..9561c5eb --- /dev/null +++ b/app/lib/use_case/update_missing_metadata.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'update_missing_metadata.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logUpdateMissingMetadata = + Logger("use_case.update_missing_metadata.UpdateMissingMetadata"); + +extension _$UpdateMissingMetadataNpLog on UpdateMissingMetadata { + // ignore: unused_element + Logger get _log => _$logUpdateMissingMetadata; +} diff --git a/app/lib/use_case/update_property.dart b/app/lib/use_case/update_property.dart index 9a1b872b..af7fe52a 100644 --- a/app/lib/use_case/update_property.dart +++ b/app/lib/use_case/update_property.dart @@ -5,7 +5,11 @@ import 'package:nc_photos/account.dart'; import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/event/event.dart'; import 'package:nc_photos/or_null.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'update_property.g.dart'; + +@npLog class UpdateProperty { UpdateProperty(this.fileRepo); @@ -65,8 +69,6 @@ class UpdateProperty { } final FileRepo fileRepo; - - static final _log = Logger("use_case.update_property.UpdateProperty"); } extension UpdatePropertyExtension on UpdateProperty { diff --git a/app/lib/use_case/update_property.g.dart b/app/lib/use_case/update_property.g.dart new file mode 100644 index 00000000..48885451 --- /dev/null +++ b/app/lib/use_case/update_property.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'update_property.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logUpdateProperty = Logger("use_case.update_property.UpdateProperty"); + +extension _$UpdatePropertyNpLog on UpdateProperty { + // ignore: unused_element + Logger get _log => _$logUpdateProperty; +} diff --git a/app/lib/web/notification.dart b/app/lib/web/notification.dart index 13d7ca5c..3815173c 100644 --- a/app/lib/web/notification.dart +++ b/app/lib/web/notification.dart @@ -4,7 +4,11 @@ import 'package:nc_photos/app_localizations.dart'; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/platform/notification.dart' as itf; import 'package:nc_photos/snack_bar_manager.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'notification.g.dart'; + +@npLog class NotificationManager implements itf.NotificationManager { @override notify(itf.Notification n) async { @@ -23,6 +27,4 @@ class NotificationManager implements itf.NotificationManager { dismiss(dynamic id) async { return; } - - static final _log = Logger("web.notification.NotificationManager"); } diff --git a/app/lib/web/notification.g.dart b/app/lib/web/notification.g.dart new file mode 100644 index 00000000..b9be7778 --- /dev/null +++ b/app/lib/web/notification.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'notification.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logNotificationManager = Logger("web.notification.NotificationManager"); + +extension _$NotificationManagerNpLog on NotificationManager { + // ignore: unused_element + Logger get _log => _$logNotificationManager; +} diff --git a/app/lib/widget/account_picker_dialog.dart b/app/lib/widget/account_picker_dialog.dart index 3c42907f..018c0120 100644 --- a/app/lib/widget/account_picker_dialog.dart +++ b/app/lib/widget/account_picker_dialog.dart @@ -14,6 +14,9 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/widget/home.dart'; import 'package:nc_photos/widget/settings.dart'; import 'package:nc_photos/widget/sign_in.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'account_picker_dialog.g.dart'; /// A dialog that allows the user to switch between accounts class AccountPickerDialog extends StatefulWidget { @@ -28,6 +31,7 @@ class AccountPickerDialog extends StatefulWidget { final Account account; } +@npLog class _AccountPickerDialogState extends State { @override initState() { @@ -169,7 +173,4 @@ class _AccountPickerDialogState extends State { } late List _accounts; - - static final _log = - Logger("widget.account_picker_dialog._AccountPickerDialogState"); } diff --git a/app/lib/widget/account_picker_dialog.g.dart b/app/lib/widget/account_picker_dialog.g.dart new file mode 100644 index 00000000..ad1251bf --- /dev/null +++ b/app/lib/widget/account_picker_dialog.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'account_picker_dialog.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_AccountPickerDialogState = + Logger("widget.account_picker_dialog._AccountPickerDialogState"); + +extension _$_AccountPickerDialogStateNpLog on _AccountPickerDialogState { + // ignore: unused_element + Logger get _log => _$log_AccountPickerDialogState; +} diff --git a/app/lib/widget/album_browser.dart b/app/lib/widget/album_browser.dart index d3798938..f69238f1 100644 --- a/app/lib/widget/album_browser.dart +++ b/app/lib/widget/album_browser.dart @@ -44,6 +44,7 @@ import 'package:nc_photos/widget/share_album_dialog.dart'; import 'package:nc_photos/widget/shared_album_info_dialog.dart'; import 'package:nc_photos/widget/simple_input_dialog.dart'; import 'package:nc_photos/widget/viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'album_browser.g.dart'; @@ -82,6 +83,7 @@ class AlbumBrowser extends StatefulWidget { final Album album; } +@npLog class _AlbumBrowserState extends State with SelectableItemStreamListMixin, @@ -885,8 +887,6 @@ class _AlbumBrowserState extends State late AppEventListener _albumUpdatedListener; - static final _log = Logger("widget.album_browser._AlbumBrowserState"); - static const _menuValueDownload = 0; static const _menuValueFixShares = 1; } diff --git a/app/lib/widget/album_browser.g.dart b/app/lib/widget/album_browser.g.dart index d770c57f..8dd3f4fd 100644 --- a/app/lib/widget/album_browser.g.dart +++ b/app/lib/widget/album_browser.g.dart @@ -2,6 +2,19 @@ part of 'album_browser.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_AlbumBrowserState = + Logger("widget.album_browser._AlbumBrowserState"); + +extension _$_AlbumBrowserStateNpLog on _AlbumBrowserState { + // ignore: unused_element + Logger get _log => _$log_AlbumBrowserState; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/widget/album_browser_mixin.dart b/app/lib/widget/album_browser_mixin.dart index 7d2bd4e0..f46d4dd9 100644 --- a/app/lib/widget/album_browser_mixin.dart +++ b/app/lib/widget/album_browser_mixin.dart @@ -23,7 +23,11 @@ import 'package:nc_photos/widget/photo_list_util.dart' as photo_list_util; import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'album_browser_mixin.g.dart'; + +@npLog mixin AlbumBrowserMixin on SelectableItemStreamListMixin { @override @@ -251,7 +255,6 @@ mixin AlbumBrowserMixin var _isEditMode = false; var _editFormValue = _EditFormValue(); - static final _log = Logger("widget.album_browser_mixin.AlbumBrowserMixin"); static const _menuValueEdit = -1; static const _menuValueUnsetCover = -2; } diff --git a/app/lib/widget/album_browser_mixin.g.dart b/app/lib/widget/album_browser_mixin.g.dart new file mode 100644 index 00000000..918c962a --- /dev/null +++ b/app/lib/widget/album_browser_mixin.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'album_browser_mixin.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAlbumBrowserMixin = + Logger("widget.album_browser_mixin.AlbumBrowserMixin"); + +extension _$AlbumBrowserMixinNpLog on AlbumBrowserMixin { + // ignore: unused_element + Logger get _log => _$logAlbumBrowserMixin; +} diff --git a/app/lib/widget/album_dir_picker.dart b/app/lib/widget/album_dir_picker.dart index f00bec3e..2f14356e 100644 --- a/app/lib/widget/album_dir_picker.dart +++ b/app/lib/widget/album_dir_picker.dart @@ -9,6 +9,9 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/widget/dir_picker.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'album_dir_picker.g.dart'; class AlbumDirPickerArguments { AlbumDirPickerArguments(this.account); @@ -41,6 +44,7 @@ class AlbumDirPicker extends StatefulWidget { final Account account; } +@npLog class _AlbumDirPickerState extends State { @override build(BuildContext context) { @@ -140,6 +144,4 @@ class _AlbumDirPickerState extends State { final _pickerKey = GlobalKey(); late final _strippedRootDir = _getPickerRoot(); - - static final _log = Logger("widget.album_dir_picker._AlbumDirPickerState"); } diff --git a/app/lib/widget/album_dir_picker.g.dart b/app/lib/widget/album_dir_picker.g.dart new file mode 100644 index 00000000..83c6cabc --- /dev/null +++ b/app/lib/widget/album_dir_picker.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'album_dir_picker.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_AlbumDirPickerState = + Logger("widget.album_dir_picker._AlbumDirPickerState"); + +extension _$_AlbumDirPickerStateNpLog on _AlbumDirPickerState { + // ignore: unused_element + Logger get _log => _$log_AlbumDirPickerState; +} diff --git a/app/lib/widget/album_importer.dart b/app/lib/widget/album_importer.dart index a86600a3..7243410c 100644 --- a/app/lib/widget/album_importer.dart +++ b/app/lib/widget/album_importer.dart @@ -24,6 +24,9 @@ import 'package:nc_photos/use_case/create_album.dart'; import 'package:nc_photos/use_case/preprocess_album.dart'; import 'package:nc_photos/use_case/update_album_with_actual_items.dart'; import 'package:nc_photos/widget/processing_dialog.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'album_importer.g.dart'; class AlbumImporterArguments { AlbumImporterArguments(this.account); @@ -55,6 +58,7 @@ class AlbumImporter extends StatefulWidget { final Account account; } +@npLog class _AlbumImporterState extends State { _AlbumImporterState() { final c = KiwiContainer().resolve(); @@ -274,6 +278,4 @@ class _AlbumImporterState extends State { var _backingFiles = []; final _picks = []; - - static final _log = Logger("widget.album_importer._AlbumImporterState"); } diff --git a/app/lib/widget/album_importer.g.dart b/app/lib/widget/album_importer.g.dart new file mode 100644 index 00000000..1c2ec98d --- /dev/null +++ b/app/lib/widget/album_importer.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'album_importer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_AlbumImporterState = + Logger("widget.album_importer._AlbumImporterState"); + +extension _$_AlbumImporterStateNpLog on _AlbumImporterState { + // ignore: unused_element + Logger get _log => _$log_AlbumImporterState; +} diff --git a/app/lib/widget/album_picker.dart b/app/lib/widget/album_picker.dart index 28725e68..eb70360e 100644 --- a/app/lib/widget/album_picker.dart +++ b/app/lib/widget/album_picker.dart @@ -17,6 +17,9 @@ import 'package:nc_photos/widget/album_grid_item.dart'; import 'package:nc_photos/widget/builder/album_grid_item_builder.dart'; import 'package:nc_photos/widget/new_album_dialog.dart'; import 'package:nc_photos/widget/page_visibility_mixin.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'album_picker.g.dart'; class AlbumPickerArguments { AlbumPickerArguments(this.account); @@ -49,6 +52,7 @@ class AlbumPicker extends StatefulWidget { final Account account; } +@npLog class _AlbumPickerState extends State with RouteAware, PageVisibilityMixin { @override @@ -190,8 +194,6 @@ class _AlbumPickerState extends State late final _bloc = ListAlbumBloc.of(widget.account); var _sortedAlbums = []; - - static final _log = Logger("widget.album_picker._AlbumPickerState"); } class _NewAlbumView extends StatelessWidget { diff --git a/app/lib/widget/album_picker.g.dart b/app/lib/widget/album_picker.g.dart new file mode 100644 index 00000000..64073acb --- /dev/null +++ b/app/lib/widget/album_picker.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'album_picker.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_AlbumPickerState = Logger("widget.album_picker._AlbumPickerState"); + +extension _$_AlbumPickerStateNpLog on _AlbumPickerState { + // ignore: unused_element + Logger get _log => _$log_AlbumPickerState; +} diff --git a/app/lib/widget/album_share_outlier_browser.dart b/app/lib/widget/album_share_outlier_browser.dart index 58ac2b43..cedde87a 100644 --- a/app/lib/widget/album_share_outlier_browser.dart +++ b/app/lib/widget/album_share_outlier_browser.dart @@ -26,6 +26,9 @@ import 'package:nc_photos/use_case/create_share.dart'; import 'package:nc_photos/use_case/remove_share.dart'; import 'package:nc_photos/widget/empty_list_indicator.dart'; import 'package:nc_photos/widget/unbounded_list_tile.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'album_share_outlier_browser.g.dart'; class AlbumShareOutlierBrowserArguments { const AlbumShareOutlierBrowserArguments(this.account, this.album); @@ -63,6 +66,7 @@ class AlbumShareOutlierBrowser extends StatefulWidget { final Album album; } +@npLog class _AlbumShareOutlierBrowserState extends State { @override initState() { @@ -468,9 +472,6 @@ class _AlbumShareOutlierBrowserState extends State { var _items = <_ListItem>[]; final _itemStatuses = >{}; - - static final _log = Logger( - "widget.album_share_outlier_browser._AlbumShareOutlierBrowserState"); } abstract class _ListItem { diff --git a/app/lib/widget/album_share_outlier_browser.g.dart b/app/lib/widget/album_share_outlier_browser.g.dart new file mode 100644 index 00000000..065f3e6f --- /dev/null +++ b/app/lib/widget/album_share_outlier_browser.g.dart @@ -0,0 +1,17 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'album_share_outlier_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_AlbumShareOutlierBrowserState = + Logger("widget.album_share_outlier_browser._AlbumShareOutlierBrowserState"); + +extension _$_AlbumShareOutlierBrowserStateNpLog + on _AlbumShareOutlierBrowserState { + // ignore: unused_element + Logger get _log => _$log_AlbumShareOutlierBrowserState; +} diff --git a/app/lib/widget/archive_browser.dart b/app/lib/widget/archive_browser.dart index d4f7b403..ff6f3284 100644 --- a/app/lib/widget/archive_browser.dart +++ b/app/lib/widget/archive_browser.dart @@ -28,6 +28,9 @@ import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/viewer.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'archive_browser.g.dart'; class ArchiveBrowserArguments { ArchiveBrowserArguments(this.account); @@ -59,6 +62,7 @@ class ArchiveBrowser extends StatefulWidget { final Account account; } +@npLog class _ArchiveBrowserState extends State with SelectableItemStreamListMixin { @override @@ -296,6 +300,4 @@ class _ArchiveBrowserState extends State var _thumbZoomLevel = 0; int get _thumbSize => photo_list_util.getThumbSize(_thumbZoomLevel); - - static final _log = Logger("widget.archive_browser._ArchiveBrowserState"); } diff --git a/app/lib/widget/archive_browser.g.dart b/app/lib/widget/archive_browser.g.dart new file mode 100644 index 00000000..6e410baf --- /dev/null +++ b/app/lib/widget/archive_browser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'archive_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ArchiveBrowserState = + Logger("widget.archive_browser._ArchiveBrowserState"); + +extension _$_ArchiveBrowserStateNpLog on _ArchiveBrowserState { + // ignore: unused_element + Logger get _log => _$log_ArchiveBrowserState; +} diff --git a/app/lib/widget/builder/photo_list_item_builder.dart b/app/lib/widget/builder/photo_list_item_builder.dart index b793768d..b3cc2973 100644 --- a/app/lib/widget/builder/photo_list_item_builder.dart +++ b/app/lib/widget/builder/photo_list_item_builder.dart @@ -13,6 +13,9 @@ import 'package:nc_photos/object_extension.dart'; import 'package:nc_photos/widget/photo_list_item.dart'; import 'package:nc_photos/widget/photo_list_util.dart'; import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'photo_list_item_builder.g.dart'; /// Arguments to the photo list item builder /// @@ -101,6 +104,7 @@ PhotoListItemBuilderResult buildPhotoListItem( )(arg.account, arg.files); } +@npLog class _PhotoListItemBuilder { const _PhotoListItemBuilder({ required this.isArchived, @@ -186,7 +190,4 @@ class _PhotoListItemBuilder { final PhotoListItemSmartAlbumConfig? smartAlbumConfig; final bool shouldShowFavoriteBadge; final Locale locale; - - static final _log = - Logger("widget.builder.photo_list_item_builder._PhotoListItemBuilder"); } diff --git a/app/lib/widget/builder/photo_list_item_builder.g.dart b/app/lib/widget/builder/photo_list_item_builder.g.dart new file mode 100644 index 00000000..da4e1af3 --- /dev/null +++ b/app/lib/widget/builder/photo_list_item_builder.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'photo_list_item_builder.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_PhotoListItemBuilder = + Logger("widget.builder.photo_list_item_builder._PhotoListItemBuilder"); + +extension _$_PhotoListItemBuilderNpLog on _PhotoListItemBuilder { + // ignore: unused_element + Logger get _log => _$log_PhotoListItemBuilder; +} diff --git a/app/lib/widget/changelog.dart b/app/lib/widget/changelog.dart index bd7ed52b..28c232b2 100644 --- a/app/lib/widget/changelog.dart +++ b/app/lib/widget/changelog.dart @@ -1,6 +1,9 @@ import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/theme.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'changelog.g.dart'; class ChangelogArguments { const ChangelogArguments(this.fromVersion); @@ -8,6 +11,7 @@ class ChangelogArguments { final int fromVersion; } +@npLog class Changelog extends StatelessWidget { static const routeName = "/changelog"; @@ -73,8 +77,6 @@ class Changelog extends StatelessWidget { } final int? fromVersion; - - static final _log = Logger("widget.changelog.Changelog"); } List _buildChangelog460(BuildContext context) { diff --git a/app/lib/widget/changelog.g.dart b/app/lib/widget/changelog.g.dart new file mode 100644 index 00000000..87dbd67b --- /dev/null +++ b/app/lib/widget/changelog.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'changelog.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logChangelog = Logger("widget.changelog.Changelog"); + +extension _$ChangelogNpLog on Changelog { + // ignore: unused_element + Logger get _log => _$logChangelog; +} diff --git a/app/lib/widget/connect.dart b/app/lib/widget/connect.dart index bad78260..3495ed87 100644 --- a/app/lib/widget/connect.dart +++ b/app/lib/widget/connect.dart @@ -22,6 +22,9 @@ import 'package:nc_photos/theme.dart'; import 'package:nc_photos/url_launcher_util.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; import 'package:nc_photos/widget/cloud_progress_indicator.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'connect.g.dart'; class ConnectArguments { ConnectArguments(this.uri); @@ -53,6 +56,7 @@ class Connect extends StatefulWidget { final Uri uri; } +@npLog class _ConnectState extends State { @override initState() { @@ -296,8 +300,6 @@ class _ConnectState extends State { } final _bloc = AppPasswordExchangeBloc(); - - static final _log = Logger("widget.connect._ConnectState"); } class _WebDavUrlDialog extends StatefulWidget { diff --git a/app/lib/widget/connect.g.dart b/app/lib/widget/connect.g.dart new file mode 100644 index 00000000..e698d6df --- /dev/null +++ b/app/lib/widget/connect.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'connect.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ConnectState = Logger("widget.connect._ConnectState"); + +extension _$_ConnectStateNpLog on _ConnectState { + // ignore: unused_element + Logger get _log => _$log_ConnectState; +} diff --git a/app/lib/widget/dir_picker.dart b/app/lib/widget/dir_picker.dart index 8944b504..4e4a4f4b 100644 --- a/app/lib/widget/dir_picker.dart +++ b/app/lib/widget/dir_picker.dart @@ -14,8 +14,11 @@ import 'package:nc_photos/exception_util.dart' as exception_util; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/material3.dart'; import 'package:nc_photos/snack_bar_manager.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; +part 'dir_picker.g.dart'; + class DirPicker extends StatefulWidget { const DirPicker({ Key? key, @@ -40,6 +43,7 @@ class DirPicker extends StatefulWidget { final ValueChanged>? onConfirmed; } +@npLog class DirPickerState extends State { @override initState() { @@ -420,8 +424,6 @@ class DirPickerState extends State { var _currentPath = ""; var _picks = []; - - static final _log = Logger("widget.dir_picker.DirPickerState"); } enum _PickState { diff --git a/app/lib/widget/dir_picker.g.dart b/app/lib/widget/dir_picker.g.dart new file mode 100644 index 00000000..f799b137 --- /dev/null +++ b/app/lib/widget/dir_picker.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'dir_picker.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logDirPickerState = Logger("widget.dir_picker.DirPickerState"); + +extension _$DirPickerStateNpLog on DirPickerState { + // ignore: unused_element + Logger get _log => _$logDirPickerState; +} diff --git a/app/lib/widget/draggable.dart b/app/lib/widget/draggable.dart index 5a9b29a7..4db84e7f 100644 --- a/app/lib/widget/draggable.dart +++ b/app/lib/widget/draggable.dart @@ -1,6 +1,10 @@ import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'draggable.g.dart'; + +@npLog class Draggable extends StatelessWidget { const Draggable({ Key? key, @@ -124,6 +128,4 @@ class Draggable extends StatelessWidget { /// /// Right now a translucent version of [child] is being shown final Size? feedbackSize; - - static final _log = Logger("widget.draggable.Draggable"); } diff --git a/app/lib/widget/draggable.g.dart b/app/lib/widget/draggable.g.dart new file mode 100644 index 00000000..d5255fbd --- /dev/null +++ b/app/lib/widget/draggable.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'draggable.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logDraggable = Logger("widget.draggable.Draggable"); + +extension _$DraggableNpLog on Draggable { + // ignore: unused_element + Logger get _log => _$logDraggable; +} diff --git a/app/lib/widget/dynamic_album_browser.dart b/app/lib/widget/dynamic_album_browser.dart index e748b1a7..776dffdc 100644 --- a/app/lib/widget/dynamic_album_browser.dart +++ b/app/lib/widget/dynamic_album_browser.dart @@ -37,6 +37,7 @@ import 'package:nc_photos/widget/photo_list_item.dart'; import 'package:nc_photos/widget/photo_list_util.dart' as photo_list_util; import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'dynamic_album_browser.g.dart'; @@ -76,6 +77,7 @@ class DynamicAlbumBrowser extends StatefulWidget { final Album album; } +@npLog class _DynamicAlbumBrowserState extends State with SelectableItemStreamListMixin, @@ -672,8 +674,6 @@ class _DynamicAlbumBrowserState extends State late final _fileRemovedListener = AppEventListener(_onFileRemovedEvent); - static final _log = - Logger("widget.dynamic_album_browser._DynamicAlbumBrowserState"); static const _menuValueConvertBasic = 0; static const _menuValueDownload = 1; } diff --git a/app/lib/widget/dynamic_album_browser.g.dart b/app/lib/widget/dynamic_album_browser.g.dart index b3f9fccd..c7b053a3 100644 --- a/app/lib/widget/dynamic_album_browser.g.dart +++ b/app/lib/widget/dynamic_album_browser.g.dart @@ -2,6 +2,19 @@ part of 'dynamic_album_browser.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_DynamicAlbumBrowserState = + Logger("widget.dynamic_album_browser._DynamicAlbumBrowserState"); + +extension _$_DynamicAlbumBrowserStateNpLog on _DynamicAlbumBrowserState { + // ignore: unused_element + Logger get _log => _$log_DynamicAlbumBrowserState; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/widget/enhanced_photo_browser.dart b/app/lib/widget/enhanced_photo_browser.dart index a896842b..f4a851b4 100644 --- a/app/lib/widget/enhanced_photo_browser.dart +++ b/app/lib/widget/enhanced_photo_browser.dart @@ -27,6 +27,9 @@ import 'package:nc_photos/widget/photo_list_util.dart' as photo_list_util; import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'enhanced_photo_browser.g.dart'; class EnhancedPhotoBrowserArguments { const EnhancedPhotoBrowserArguments(this.filename); @@ -59,6 +62,7 @@ class EnhancedPhotoBrowser extends StatefulWidget { final String? filename; } +@npLog class _EnhancedPhotoBrowserState extends State with SelectableItemStreamListMixin { @override @@ -372,9 +376,6 @@ class _EnhancedPhotoBrowserState extends State var _thumbZoomLevel = 0; int get _thumbSize => photo_list_util.getThumbSize(_thumbZoomLevel); var _isNoPermission = false; - - static final _log = - Logger("widget.enhanced_photo_browser._EnhancedPhotoBrowserState"); } enum _SelectionMenuOption { @@ -394,6 +395,7 @@ class _BuilderArguments { final List files; } +@npLog class _Builder { _BuilderResult call(List files) { final s = Stopwatch()..start(); @@ -435,8 +437,6 @@ class _Builder { return null; } } - - static final _log = Logger("widget.enhanced_photo_browser._Builder"); } _BuilderResult _buildPhotoListItem(_BuilderArguments arg) { diff --git a/app/lib/widget/enhanced_photo_browser.g.dart b/app/lib/widget/enhanced_photo_browser.g.dart new file mode 100644 index 00000000..15f2d447 --- /dev/null +++ b/app/lib/widget/enhanced_photo_browser.g.dart @@ -0,0 +1,24 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'enhanced_photo_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_EnhancedPhotoBrowserState = + Logger("widget.enhanced_photo_browser._EnhancedPhotoBrowserState"); + +extension _$_EnhancedPhotoBrowserStateNpLog on _EnhancedPhotoBrowserState { + // ignore: unused_element + Logger get _log => _$log_EnhancedPhotoBrowserState; +} + +// ignore: non_constant_identifier_names +final _$log_Builder = Logger("widget.enhanced_photo_browser._Builder"); + +extension _$_BuilderNpLog on _Builder { + // ignore: unused_element + Logger get _log => _$log_Builder; +} diff --git a/app/lib/widget/handler/add_selection_to_album_handler.dart b/app/lib/widget/handler/add_selection_to_album_handler.dart index a98060a1..00cb26fa 100644 --- a/app/lib/widget/handler/add_selection_to_album_handler.dart +++ b/app/lib/widget/handler/add_selection_to_album_handler.dart @@ -12,7 +12,11 @@ import 'package:nc_photos/notified_action.dart'; import 'package:nc_photos/use_case/add_to_album.dart'; import 'package:nc_photos/use_case/inflate_file_descriptor.dart'; import 'package:nc_photos/widget/album_picker.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'add_selection_to_album_handler.g.dart'; + +@npLog class AddSelectionToAlbumHandler { AddSelectionToAlbumHandler(this._c) : assert(require(_c)), @@ -62,7 +66,4 @@ class AddSelectionToAlbumHandler { } final DiContainer _c; - - static final _log = Logger( - "widget.handler.add_selection_to_album_handler.AddSelectionToAlbumHandler"); } diff --git a/app/lib/widget/handler/add_selection_to_album_handler.g.dart b/app/lib/widget/handler/add_selection_to_album_handler.g.dart new file mode 100644 index 00000000..39bf2a88 --- /dev/null +++ b/app/lib/widget/handler/add_selection_to_album_handler.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'add_selection_to_album_handler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logAddSelectionToAlbumHandler = Logger( + "widget.handler.add_selection_to_album_handler.AddSelectionToAlbumHandler"); + +extension _$AddSelectionToAlbumHandlerNpLog on AddSelectionToAlbumHandler { + // ignore: unused_element + Logger get _log => _$logAddSelectionToAlbumHandler; +} diff --git a/app/lib/widget/handler/archive_selection_handler.dart b/app/lib/widget/handler/archive_selection_handler.dart index 70fde3af..69714600 100644 --- a/app/lib/widget/handler/archive_selection_handler.dart +++ b/app/lib/widget/handler/archive_selection_handler.dart @@ -8,7 +8,11 @@ import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/notified_action.dart'; import 'package:nc_photos/use_case/inflate_file_descriptor.dart'; import 'package:nc_photos/use_case/update_property.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'archive_selection_handler.g.dart'; + +@npLog class ArchiveSelectionHandler { ArchiveSelectionHandler(this._c) : assert(require(_c)), @@ -45,7 +49,4 @@ class ArchiveSelectionHandler { } final DiContainer _c; - - static final _log = Logger( - "widget.handler.archive_selection_handler.ArchiveSelectionHandler"); } diff --git a/app/lib/widget/handler/archive_selection_handler.g.dart b/app/lib/widget/handler/archive_selection_handler.g.dart new file mode 100644 index 00000000..3946e2d0 --- /dev/null +++ b/app/lib/widget/handler/archive_selection_handler.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'archive_selection_handler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logArchiveSelectionHandler = + Logger("widget.handler.archive_selection_handler.ArchiveSelectionHandler"); + +extension _$ArchiveSelectionHandlerNpLog on ArchiveSelectionHandler { + // ignore: unused_element + Logger get _log => _$logArchiveSelectionHandler; +} diff --git a/app/lib/widget/handler/delete_local_selection_handler.dart b/app/lib/widget/handler/delete_local_selection_handler.dart index 8b253e64..0b9d7994 100644 --- a/app/lib/widget/handler/delete_local_selection_handler.dart +++ b/app/lib/widget/handler/delete_local_selection_handler.dart @@ -8,7 +8,11 @@ import 'package:nc_photos/entity/local_file.dart'; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/use_case/delete_local.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'delete_local_selection_handler.g.dart'; + +@npLog class DeleteLocalSelectionHandler { const DeleteLocalSelectionHandler(); @@ -45,7 +49,4 @@ class DeleteLocalSelectionHandler { } return selectedFiles.length - failureCount; } - - static final _log = Logger( - "widget.handler.delete_local_selection_handler.DeleteLocalSelectionHandler"); } diff --git a/app/lib/widget/handler/delete_local_selection_handler.g.dart b/app/lib/widget/handler/delete_local_selection_handler.g.dart new file mode 100644 index 00000000..34511939 --- /dev/null +++ b/app/lib/widget/handler/delete_local_selection_handler.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'delete_local_selection_handler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logDeleteLocalSelectionHandler = Logger( + "widget.handler.delete_local_selection_handler.DeleteLocalSelectionHandler"); + +extension _$DeleteLocalSelectionHandlerNpLog on DeleteLocalSelectionHandler { + // ignore: unused_element + Logger get _log => _$logDeleteLocalSelectionHandler; +} diff --git a/app/lib/widget/handler/remove_selection_handler.dart b/app/lib/widget/handler/remove_selection_handler.dart index 9fba1bfb..4819c9d8 100644 --- a/app/lib/widget/handler/remove_selection_handler.dart +++ b/app/lib/widget/handler/remove_selection_handler.dart @@ -12,7 +12,11 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/use_case/inflate_file_descriptor.dart'; import 'package:nc_photos/use_case/remove.dart'; import 'package:nc_photos/widget/trashbin_browser.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'remove_selection_handler.g.dart'; + +@npLog class RemoveSelectionHandler { RemoveSelectionHandler(this._c) : assert(require(_c)), @@ -93,7 +97,4 @@ class RemoveSelectionHandler { } final DiContainer _c; - - static final _log = - Logger("widget.handler.remove_selection_handler.RemoveSelectionHandler"); } diff --git a/app/lib/widget/handler/remove_selection_handler.g.dart b/app/lib/widget/handler/remove_selection_handler.g.dart new file mode 100644 index 00000000..8fc179e2 --- /dev/null +++ b/app/lib/widget/handler/remove_selection_handler.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'remove_selection_handler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logRemoveSelectionHandler = + Logger("widget.handler.remove_selection_handler.RemoveSelectionHandler"); + +extension _$RemoveSelectionHandlerNpLog on RemoveSelectionHandler { + // ignore: unused_element + Logger get _log => _$logRemoveSelectionHandler; +} diff --git a/app/lib/widget/handler/unarchive_selection_handler.dart b/app/lib/widget/handler/unarchive_selection_handler.dart index e2993f49..f6dd0dc2 100644 --- a/app/lib/widget/handler/unarchive_selection_handler.dart +++ b/app/lib/widget/handler/unarchive_selection_handler.dart @@ -8,7 +8,11 @@ import 'package:nc_photos/entity/file_descriptor.dart'; import 'package:nc_photos/notified_action.dart'; import 'package:nc_photos/use_case/inflate_file_descriptor.dart'; import 'package:nc_photos/use_case/update_property.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'unarchive_selection_handler.g.dart'; + +@npLog class UnarchiveSelectionHandler { UnarchiveSelectionHandler(this._c) : assert(require(_c)), @@ -46,7 +50,4 @@ class UnarchiveSelectionHandler { } final DiContainer _c; - - static final _log = Logger( - "widget.handler.unarchive_selection_handler.UnarchiveSelectionHandler"); } diff --git a/app/lib/widget/handler/unarchive_selection_handler.g.dart b/app/lib/widget/handler/unarchive_selection_handler.g.dart new file mode 100644 index 00000000..3b34d253 --- /dev/null +++ b/app/lib/widget/handler/unarchive_selection_handler.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'unarchive_selection_handler.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logUnarchiveSelectionHandler = Logger( + "widget.handler.unarchive_selection_handler.UnarchiveSelectionHandler"); + +extension _$UnarchiveSelectionHandlerNpLog on UnarchiveSelectionHandler { + // ignore: unused_element + Logger get _log => _$logUnarchiveSelectionHandler; +} diff --git a/app/lib/widget/home.dart b/app/lib/widget/home.dart index e3bc034a..4bf66e4f 100644 --- a/app/lib/widget/home.dart +++ b/app/lib/widget/home.dart @@ -16,6 +16,9 @@ import 'package:nc_photos/use_case/import_potential_shared_album.dart'; import 'package:nc_photos/widget/home_albums.dart'; import 'package:nc_photos/widget/home_photos.dart'; import 'package:nc_photos/widget/home_search.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'home.g.dart'; class HomeArguments { HomeArguments(this.account); @@ -47,6 +50,7 @@ class Home extends StatefulWidget { final Account account; } +@npLog class _HomeState extends State with TickerProviderStateMixin { @override initState() { @@ -192,6 +196,4 @@ class _HomeState extends State with TickerProviderStateMixin { parent: _animationController, curve: Curves.easeIn, ); - - static final _log = Logger("widget.home._HomeState"); } diff --git a/app/lib/widget/home.g.dart b/app/lib/widget/home.g.dart new file mode 100644 index 00000000..2f0c96fb --- /dev/null +++ b/app/lib/widget/home.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'home.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_HomeState = Logger("widget.home._HomeState"); + +extension _$_HomeStateNpLog on _HomeState { + // ignore: unused_element + Logger get _log => _$log_HomeState; +} diff --git a/app/lib/widget/home_albums.dart b/app/lib/widget/home_albums.dart index 8994067d..36dc527f 100644 --- a/app/lib/widget/home_albums.dart +++ b/app/lib/widget/home_albums.dart @@ -39,6 +39,9 @@ import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/sharing_browser.dart'; import 'package:nc_photos/widget/trashbin_browser.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'home_albums.g.dart'; class HomeAlbums extends StatefulWidget { const HomeAlbums({ @@ -52,6 +55,7 @@ class HomeAlbums extends StatefulWidget { final Account account; } +@npLog class _HomeAlbumsState extends State with SelectableItemStreamListMixin, @@ -502,7 +506,6 @@ class _HomeAlbumsState extends State late final _accountPrefUpdatedEventListener = AppEventListener(_onAccountPrefUpdatedEvent); - static final _log = Logger("widget.home_albums._HomeAlbumsState"); static const _menuValueImport = 0; static const _menuValueSort = 1; } diff --git a/app/lib/widget/home_albums.g.dart b/app/lib/widget/home_albums.g.dart new file mode 100644 index 00000000..f4baf5be --- /dev/null +++ b/app/lib/widget/home_albums.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'home_albums.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_HomeAlbumsState = Logger("widget.home_albums._HomeAlbumsState"); + +extension _$_HomeAlbumsStateNpLog on _HomeAlbumsState { + // ignore: unused_element + Logger get _log => _$log_HomeAlbumsState; +} diff --git a/app/lib/widget/home_photos.dart b/app/lib/widget/home_photos.dart index ba629c61..ac25da48 100644 --- a/app/lib/widget/home_photos.dart +++ b/app/lib/widget/home_photos.dart @@ -53,8 +53,11 @@ import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/settings.dart'; import 'package:nc_photos/widget/viewer.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:visibility_detector/visibility_detector.dart'; +part 'home_photos.g.dart'; + class HomePhotos extends StatefulWidget { const HomePhotos({ Key? key, @@ -67,6 +70,7 @@ class HomePhotos extends StatefulWidget { final Account account; } +@npLog class _HomePhotosState extends State with SelectableItemStreamListMixin, @@ -792,7 +796,6 @@ class _HomePhotosState extends State var _isScrollbarVisible = false; var _isRefreshIndicatorActive = false; - static final _log = Logger("widget.home_photos._HomePhotosState"); static const _menuValueRefresh = 0; } diff --git a/app/lib/widget/home_photos.g.dart b/app/lib/widget/home_photos.g.dart new file mode 100644 index 00000000..4f94d246 --- /dev/null +++ b/app/lib/widget/home_photos.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'home_photos.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_HomePhotosState = Logger("widget.home_photos._HomePhotosState"); + +extension _$_HomePhotosStateNpLog on _HomePhotosState { + // ignore: unused_element + Logger get _log => _$log_HomePhotosState; +} diff --git a/app/lib/widget/home_search.dart b/app/lib/widget/home_search.dart index 82709c8a..4ac51563 100644 --- a/app/lib/widget/home_search.dart +++ b/app/lib/widget/home_search.dart @@ -36,6 +36,9 @@ import 'package:nc_photos/widget/search_landing.dart'; import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'home_search.g.dart'; class HomeSearch extends StatefulWidget { const HomeSearch({ @@ -49,6 +52,7 @@ class HomeSearch extends StatefulWidget { final Account account; } +@npLog class _HomeSearchState extends State with SelectableItemStreamListMixin, @@ -587,8 +591,6 @@ class _HomeSearchState extends State photo_list_util.getThumbSize(_thumbZoomLevel).toDouble(); var _backingFiles = []; - - static final _log = Logger("widget.home_search._HomeSearchState"); } class _FormValue { diff --git a/app/lib/widget/home_search.g.dart b/app/lib/widget/home_search.g.dart new file mode 100644 index 00000000..40947628 --- /dev/null +++ b/app/lib/widget/home_search.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'home_search.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_HomeSearchState = Logger("widget.home_search._HomeSearchState"); + +extension _$_HomeSearchStateNpLog on _HomeSearchState { + // ignore: unused_element + Logger get _log => _$log_HomeSearchState; +} diff --git a/app/lib/widget/home_search_suggestion.dart b/app/lib/widget/home_search_suggestion.dart index 4df38491..0160e2f1 100644 --- a/app/lib/widget/home_search_suggestion.dart +++ b/app/lib/widget/home_search_suggestion.dart @@ -17,6 +17,9 @@ import 'package:nc_photos/widget/page_visibility_mixin.dart'; import 'package:nc_photos/widget/person_browser.dart'; import 'package:nc_photos/widget/place_browser.dart'; import 'package:nc_photos/widget/tag_browser.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'home_search_suggestion.g.dart'; class HomeSearchSuggestionController { void search(String phrase) { @@ -40,6 +43,7 @@ class HomeSearchSuggestion extends StatefulWidget { final HomeSearchSuggestionController controller; } +@npLog class _HomeSearchSuggestionState extends State with RouteAware, PageVisibilityMixin { @override @@ -171,9 +175,6 @@ class _HomeSearchSuggestionState extends State late final HomeSearchSuggestionBloc _bloc; var _items = <_ListItem>[]; - - static final _log = - Logger("widget.home_search_suggestion._HomeSearchSuggestionState"); } abstract class _ListItem { diff --git a/app/lib/widget/home_search_suggestion.g.dart b/app/lib/widget/home_search_suggestion.g.dart new file mode 100644 index 00000000..f8cc1cb6 --- /dev/null +++ b/app/lib/widget/home_search_suggestion.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'home_search_suggestion.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_HomeSearchSuggestionState = + Logger("widget.home_search_suggestion._HomeSearchSuggestionState"); + +extension _$_HomeSearchSuggestionStateNpLog on _HomeSearchSuggestionState { + // ignore: unused_element + Logger get _log => _$log_HomeSearchSuggestionState; +} diff --git a/app/lib/widget/image_editor/crop_controller.dart b/app/lib/widget/image_editor/crop_controller.dart index b4dd8a24..6042f31b 100644 --- a/app/lib/widget/image_editor/crop_controller.dart +++ b/app/lib/widget/image_editor/crop_controller.dart @@ -5,6 +5,9 @@ import 'package:logging/logging.dart'; import 'package:nc_photos/pixel_image_provider.dart'; import 'package:nc_photos/widget/image_editor/transform_toolbar.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'crop_controller.g.dart'; /// Crop editor /// @@ -25,6 +28,7 @@ class CropController extends StatefulWidget { final ValueChanged? onCropChanged; } +@npLog class _CropControllerState extends State { @override initState() { @@ -397,8 +401,6 @@ class _CropControllerState extends State { Orientation? _prevOrientation; static const _threshold = 24; - static final _log = - Logger("widget.image_editor.crop_controller._CropControllerState"); } class _TouchDot extends StatelessWidget { diff --git a/app/lib/widget/image_editor/crop_controller.g.dart b/app/lib/widget/image_editor/crop_controller.g.dart new file mode 100644 index 00000000..e00f7b78 --- /dev/null +++ b/app/lib/widget/image_editor/crop_controller.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'crop_controller.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_CropControllerState = + Logger("widget.image_editor.crop_controller._CropControllerState"); + +extension _$_CropControllerStateNpLog on _CropControllerState { + // ignore: unused_element + Logger get _log => _$log_CropControllerState; +} diff --git a/app/lib/widget/image_editor_persist_option_dialog.dart b/app/lib/widget/image_editor_persist_option_dialog.dart index d83c2f4e..eb68dd6d 100644 --- a/app/lib/widget/image_editor_persist_option_dialog.dart +++ b/app/lib/widget/image_editor_persist_option_dialog.dart @@ -9,7 +9,11 @@ import 'package:nc_photos/help_utils.dart' as help_util; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/url_launcher_util.dart'; +import 'package:np_codegen/np_codegen.dart'; +part 'image_editor_persist_option_dialog.g.dart'; + +@npLog class ImageEditorPersistOptionDialog extends StatelessWidget { const ImageEditorPersistOptionDialog({ super.key, @@ -75,7 +79,4 @@ class ImageEditorPersistOptionDialog extends StatelessWidget { /// Whether this dialog is displayed in editor or enhancer final bool isFromEditor; - - static final _log = Logger( - "widget.image_editor_persist_option_dialog.ImageEditorPersistOptionDialog"); } diff --git a/app/lib/widget/image_editor_persist_option_dialog.g.dart b/app/lib/widget/image_editor_persist_option_dialog.g.dart new file mode 100644 index 00000000..f1edbc0e --- /dev/null +++ b/app/lib/widget/image_editor_persist_option_dialog.g.dart @@ -0,0 +1,17 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'image_editor_persist_option_dialog.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logImageEditorPersistOptionDialog = Logger( + "widget.image_editor_persist_option_dialog.ImageEditorPersistOptionDialog"); + +extension _$ImageEditorPersistOptionDialogNpLog + on ImageEditorPersistOptionDialog { + // ignore: unused_element + Logger get _log => _$logImageEditorPersistOptionDialog; +} diff --git a/app/lib/widget/image_enhancer.dart b/app/lib/widget/image_enhancer.dart index 01427d6b..49ab23a2 100644 --- a/app/lib/widget/image_enhancer.dart +++ b/app/lib/widget/image_enhancer.dart @@ -29,6 +29,9 @@ import 'package:nc_photos/widget/selectable.dart'; import 'package:nc_photos/widget/settings.dart'; import 'package:nc_photos/widget/stateful_slider.dart'; import 'package:nc_photos_plugin/nc_photos_plugin.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'image_enhancer.g.dart'; class ImageEnhancerArguments { const ImageEnhancerArguments(this.account, this.file, this.isSaveToServer); @@ -71,6 +74,7 @@ class ImageEnhancer extends StatefulWidget { final bool isSaveToServer; } +@npLog class _ImageEnhancerState extends State { @override initState() { @@ -564,8 +568,6 @@ class _ImageEnhancerState extends State { late final DiContainer _c; late var _selectedOption = _options[0]; late final _pageController = PageController(keepPage: false); - - static final _log = Logger("widget.image_enhancer._ImageEnhancerState"); } enum _Algorithm { @@ -863,6 +865,7 @@ class _StylePicker extends StatefulWidget { createState() => _StylePickerState(); } +@npLog class _StylePickerState extends State<_StylePicker> { @override build(BuildContext context) { @@ -1016,6 +1019,4 @@ class _StylePickerState extends State<_StylePicker> { "file:///android_asset/tf/arbitrary-style-transfer/5.jpg", "file:///android_asset/tf/arbitrary-style-transfer/6.jpg", ]; - - static final _log = Logger("widget.image_enhancer._StylePickerState"); } diff --git a/app/lib/widget/image_enhancer.g.dart b/app/lib/widget/image_enhancer.g.dart new file mode 100644 index 00000000..a9b751c9 --- /dev/null +++ b/app/lib/widget/image_enhancer.g.dart @@ -0,0 +1,25 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'image_enhancer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ImageEnhancerState = + Logger("widget.image_enhancer._ImageEnhancerState"); + +extension _$_ImageEnhancerStateNpLog on _ImageEnhancerState { + // ignore: unused_element + Logger get _log => _$log_ImageEnhancerState; +} + +// ignore: non_constant_identifier_names +final _$log_StylePickerState = + Logger("widget.image_enhancer._StylePickerState"); + +extension _$_StylePickerStateNpLog on _StylePickerState { + // ignore: unused_element + Logger get _log => _$log_StylePickerState; +} diff --git a/app/lib/widget/image_viewer.dart b/app/lib/widget/image_viewer.dart index c8267828..b1643886 100644 --- a/app/lib/widget/image_viewer.dart +++ b/app/lib/widget/image_viewer.dart @@ -11,6 +11,9 @@ import 'package:nc_photos/entity/local_file.dart'; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/mobile/android/content_uri_image_provider.dart'; import 'package:nc_photos/widget/cached_network_image_mod.dart' as mod; +import 'package:np_codegen/np_codegen.dart'; + +part 'image_viewer.g.dart'; class LocalImageViewer extends StatefulWidget { const LocalImageViewer({ @@ -34,6 +37,7 @@ class LocalImageViewer extends StatefulWidget { final VoidCallback? onZoomEnded; } +@npLog class _LocalImageViewerState extends State { @override build(BuildContext context) { @@ -71,8 +75,6 @@ class _LocalImageViewerState extends State { } var _isLoaded = false; - - static final _log = Logger("widget.image_viewer._LocalImageViewerState"); } class RemoteImageViewer extends StatefulWidget { @@ -108,6 +110,7 @@ class RemoteImageViewer extends StatefulWidget { final VoidCallback? onZoomEnded; } +@npLog class _RemoteImageViewerState extends State { @override build(BuildContext context) => _ImageViewer( @@ -144,8 +147,6 @@ class _RemoteImageViewerState extends State { } var _isLoaded = false; - - static final _log = Logger("widget.image_viewer._RemoteImageViewerState"); } class _ImageViewer extends StatefulWidget { @@ -168,6 +169,7 @@ class _ImageViewer extends StatefulWidget { final VoidCallback? onZoomEnded; } +@npLog class _ImageViewerState extends State<_ImageViewer> with TickerProviderStateMixin { @override @@ -325,8 +327,6 @@ class _ImageViewerState extends State<_ImageViewer> int _finger = 0; var _prevFingerPosition = const Offset(0, 0); - - static final _log = Logger("widget.image_viewer._ImageViewerState"); } String _getImageUrl(Account account, FileDescriptor file) { diff --git a/app/lib/widget/image_viewer.g.dart b/app/lib/widget/image_viewer.g.dart new file mode 100644 index 00000000..656e441a --- /dev/null +++ b/app/lib/widget/image_viewer.g.dart @@ -0,0 +1,33 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'image_viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_LocalImageViewerState = + Logger("widget.image_viewer._LocalImageViewerState"); + +extension _$_LocalImageViewerStateNpLog on _LocalImageViewerState { + // ignore: unused_element + Logger get _log => _$log_LocalImageViewerState; +} + +// ignore: non_constant_identifier_names +final _$log_RemoteImageViewerState = + Logger("widget.image_viewer._RemoteImageViewerState"); + +extension _$_RemoteImageViewerStateNpLog on _RemoteImageViewerState { + // ignore: unused_element + Logger get _log => _$log_RemoteImageViewerState; +} + +// ignore: non_constant_identifier_names +final _$log_ImageViewerState = Logger("widget.image_viewer._ImageViewerState"); + +extension _$_ImageViewerStateNpLog on _ImageViewerState { + // ignore: unused_element + Logger get _log => _$log_ImageViewerState; +} diff --git a/app/lib/widget/local_file_viewer.dart b/app/lib/widget/local_file_viewer.dart index 910ce992..5b8b6ff9 100644 --- a/app/lib/widget/local_file_viewer.dart +++ b/app/lib/widget/local_file_viewer.dart @@ -10,6 +10,9 @@ import 'package:nc_photos/theme.dart'; import 'package:nc_photos/widget/handler/delete_local_selection_handler.dart'; import 'package:nc_photos/widget/horizontal_page_viewer.dart'; import 'package:nc_photos/widget/image_viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'local_file_viewer.g.dart'; class LocalFileViewerArguments { LocalFileViewerArguments(this.streamFiles, this.startIndex); @@ -45,6 +48,7 @@ class LocalFileViewer extends StatefulWidget { final int startIndex; } +@npLog class _LocalFileViewerState extends State { @override build(BuildContext context) { @@ -221,8 +225,6 @@ class _LocalFileViewerState extends State { bool _isViewerLoaded = false; final _pageStates = {}; - static final _log = Logger("widget.local_file_viewer._LocalFileViewerState"); - static const _viewportFraction = 1.05; } diff --git a/app/lib/widget/local_file_viewer.g.dart b/app/lib/widget/local_file_viewer.g.dart new file mode 100644 index 00000000..72eb0abc --- /dev/null +++ b/app/lib/widget/local_file_viewer.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'local_file_viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_LocalFileViewerState = + Logger("widget.local_file_viewer._LocalFileViewerState"); + +extension _$_LocalFileViewerStateNpLog on _LocalFileViewerState { + // ignore: unused_element + Logger get _log => _$log_LocalFileViewerState; +} diff --git a/app/lib/widget/measurable_item_list.dart b/app/lib/widget/measurable_item_list.dart index bbac1c4b..d4f4f4a4 100644 --- a/app/lib/widget/measurable_item_list.dart +++ b/app/lib/widget/measurable_item_list.dart @@ -2,8 +2,11 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/widget/measureable_sliver_staggered_grid.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:uuid/uuid.dart'; +part 'measurable_item_list.g.dart'; + abstract class MeasurableItemListState { void updateListHeight(); } @@ -30,6 +33,7 @@ class MeasurableItemList extends StatefulWidget { final ValueChanged? onMaxExtentChanged; } +@npLog class _MeasurableItemListState extends State with WidgetsBindingObserver implements MeasurableItemListState { @@ -130,9 +134,6 @@ class _MeasurableItemListState extends State // this unique token is there to keep the global key unique final _uniqueToken = const Uuid().v4(); late _GridKey _gridKey; - - static final _log = - Logger("widget.measurable_item_list._MeasurableItemListState"); } class _GridKey extends GlobalObjectKey { diff --git a/app/lib/widget/measurable_item_list.g.dart b/app/lib/widget/measurable_item_list.g.dart new file mode 100644 index 00000000..35732817 --- /dev/null +++ b/app/lib/widget/measurable_item_list.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'measurable_item_list.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_MeasurableItemListState = + Logger("widget.measurable_item_list._MeasurableItemListState"); + +extension _$_MeasurableItemListStateNpLog on _MeasurableItemListState { + // ignore: unused_element + Logger get _log => _$log_MeasurableItemListState; +} diff --git a/app/lib/widget/my_app.dart b/app/lib/widget/my_app.dart index b3eef987..3b928cda 100644 --- a/app/lib/widget/my_app.dart +++ b/app/lib/widget/my_app.dart @@ -43,6 +43,9 @@ import 'package:nc_photos/widget/tag_browser.dart'; import 'package:nc_photos/widget/trashbin_browser.dart'; import 'package:nc_photos/widget/trashbin_viewer.dart'; import 'package:nc_photos/widget/viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'my_app.g.dart'; class MyApp extends StatefulWidget { const MyApp({ @@ -60,6 +63,7 @@ class MyApp extends StatefulWidget { static late BuildContext _globalContext; } +@npLog class _MyAppState extends State implements SnackBarHandler, NavigationHandler { @override @@ -658,8 +662,6 @@ class _MyAppState extends State late AppEventListener _themeChangedListener; late AppEventListener _langChangedListener; - - static final _log = Logger("widget.my_app.MyAppState"); } class _MyScrollBehavior extends MaterialScrollBehavior { diff --git a/app/lib/widget/my_app.g.dart b/app/lib/widget/my_app.g.dart new file mode 100644 index 00000000..d8fe2138 --- /dev/null +++ b/app/lib/widget/my_app.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'my_app.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_MyAppState = Logger("widget.my_app._MyAppState"); + +extension _$_MyAppStateNpLog on _MyAppState { + // ignore: unused_element + Logger get _log => _$log_MyAppState; +} diff --git a/app/lib/widget/new_album_dialog.dart b/app/lib/widget/new_album_dialog.dart index 8e959145..c2edfdbd 100644 --- a/app/lib/widget/new_album_dialog.dart +++ b/app/lib/widget/new_album_dialog.dart @@ -19,6 +19,9 @@ import 'package:nc_photos/use_case/create_album.dart'; import 'package:nc_photos/widget/album_dir_picker.dart'; import 'package:nc_photos/widget/processing_dialog.dart'; import 'package:nc_photos/widget/tag_picker_dialog.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'new_album_dialog.g.dart'; /// Dialog to create a new album /// @@ -38,6 +41,7 @@ class NewAlbumDialog extends StatefulWidget { final bool isAllowDynamic; } +@npLog class _NewAlbumDialogState extends State { _NewAlbumDialogState() { final c = KiwiContainer().resolve(); @@ -245,8 +249,6 @@ class _NewAlbumDialogState extends State { final _formValue = _FormValue(); var _isVisible = true; - - static final _log = Logger("widget.new_album_dialog._NewAlbumDialogState"); } class _FormValue { diff --git a/app/lib/widget/new_album_dialog.g.dart b/app/lib/widget/new_album_dialog.g.dart new file mode 100644 index 00000000..ac865f89 --- /dev/null +++ b/app/lib/widget/new_album_dialog.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'new_album_dialog.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_NewAlbumDialogState = + Logger("widget.new_album_dialog._NewAlbumDialogState"); + +extension _$_NewAlbumDialogStateNpLog on _NewAlbumDialogState { + // ignore: unused_element + Logger get _log => _$log_NewAlbumDialogState; +} diff --git a/app/lib/widget/people_browser.dart b/app/lib/widget/people_browser.dart index 36e5955e..96c351b6 100644 --- a/app/lib/widget/people_browser.dart +++ b/app/lib/widget/people_browser.dart @@ -17,6 +17,9 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/theme.dart'; import 'package:nc_photos/widget/collection_list_item.dart'; import 'package:nc_photos/widget/person_browser.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'people_browser.g.dart'; class PeopleBrowserArguments { const PeopleBrowserArguments(this.account); @@ -49,6 +52,7 @@ class PeopleBrowser extends StatefulWidget { final Account account; } +@npLog class _PeopleBrowserState extends State { @override initState() { @@ -179,8 +183,6 @@ class _PeopleBrowserState extends State { late final _bloc = ListPersonBloc(KiwiContainer().resolve()); var _items = <_ListItem>[]; - - static final _log = Logger("widget.people_browser._PeopleBrowserState"); } abstract class _ListItem { diff --git a/app/lib/widget/people_browser.g.dart b/app/lib/widget/people_browser.g.dart new file mode 100644 index 00000000..4dc7fb89 --- /dev/null +++ b/app/lib/widget/people_browser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'people_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_PeopleBrowserState = + Logger("widget.people_browser._PeopleBrowserState"); + +extension _$_PeopleBrowserStateNpLog on _PeopleBrowserState { + // ignore: unused_element + Logger get _log => _$log_PeopleBrowserState; +} diff --git a/app/lib/widget/person_browser.dart b/app/lib/widget/person_browser.dart index 6f9008ff..cf7308ff 100644 --- a/app/lib/widget/person_browser.dart +++ b/app/lib/widget/person_browser.dart @@ -40,6 +40,9 @@ import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/viewer.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'person_browser.g.dart'; class PersonBrowserArguments { PersonBrowserArguments(this.account, this.person); @@ -76,6 +79,7 @@ class PersonBrowser extends StatefulWidget { final Person person; } +@npLog class _PersonBrowserState extends State with SelectableItemStreamListMixin { _PersonBrowserState() { @@ -459,8 +463,6 @@ class _PersonBrowserState extends State late final _filePropertyUpdatedListener = AppEventListener(_onFilePropertyUpdated); - - static final _log = Logger("widget.person_browser._PersonBrowserState"); } enum _SelectionMenuOption { diff --git a/app/lib/widget/person_browser.g.dart b/app/lib/widget/person_browser.g.dart new file mode 100644 index 00000000..5ec40195 --- /dev/null +++ b/app/lib/widget/person_browser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'person_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_PersonBrowserState = + Logger("widget.person_browser._PersonBrowserState"); + +extension _$_PersonBrowserStateNpLog on _PersonBrowserState { + // ignore: unused_element + Logger get _log => _$log_PersonBrowserState; +} diff --git a/app/lib/widget/photo_date_time_edit_dialog.dart b/app/lib/widget/photo_date_time_edit_dialog.dart index a1e89c13..2bd69972 100644 --- a/app/lib/widget/photo_date_time_edit_dialog.dart +++ b/app/lib/widget/photo_date_time_edit_dialog.dart @@ -2,6 +2,9 @@ import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:nc_photos/app_localizations.dart'; import 'package:nc_photos/num_extension.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'photo_date_time_edit_dialog.g.dart'; class PhotoDateTimeEditDialog extends StatefulWidget { const PhotoDateTimeEditDialog({ @@ -15,6 +18,7 @@ class PhotoDateTimeEditDialog extends StatefulWidget { final DateTime initialDateTime; } +@npLog class _PhotoDateTimeEditDialogState extends State { @override build(BuildContext context) { @@ -177,9 +181,6 @@ class _PhotoDateTimeEditDialogState extends State { final _formKey = GlobalKey(); final _formValue = _FormValue(); - - static final _log = Logger( - "widget.photo_date_time_edit_dialog._PhotoDateTimeEditDialogState"); } class _FormValue { diff --git a/app/lib/widget/photo_date_time_edit_dialog.g.dart b/app/lib/widget/photo_date_time_edit_dialog.g.dart new file mode 100644 index 00000000..f26a276d --- /dev/null +++ b/app/lib/widget/photo_date_time_edit_dialog.g.dart @@ -0,0 +1,17 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'photo_date_time_edit_dialog.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_PhotoDateTimeEditDialogState = + Logger("widget.photo_date_time_edit_dialog._PhotoDateTimeEditDialogState"); + +extension _$_PhotoDateTimeEditDialogStateNpLog + on _PhotoDateTimeEditDialogState { + // ignore: unused_element + Logger get _log => _$log_PhotoDateTimeEditDialogState; +} diff --git a/app/lib/widget/photo_list_util.dart b/app/lib/widget/photo_list_util.dart index 135b5119..f2d2df8a 100644 --- a/app/lib/widget/photo_list_util.dart +++ b/app/lib/widget/photo_list_util.dart @@ -8,6 +8,9 @@ import 'package:nc_photos/entity/album/cover_provider.dart'; import 'package:nc_photos/entity/album/provider.dart'; import 'package:nc_photos/entity/album/sort_provider.dart'; import 'package:nc_photos/entity/file_descriptor.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'photo_list_util.g.dart'; class DateGroupHelper { DateGroupHelper({ @@ -33,6 +36,7 @@ class DateGroupHelper { /// Build memory album from files /// /// Feb 29 is treated as Mar 1 on non leap years +@npLog class MemoryAlbumHelper { MemoryAlbumHelper({ DateTime? today, @@ -91,8 +95,6 @@ class MemoryAlbumHelper { final DateTime today; final int dayRange; final _data = {}; - - static final _log = Logger("widget.photo_list_util.MemoryAlbumHelper"); } int getThumbSize(int zoomLevel) { diff --git a/app/lib/widget/photo_list_util.g.dart b/app/lib/widget/photo_list_util.g.dart new file mode 100644 index 00000000..2c6ca7b4 --- /dev/null +++ b/app/lib/widget/photo_list_util.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'photo_list_util.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logMemoryAlbumHelper = + Logger("widget.photo_list_util.MemoryAlbumHelper"); + +extension _$MemoryAlbumHelperNpLog on MemoryAlbumHelper { + // ignore: unused_element + Logger get _log => _$logMemoryAlbumHelper; +} diff --git a/app/lib/widget/place_browser.dart b/app/lib/widget/place_browser.dart index 5782634d..0d9b434f 100644 --- a/app/lib/widget/place_browser.dart +++ b/app/lib/widget/place_browser.dart @@ -32,6 +32,9 @@ import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/viewer.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'place_browser.g.dart'; class PlaceBrowserArguments { const PlaceBrowserArguments(this.account, this.place, this.countryCode); @@ -71,6 +74,7 @@ class PlaceBrowser extends StatefulWidget { final String countryCode; } +@npLog class _PlaceBrowserState extends State with SelectableItemStreamListMixin { _PlaceBrowserState() { @@ -398,8 +402,6 @@ class _PlaceBrowserState extends State var _thumbZoomLevel = 0; int get _thumbSize => photo_list_util.getThumbSize(_thumbZoomLevel); - - static final _log = Logger("widget.place_browser._PlaceBrowserState"); } enum _SelectionMenuOption { diff --git a/app/lib/widget/place_browser.g.dart b/app/lib/widget/place_browser.g.dart new file mode 100644 index 00000000..d7e983c8 --- /dev/null +++ b/app/lib/widget/place_browser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'place_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_PlaceBrowserState = + Logger("widget.place_browser._PlaceBrowserState"); + +extension _$_PlaceBrowserStateNpLog on _PlaceBrowserState { + // ignore: unused_element + Logger get _log => _$log_PlaceBrowserState; +} diff --git a/app/lib/widget/places_browser.dart b/app/lib/widget/places_browser.dart index 7b9629b7..3fdd5fea 100644 --- a/app/lib/widget/places_browser.dart +++ b/app/lib/widget/places_browser.dart @@ -22,6 +22,9 @@ import 'package:nc_photos/use_case/list_location_group.dart'; import 'package:nc_photos/widget/about_geocoding_dialog.dart'; import 'package:nc_photos/widget/collection_list_item.dart'; import 'package:nc_photos/widget/place_browser.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'places_browser.g.dart'; class PlacesBrowserArguments { const PlacesBrowserArguments(this.account); @@ -54,6 +57,7 @@ class PlacesBrowser extends StatefulWidget { final Account account; } +@npLog class _PlacesBrowserState extends State { @override initState() { @@ -241,8 +245,6 @@ class _PlacesBrowserState extends State { var _placeItems = <_PlaceItem>[]; var _countryItems = <_CountryItem>[]; - - static final _log = Logger("widget.places_browser._PlacesBrowserState"); } class _PlaceItem { diff --git a/app/lib/widget/places_browser.g.dart b/app/lib/widget/places_browser.g.dart new file mode 100644 index 00000000..ff51936e --- /dev/null +++ b/app/lib/widget/places_browser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'places_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_PlacesBrowserState = + Logger("widget.places_browser._PlacesBrowserState"); + +extension _$_PlacesBrowserStateNpLog on _PlacesBrowserState { + // ignore: unused_element + Logger get _log => _$log_PlacesBrowserState; +} diff --git a/app/lib/widget/result_viewer.dart b/app/lib/widget/result_viewer.dart index 8617b7a2..2ec984c7 100644 --- a/app/lib/widget/result_viewer.dart +++ b/app/lib/widget/result_viewer.dart @@ -12,6 +12,9 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/theme.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; import 'package:nc_photos/widget/viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'result_viewer.g.dart'; class ResultViewerArguments { const ResultViewerArguments(this.resultUrl); @@ -45,6 +48,7 @@ class ResultViewer extends StatefulWidget { final String resultUrl; } +@npLog class _ResultViewerState extends State { @override initState() { @@ -123,6 +127,4 @@ class _ResultViewerState extends State { late final DiContainer _c; Account? _account; File? _file; - - static final _log = Logger("widget.result_viewer._ResultViewerState"); } diff --git a/app/lib/widget/result_viewer.g.dart b/app/lib/widget/result_viewer.g.dart new file mode 100644 index 00000000..43cfc790 --- /dev/null +++ b/app/lib/widget/result_viewer.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'result_viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ResultViewerState = + Logger("widget.result_viewer._ResultViewerState"); + +extension _$_ResultViewerStateNpLog on _ResultViewerState { + // ignore: unused_element + Logger get _log => _$log_ResultViewerState; +} diff --git a/app/lib/widget/root_picker.dart b/app/lib/widget/root_picker.dart index ec0190cf..091d4835 100644 --- a/app/lib/widget/root_picker.dart +++ b/app/lib/widget/root_picker.dart @@ -13,6 +13,9 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/use_case/ls_single_file.dart'; import 'package:nc_photos/widget/dir_picker.dart'; import 'package:nc_photos/widget/processing_dialog.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'root_picker.g.dart'; class RootPickerArguments { RootPickerArguments(this.account); @@ -45,6 +48,7 @@ class RootPicker extends StatefulWidget { final Account account; } +@npLog class _RootPickerState extends State { @override initState() { @@ -208,6 +212,4 @@ class _RootPickerState extends State { List? _initialPicks; bool _isInitDialogShown = false; - - static final _log = Logger("widget.root_picker._RootPickerState"); } diff --git a/app/lib/widget/root_picker.g.dart b/app/lib/widget/root_picker.g.dart new file mode 100644 index 00000000..af79f58e --- /dev/null +++ b/app/lib/widget/root_picker.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'root_picker.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_RootPickerState = Logger("widget.root_picker._RootPickerState"); + +extension _$_RootPickerStateNpLog on _RootPickerState { + // ignore: unused_element + Logger get _log => _$log_RootPickerState; +} diff --git a/app/lib/widget/search_landing.dart b/app/lib/widget/search_landing.dart index 820e1120..e211cdfb 100644 --- a/app/lib/widget/search_landing.dart +++ b/app/lib/widget/search_landing.dart @@ -26,6 +26,9 @@ import 'package:nc_photos/widget/people_browser.dart'; import 'package:nc_photos/widget/person_browser.dart'; import 'package:nc_photos/widget/place_browser.dart'; import 'package:nc_photos/widget/places_browser.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'search_landing.g.dart'; class SearchLanding extends StatefulWidget { const SearchLanding({ @@ -43,6 +46,7 @@ class SearchLanding extends StatefulWidget { final VoidCallback? onVideoPressed; } +@npLog class _SearchLandingState extends State { @override initState() { @@ -295,8 +299,6 @@ class _SearchLandingState extends State { var _personItems = <_LandingPersonItem>[]; var _locationItems = <_LandingLocationItem>[]; - - static final _log = Logger("widget.search_landing._SearchLandingState"); } class _LandingPersonItem { diff --git a/app/lib/widget/search_landing.g.dart b/app/lib/widget/search_landing.g.dart new file mode 100644 index 00000000..9e1607cd --- /dev/null +++ b/app/lib/widget/search_landing.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'search_landing.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SearchLandingState = + Logger("widget.search_landing._SearchLandingState"); + +extension _$_SearchLandingStateNpLog on _SearchLandingState { + // ignore: unused_element + Logger get _log => _$log_SearchLandingState; +} diff --git a/app/lib/widget/selectable_item_stream_list_mixin.dart b/app/lib/widget/selectable_item_stream_list_mixin.dart index fa767854..3eca4af2 100644 --- a/app/lib/widget/selectable_item_stream_list_mixin.dart +++ b/app/lib/widget/selectable_item_stream_list_mixin.dart @@ -12,9 +12,12 @@ import 'package:nc_photos/session_storage.dart'; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/widget/measurable_item_list.dart'; import 'package:nc_photos/widget/selectable.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:uuid/uuid.dart'; import 'package:visibility_detector/visibility_detector.dart'; +part 'selectable_item_stream_list_mixin.g.dart'; + abstract class SelectableItem { const SelectableItem(); @@ -25,6 +28,7 @@ abstract class SelectableItem { StaggeredTile get staggeredTile => const StaggeredTile.count(1, 1); } +@npLog mixin SelectableItemStreamListMixin on State { @override initState() { @@ -301,7 +305,4 @@ mixin SelectableItemStreamListMixin on State { /// used to gain focus on web for keyboard support final _keyboardFocus = FocusNode(); - - static final _log = Logger( - "widget.selectable_item_stream_list_mixin.SelectableItemStreamListMixin"); } diff --git a/app/lib/widget/selectable_item_stream_list_mixin.g.dart b/app/lib/widget/selectable_item_stream_list_mixin.g.dart new file mode 100644 index 00000000..f976d7cb --- /dev/null +++ b/app/lib/widget/selectable_item_stream_list_mixin.g.dart @@ -0,0 +1,17 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'selectable_item_stream_list_mixin.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logSelectableItemStreamListMixin = Logger( + "widget.selectable_item_stream_list_mixin.SelectableItemStreamListMixin"); + +extension _$SelectableItemStreamListMixinNpLog + on SelectableItemStreamListMixin { + // ignore: unused_element + Logger get _log => _$logSelectableItemStreamListMixin; +} diff --git a/app/lib/widget/settings.dart b/app/lib/widget/settings.dart index 0fe93277..712b5a01 100644 --- a/app/lib/widget/settings.dart +++ b/app/lib/widget/settings.dart @@ -31,9 +31,12 @@ import 'package:nc_photos/widget/settings/theme_settings.dart'; import 'package:nc_photos/widget/share_folder_picker.dart'; import 'package:nc_photos/widget/simple_input_dialog.dart'; import 'package:nc_photos/widget/stateful_slider.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:screen_brightness/screen_brightness.dart'; import 'package:tuple/tuple.dart'; +part 'settings.g.dart'; + class SettingsArguments { SettingsArguments(this.account); @@ -64,6 +67,7 @@ class Settings extends StatefulWidget { final Account account; } +@npLog class _SettingsState extends State { @override initState() { @@ -423,8 +427,6 @@ class _SettingsState extends State { late final _prefUpdatedListener = AppEventListener(_onPrefUpdated); - static final _log = Logger("widget.settings._SettingsState"); - static const String _sourceRepo = "https://bit.ly/3LQerBv"; static const String _bugReportUrl = "https://bit.ly/3NANrr7"; static const String _translationUrl = "https://bit.ly/3NwmdSw"; @@ -462,6 +464,7 @@ class AccountSettingsWidget extends StatefulWidget { final Account account; } +@npLog class _AccountSettingsState extends State { @override initState() { @@ -690,8 +693,6 @@ class _AccountSettingsState extends State { late bool _isEnableFaceRecognitionApp; late String _shareFolder; late String? _label; - - static final _log = Logger("widget.settings._AccountSettingsState"); } class _ShareFolderDialog extends StatefulWidget { @@ -771,6 +772,7 @@ class _PhotosSettings extends StatefulWidget { final Account account; } +@npLog class _PhotosSettingsState extends State<_PhotosSettings> { @override initState() { @@ -890,8 +892,6 @@ class _PhotosSettingsState extends State<_PhotosSettings> { late bool _isEnableMemoryAlbum; late int _memoriesRange; - - static final _log = Logger("widget.settings._PhotosSettingsState"); } class _MemoriesRangeSlider extends StatefulWidget { @@ -949,6 +949,7 @@ class _ViewerSettings extends StatefulWidget { createState() => _ViewerSettingsState(); } +@npLog class _ViewerSettingsState extends State<_ViewerSettings> { @override initState() { @@ -1145,8 +1146,6 @@ class _ViewerSettingsState extends State<_ViewerSettings> { late int _screenBrightness; late bool _isForceRotation; late GpsMapProvider _gpsMapProvider; - - static final _log = Logger("widget.settings._ViewerSettingsState"); } class _AlbumSettings extends StatefulWidget { @@ -1154,6 +1153,7 @@ class _AlbumSettings extends StatefulWidget { createState() => _AlbumSettingsState(); } +@npLog class _AlbumSettingsState extends State<_AlbumSettings> { @override initState() { @@ -1212,8 +1212,6 @@ class _AlbumSettingsState extends State<_AlbumSettings> { } late bool _isBrowserShowDate; - - static final _log = Logger("widget.settings._AlbumSettingsState"); } class EnhancementSettings extends StatefulWidget { @@ -1231,6 +1229,7 @@ class EnhancementSettings extends StatefulWidget { createState() => _EnhancementSettingsState(); } +@npLog class _EnhancementSettingsState extends State { @override initState() { @@ -1366,8 +1365,6 @@ class _EnhancementSettingsState extends State { late int _maxWidth; late int _maxHeight; late bool _isSaveEditResultToServer; - - static final _log = Logger("widget.settings._EnhancementSettingsState"); } class _EnhanceResolutionSlider extends StatefulWidget { @@ -1469,6 +1466,7 @@ class _MiscSettings extends StatefulWidget { createState() => _MiscSettingsState(); } +@npLog class _MiscSettingsState extends State<_MiscSettings> { @override initState() { @@ -1549,8 +1547,6 @@ class _MiscSettingsState extends State<_MiscSettings> { late bool _isPhotosTabSortByName; late bool _isDoubleTapExit; - - static final _log = Logger("widget.settings._MiscSettingsState"); } class _ExperimentalSettings extends StatefulWidget { @@ -1558,6 +1554,7 @@ class _ExperimentalSettings extends StatefulWidget { createState() => _ExperimentalSettingsState(); } +@npLog class _ExperimentalSettingsState extends State<_ExperimentalSettings> { @override initState() { @@ -1617,8 +1614,6 @@ class _ExperimentalSettingsState extends State<_ExperimentalSettings> { } late bool _isEnableSharedAlbum; - - static final _log = Logger("widget.settings._ExperimentalSettingsState"); } class _DevSettings extends StatefulWidget { @@ -1626,6 +1621,7 @@ class _DevSettings extends StatefulWidget { createState() => _DevSettingsState(); } +@npLog class _DevSettingsState extends State<_DevSettings> { @override build(BuildContext context) { @@ -1702,8 +1698,6 @@ class _DevSettingsState extends State<_DevSettings> { _log.shout("[_runSqlVacuum] Uncaught exception", e, stackTrace); } } - - static final _log = Logger("widget.settings._DevSettingsState"); } Widget _buildCaption(BuildContext context, String label) { diff --git a/app/lib/widget/settings.g.dart b/app/lib/widget/settings.g.dart new file mode 100644 index 00000000..59579679 --- /dev/null +++ b/app/lib/widget/settings.g.dart @@ -0,0 +1,84 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'settings.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SettingsState = Logger("widget.settings._SettingsState"); + +extension _$_SettingsStateNpLog on _SettingsState { + // ignore: unused_element + Logger get _log => _$log_SettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_AccountSettingsState = + Logger("widget.settings._AccountSettingsState"); + +extension _$_AccountSettingsStateNpLog on _AccountSettingsState { + // ignore: unused_element + Logger get _log => _$log_AccountSettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_PhotosSettingsState = + Logger("widget.settings._PhotosSettingsState"); + +extension _$_PhotosSettingsStateNpLog on _PhotosSettingsState { + // ignore: unused_element + Logger get _log => _$log_PhotosSettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_ViewerSettingsState = + Logger("widget.settings._ViewerSettingsState"); + +extension _$_ViewerSettingsStateNpLog on _ViewerSettingsState { + // ignore: unused_element + Logger get _log => _$log_ViewerSettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_AlbumSettingsState = Logger("widget.settings._AlbumSettingsState"); + +extension _$_AlbumSettingsStateNpLog on _AlbumSettingsState { + // ignore: unused_element + Logger get _log => _$log_AlbumSettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_EnhancementSettingsState = + Logger("widget.settings._EnhancementSettingsState"); + +extension _$_EnhancementSettingsStateNpLog on _EnhancementSettingsState { + // ignore: unused_element + Logger get _log => _$log_EnhancementSettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_MiscSettingsState = Logger("widget.settings._MiscSettingsState"); + +extension _$_MiscSettingsStateNpLog on _MiscSettingsState { + // ignore: unused_element + Logger get _log => _$log_MiscSettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_ExperimentalSettingsState = + Logger("widget.settings._ExperimentalSettingsState"); + +extension _$_ExperimentalSettingsStateNpLog on _ExperimentalSettingsState { + // ignore: unused_element + Logger get _log => _$log_ExperimentalSettingsState; +} + +// ignore: non_constant_identifier_names +final _$log_DevSettingsState = Logger("widget.settings._DevSettingsState"); + +extension _$_DevSettingsStateNpLog on _DevSettingsState { + // ignore: unused_element + Logger get _log => _$log_DevSettingsState; +} diff --git a/app/lib/widget/settings/theme_settings.dart b/app/lib/widget/settings/theme_settings.dart index 124e8264..ae3ba688 100644 --- a/app/lib/widget/settings/theme_settings.dart +++ b/app/lib/widget/settings/theme_settings.dart @@ -11,6 +11,9 @@ import 'package:nc_photos/platform/k.dart' as platform_k; import 'package:nc_photos/pref.dart'; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/theme.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'theme_settings.g.dart'; class ThemeSettings extends StatefulWidget { const ThemeSettings({super.key}); @@ -19,6 +22,7 @@ class ThemeSettings extends StatefulWidget { createState() => _ThemeSettingsState(); } +@npLog class _ThemeSettingsState extends State { @override initState() { @@ -152,9 +156,6 @@ class _ThemeSettingsState extends State { late bool _isFollowSystemTheme; late bool _isUseBlackInDarkTheme; late Color _seedColor; - - static final _log = - Logger("widget.settings.theme_settings._ThemeSettingsState"); } class _SeedColorPicker extends StatefulWidget { diff --git a/app/lib/widget/settings/theme_settings.g.dart b/app/lib/widget/settings/theme_settings.g.dart new file mode 100644 index 00000000..6da7c9ab --- /dev/null +++ b/app/lib/widget/settings/theme_settings.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'theme_settings.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ThemeSettingsState = + Logger("widget.settings.theme_settings._ThemeSettingsState"); + +extension _$_ThemeSettingsStateNpLog on _ThemeSettingsState { + // ignore: unused_element + Logger get _log => _$log_ThemeSettingsState; +} diff --git a/app/lib/widget/share_album_dialog.dart b/app/lib/widget/share_album_dialog.dart index c20e45ea..5643c057 100644 --- a/app/lib/widget/share_album_dialog.dart +++ b/app/lib/widget/share_album_dialog.dart @@ -20,6 +20,9 @@ import 'package:nc_photos/use_case/share_album_with_user.dart'; import 'package:nc_photos/use_case/unshare_album_with_user.dart'; import 'package:nc_photos/widget/album_share_outlier_browser.dart'; import 'package:nc_photos/widget/dialog_scaffold.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'share_album_dialog.g.dart'; class ShareAlbumDialog extends StatefulWidget { ShareAlbumDialog({ @@ -36,6 +39,7 @@ class ShareAlbumDialog extends StatefulWidget { final Album album; } +@npLog class _ShareAlbumDialogState extends State { _ShareAlbumDialogState() { final c = KiwiContainer().resolve(); @@ -332,9 +336,6 @@ class _ShareAlbumDialogState extends State { late final List<_ShareItem> _items; final _processingSharee = []; final _searchController = TextEditingController(); - - static final _log = - Logger("widget.share_album_dialog._ShareAlbumDialogState"); } class _ShareItem { diff --git a/app/lib/widget/share_album_dialog.g.dart b/app/lib/widget/share_album_dialog.g.dart new file mode 100644 index 00000000..f850b0f9 --- /dev/null +++ b/app/lib/widget/share_album_dialog.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'share_album_dialog.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ShareAlbumDialogState = + Logger("widget.share_album_dialog._ShareAlbumDialogState"); + +extension _$_ShareAlbumDialogStateNpLog on _ShareAlbumDialogState { + // ignore: unused_element + Logger get _log => _$log_ShareAlbumDialogState; +} diff --git a/app/lib/widget/share_folder_picker.dart b/app/lib/widget/share_folder_picker.dart index 4a3b17cf..46d6adee 100644 --- a/app/lib/widget/share_folder_picker.dart +++ b/app/lib/widget/share_folder_picker.dart @@ -9,6 +9,9 @@ import 'package:nc_photos/iterable_extension.dart'; import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/widget/dir_picker.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'share_folder_picker.g.dart'; class ShareFolderPickerArguments { const ShareFolderPickerArguments(this.account, this.initialValue); @@ -45,6 +48,7 @@ class ShareFolderPicker extends StatefulWidget { final String initialValue; } +@npLog class _ShareFolderPickerState extends State { @override build(BuildContext context) { @@ -134,7 +138,4 @@ class _ShareFolderPickerState extends State { } final _pickerKey = GlobalKey(); - - static final _log = - Logger("widget.share_folder_picker._ShareFolderPickerState"); } diff --git a/app/lib/widget/share_folder_picker.g.dart b/app/lib/widget/share_folder_picker.g.dart new file mode 100644 index 00000000..3d0e0c81 --- /dev/null +++ b/app/lib/widget/share_folder_picker.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'share_folder_picker.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ShareFolderPickerState = + Logger("widget.share_folder_picker._ShareFolderPickerState"); + +extension _$_ShareFolderPickerStateNpLog on _ShareFolderPickerState { + // ignore: unused_element + Logger get _log => _$log_ShareFolderPickerState; +} diff --git a/app/lib/widget/shared_file_viewer.dart b/app/lib/widget/shared_file_viewer.dart index f4a75abe..390dd811 100644 --- a/app/lib/widget/shared_file_viewer.dart +++ b/app/lib/widget/shared_file_viewer.dart @@ -22,8 +22,11 @@ import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/use_case/remove.dart'; import 'package:nc_photos/use_case/remove_share.dart'; import 'package:nc_photos/widget/list_tile_center_leading.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; +part 'shared_file_viewer.g.dart'; + class SharedFileViewerArguments { SharedFileViewerArguments(this.account, this.file, this.shares); @@ -63,6 +66,7 @@ class SharedFileViewer extends StatefulWidget { final List shares; } +@npLog class _SharedFileViewerState extends State { @override build(BuildContext context) { @@ -315,9 +319,6 @@ class _SharedFileViewerState extends State { } late final List _shares = List.of(widget.shares); - - static final _log = - Logger("widget.shared_file_viewer._SharedFileViewerState"); } enum _ItemMenuOption { diff --git a/app/lib/widget/shared_file_viewer.g.dart b/app/lib/widget/shared_file_viewer.g.dart new file mode 100644 index 00000000..a2c4d465 --- /dev/null +++ b/app/lib/widget/shared_file_viewer.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'shared_file_viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SharedFileViewerState = + Logger("widget.shared_file_viewer._SharedFileViewerState"); + +extension _$_SharedFileViewerStateNpLog on _SharedFileViewerState { + // ignore: unused_element + Logger get _log => _$log_SharedFileViewerState; +} diff --git a/app/lib/widget/sharing_browser.dart b/app/lib/widget/sharing_browser.dart index 1a8508e7..69b87adf 100644 --- a/app/lib/widget/sharing_browser.dart +++ b/app/lib/widget/sharing_browser.dart @@ -29,6 +29,9 @@ import 'package:nc_photos/widget/album_browser_util.dart' as album_browser_util; import 'package:nc_photos/widget/empty_list_indicator.dart'; import 'package:nc_photos/widget/shared_file_viewer.dart'; import 'package:nc_photos/widget/unbounded_list_tile.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'sharing_browser.g.dart'; class SharingBrowserArguments { SharingBrowserArguments(this.account); @@ -61,6 +64,7 @@ class SharingBrowser extends StatefulWidget { final Account account; } +@npLog class _SharingBrowserState extends State { @override initState() { @@ -321,8 +325,6 @@ class _SharingBrowserState extends State { late final _bloc = ListSharingBloc.of(widget.account); var _items = >[]; - - static final _log = Logger("widget.sharing_browser._SharingBrowserState"); } class _ListTile extends StatelessWidget { diff --git a/app/lib/widget/sharing_browser.g.dart b/app/lib/widget/sharing_browser.g.dart new file mode 100644 index 00000000..a2e5d4a7 --- /dev/null +++ b/app/lib/widget/sharing_browser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sharing_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SharingBrowserState = + Logger("widget.sharing_browser._SharingBrowserState"); + +extension _$_SharingBrowserStateNpLog on _SharingBrowserState { + // ignore: unused_element + Logger get _log => _$log_SharingBrowserState; +} diff --git a/app/lib/widget/sign_in.dart b/app/lib/widget/sign_in.dart index c4da7abd..2116a5b6 100644 --- a/app/lib/widget/sign_in.dart +++ b/app/lib/widget/sign_in.dart @@ -17,6 +17,9 @@ import 'package:nc_photos/theme.dart'; import 'package:nc_photos/widget/connect.dart'; import 'package:nc_photos/widget/home.dart'; import 'package:nc_photos/widget/root_picker.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'sign_in.g.dart'; class SignIn extends StatefulWidget { static const routeName = "/sign-in"; @@ -29,6 +32,7 @@ class SignIn extends StatefulWidget { createState() => _SignInState(); } +@npLog class _SignInState extends State { @override build(BuildContext context) { @@ -191,8 +195,6 @@ class _SignInState extends State { var _isConnecting = false; final _formValue = _FormValue(); - - static final _log = Logger("widget.sign_in._SignInState"); } /// A nice background that matches Nextcloud without breaking any copyright law diff --git a/app/lib/widget/sign_in.g.dart b/app/lib/widget/sign_in.g.dart new file mode 100644 index 00000000..252d2578 --- /dev/null +++ b/app/lib/widget/sign_in.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'sign_in.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SignInState = Logger("widget.sign_in._SignInState"); + +extension _$_SignInStateNpLog on _SignInState { + // ignore: unused_element + Logger get _log => _$log_SignInState; +} diff --git a/app/lib/widget/slideshow_dialog.dart b/app/lib/widget/slideshow_dialog.dart index 4809bb69..61db30dd 100644 --- a/app/lib/widget/slideshow_dialog.dart +++ b/app/lib/widget/slideshow_dialog.dart @@ -5,6 +5,7 @@ import 'package:nc_photos/k.dart' as k; import 'package:nc_photos/num_extension.dart'; import 'package:nc_photos/snack_bar_manager.dart'; import 'package:nc_photos/widget/switch_form_field.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'slideshow_dialog.g.dart'; @@ -52,6 +53,7 @@ class SlideshowDialog extends StatefulWidget { final bool isReverse; } +@npLog class _SlideshowDialogState extends State { @override initState() { @@ -202,8 +204,6 @@ class _SlideshowDialogState extends State { late int _durationSecond; late int _durationMinute; - - static final _log = Logger("widget.slideshow_dialog._SlideshowDialog"); } class _FormValue { diff --git a/app/lib/widget/slideshow_dialog.g.dart b/app/lib/widget/slideshow_dialog.g.dart index 153ca39f..5f89ea97 100644 --- a/app/lib/widget/slideshow_dialog.g.dart +++ b/app/lib/widget/slideshow_dialog.g.dart @@ -2,6 +2,19 @@ part of 'slideshow_dialog.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SlideshowDialogState = + Logger("widget.slideshow_dialog._SlideshowDialogState"); + +extension _$_SlideshowDialogStateNpLog on _SlideshowDialogState { + // ignore: unused_element + Logger get _log => _$log_SlideshowDialogState; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/widget/slideshow_viewer.dart b/app/lib/widget/slideshow_viewer.dart index 4b7b3a6a..4d70cca7 100644 --- a/app/lib/widget/slideshow_viewer.dart +++ b/app/lib/widget/slideshow_viewer.dart @@ -16,6 +16,9 @@ import 'package:nc_photos/widget/slideshow_dialog.dart'; import 'package:nc_photos/widget/video_viewer.dart'; import 'package:nc_photos/widget/viewer_mixin.dart'; import 'package:nc_photos/widget/wakelock_util.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'slideshow_viewer.g.dart'; class SlideshowViewerArguments { SlideshowViewerArguments( @@ -64,6 +67,7 @@ class SlideshowViewer extends StatefulWidget { final SlideshowConfig config; } +@npLog class _SlideshowViewerState extends State with DisposableManagerMixin, @@ -298,7 +302,5 @@ class _SlideshowViewerState extends State // late final _SlideshowController _slideshowController; late final List _shuffledIndex; - static final _log = Logger("widget.slideshow_viewer._SlideshowViewerState"); - static const _viewportFraction = 1.05; } diff --git a/app/lib/widget/slideshow_viewer.g.dart b/app/lib/widget/slideshow_viewer.g.dart new file mode 100644 index 00000000..326a4ceb --- /dev/null +++ b/app/lib/widget/slideshow_viewer.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'slideshow_viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SlideshowViewerState = + Logger("widget.slideshow_viewer._SlideshowViewerState"); + +extension _$_SlideshowViewerStateNpLog on _SlideshowViewerState { + // ignore: unused_element + Logger get _log => _$log_SlideshowViewerState; +} diff --git a/app/lib/widget/smart_album_browser.dart b/app/lib/widget/smart_album_browser.dart index d9b504ea..dd113147 100644 --- a/app/lib/widget/smart_album_browser.dart +++ b/app/lib/widget/smart_album_browser.dart @@ -23,6 +23,7 @@ import 'package:nc_photos/widget/handler/add_selection_to_album_handler.dart'; import 'package:nc_photos/widget/photo_list_item.dart'; import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'smart_album_browser.g.dart'; @@ -61,6 +62,7 @@ class SmartAlbumBrowser extends StatefulWidget { final Album album; } +@npLog class _SmartAlbumBrowserState extends State with SelectableItemStreamListMixin, @@ -327,8 +329,6 @@ class _SmartAlbumBrowserState extends State var _sortedItems = []; var _backingFiles = []; - static final _log = - Logger("widget.smart_album_browser._SmartAlbumBrowserState"); static const _menuValueDownload = 1; } diff --git a/app/lib/widget/smart_album_browser.g.dart b/app/lib/widget/smart_album_browser.g.dart index 1772c795..c18e5dfc 100644 --- a/app/lib/widget/smart_album_browser.g.dart +++ b/app/lib/widget/smart_album_browser.g.dart @@ -2,6 +2,19 @@ part of 'smart_album_browser.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SmartAlbumBrowserState = + Logger("widget.smart_album_browser._SmartAlbumBrowserState"); + +extension _$_SmartAlbumBrowserStateNpLog on _SmartAlbumBrowserState { + // ignore: unused_element + Logger get _log => _$log_SmartAlbumBrowserState; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/widget/splash.dart b/app/lib/widget/splash.dart index 61317b92..ea337122 100644 --- a/app/lib/widget/splash.dart +++ b/app/lib/widget/splash.dart @@ -18,6 +18,7 @@ import 'package:nc_photos/widget/changelog.dart'; import 'package:nc_photos/widget/home.dart'; import 'package:nc_photos/widget/setup.dart'; import 'package:nc_photos/widget/sign_in.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:to_string/to_string.dart'; part 'splash.g.dart'; @@ -33,6 +34,7 @@ class Splash extends StatefulWidget { createState() => _SplashState(); } +@npLog class _SplashState extends State { @override initState() { @@ -268,8 +270,6 @@ class _SplashState extends State { final _changelogCompleter = Completer(); var _isUpgrading = false; late final _upgradeCubit = _UpgradeCubit(); - - static final _log = Logger("widget.splash._SplashState"); } @toString diff --git a/app/lib/widget/splash.g.dart b/app/lib/widget/splash.g.dart index bede28e3..1cd251c5 100644 --- a/app/lib/widget/splash.g.dart +++ b/app/lib/widget/splash.g.dart @@ -2,6 +2,18 @@ part of 'splash.dart'; +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_SplashState = Logger("widget.splash._SplashState"); + +extension _$_SplashStateNpLog on _SplashState { + // ignore: unused_element + Logger get _log => _$log_SplashState; +} + // ************************************************************************** // ToStringGenerator // ************************************************************************** diff --git a/app/lib/widget/tag_browser.dart b/app/lib/widget/tag_browser.dart index f0e88ba7..64ab4357 100644 --- a/app/lib/widget/tag_browser.dart +++ b/app/lib/widget/tag_browser.dart @@ -34,6 +34,9 @@ import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/viewer.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'tag_browser.g.dart'; class TagBrowserArguments { TagBrowserArguments(this.account, this.tag); @@ -69,6 +72,7 @@ class TagBrowser extends StatefulWidget { final Tag tag; } +@npLog class _TagBrowserState extends State with SelectableItemStreamListMixin { _TagBrowserState() { @@ -412,8 +416,6 @@ class _TagBrowserState extends State late final _filePropertyUpdatedListener = AppEventListener(_onFilePropertyUpdated); - - static final _log = Logger("widget.tag_browser._TagBrowserState"); } enum _SelectionMenuOption { diff --git a/app/lib/widget/tag_browser.g.dart b/app/lib/widget/tag_browser.g.dart new file mode 100644 index 00000000..e72eb7d0 --- /dev/null +++ b/app/lib/widget/tag_browser.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'tag_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_TagBrowserState = Logger("widget.tag_browser._TagBrowserState"); + +extension _$_TagBrowserStateNpLog on _TagBrowserState { + // ignore: unused_element + Logger get _log => _$log_TagBrowserState; +} diff --git a/app/lib/widget/trashbin_browser.dart b/app/lib/widget/trashbin_browser.dart index 90387f19..ce3490d1 100644 --- a/app/lib/widget/trashbin_browser.dart +++ b/app/lib/widget/trashbin_browser.dart @@ -30,6 +30,9 @@ import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart'; import 'package:nc_photos/widget/selection_app_bar.dart'; import 'package:nc_photos/widget/trashbin_viewer.dart'; import 'package:nc_photos/widget/zoom_menu_button.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'trashbin_browser.g.dart'; class TrashbinBrowserArguments { TrashbinBrowserArguments(this.account); @@ -61,6 +64,7 @@ class TrashbinBrowser extends StatefulWidget { final Account account; } +@npLog class _TrashbinBrowserState extends State with SelectableItemStreamListMixin { @override @@ -400,8 +404,6 @@ class _TrashbinBrowserState extends State var _thumbZoomLevel = 0; int get _thumbSize => photo_list_util.getThumbSize(_thumbZoomLevel); - - static final _log = Logger("widget.trashbin_browser._TrashbinBrowserState"); } enum _AppBarMenuOption { diff --git a/app/lib/widget/trashbin_browser.g.dart b/app/lib/widget/trashbin_browser.g.dart new file mode 100644 index 00000000..151de25e --- /dev/null +++ b/app/lib/widget/trashbin_browser.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'trashbin_browser.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_TrashbinBrowserState = + Logger("widget.trashbin_browser._TrashbinBrowserState"); + +extension _$_TrashbinBrowserStateNpLog on _TrashbinBrowserState { + // ignore: unused_element + Logger get _log => _$log_TrashbinBrowserState; +} diff --git a/app/lib/widget/trashbin_viewer.dart b/app/lib/widget/trashbin_viewer.dart index b2ae4f1c..781a437f 100644 --- a/app/lib/widget/trashbin_viewer.dart +++ b/app/lib/widget/trashbin_viewer.dart @@ -18,6 +18,9 @@ import 'package:nc_photos/widget/handler/remove_selection_handler.dart'; import 'package:nc_photos/widget/horizontal_page_viewer.dart'; import 'package:nc_photos/widget/image_viewer.dart'; import 'package:nc_photos/widget/video_viewer.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'trashbin_viewer.g.dart'; class TrashbinViewerArguments { TrashbinViewerArguments(this.account, this.streamFiles, this.startIndex); @@ -57,6 +60,7 @@ class TrashbinViewer extends StatefulWidget { final int startIndex; } +@npLog class _TrashbinViewerState extends State { @override build(BuildContext context) { @@ -334,8 +338,6 @@ class _TrashbinViewerState extends State { bool _isViewerLoaded = false; final _pageStates = {}; - static final _log = Logger("widget.trashbin_viewer._TrashbinViewerState"); - static const _viewportFraction = 1.05; } diff --git a/app/lib/widget/trashbin_viewer.g.dart b/app/lib/widget/trashbin_viewer.g.dart new file mode 100644 index 00000000..9487af56 --- /dev/null +++ b/app/lib/widget/trashbin_viewer.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'trashbin_viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_TrashbinViewerState = + Logger("widget.trashbin_viewer._TrashbinViewerState"); + +extension _$_TrashbinViewerStateNpLog on _TrashbinViewerState { + // ignore: unused_element + Logger get _log => _$log_TrashbinViewerState; +} diff --git a/app/lib/widget/video_viewer.dart b/app/lib/widget/video_viewer.dart index 9a397b6d..ed951901 100644 --- a/app/lib/widget/video_viewer.dart +++ b/app/lib/widget/video_viewer.dart @@ -13,8 +13,11 @@ import 'package:nc_photos/use_case/request_public_link.dart'; import 'package:nc_photos/widget/animated_visibility.dart'; import 'package:nc_photos/widget/disposable.dart'; import 'package:nc_photos/widget/wakelock_util.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:video_player/video_player.dart'; +part 'video_viewer.g.dart'; + class VideoViewer extends StatefulWidget { const VideoViewer({ Key? key, @@ -43,6 +46,7 @@ class VideoViewer extends StatefulWidget { final bool canPlay; } +@npLog class _VideoViewerState extends State with DisposableManagerMixin { @override @@ -305,8 +309,6 @@ class _VideoViewerState extends State bool _isControllerInitialized = false; late VideoPlayerController _controller; var _isFinished = false; - - static final _log = Logger("widget.video_viewer._VideoViewerState"); } String _durationToString(Duration duration) { diff --git a/app/lib/widget/video_viewer.g.dart b/app/lib/widget/video_viewer.g.dart new file mode 100644 index 00000000..1d598b33 --- /dev/null +++ b/app/lib/widget/video_viewer.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'video_viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_VideoViewerState = Logger("widget.video_viewer._VideoViewerState"); + +extension _$_VideoViewerStateNpLog on _VideoViewerState { + // ignore: unused_element + Logger get _log => _$log_VideoViewerState; +} diff --git a/app/lib/widget/viewer.dart b/app/lib/widget/viewer.dart index 4fda2a02..7956149e 100644 --- a/app/lib/widget/viewer.dart +++ b/app/lib/widget/viewer.dart @@ -41,6 +41,9 @@ import 'package:nc_photos/widget/video_viewer.dart'; import 'package:nc_photos/widget/viewer_bottom_app_bar.dart'; import 'package:nc_photos/widget/viewer_detail_pane.dart'; import 'package:nc_photos/widget/viewer_mixin.dart'; +import 'package:np_codegen/np_codegen.dart'; + +part 'viewer.g.dart'; class ViewerArguments { ViewerArguments( @@ -94,6 +97,7 @@ class Viewer extends StatefulWidget { final Album? album; } +@npLog class _ViewerState extends State with DisposableManagerMixin, ViewerControllersMixin { @override @@ -879,8 +883,6 @@ class _ViewerState extends State late List _streamFilesView; bool _isStreamFilesCopy = false; - static final _log = Logger("widget.viewer._ViewerState"); - static const _viewportFraction = 1.05; } diff --git a/app/lib/widget/viewer.g.dart b/app/lib/widget/viewer.g.dart new file mode 100644 index 00000000..82e8b8a7 --- /dev/null +++ b/app/lib/widget/viewer.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'viewer.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ViewerState = Logger("widget.viewer._ViewerState"); + +extension _$_ViewerStateNpLog on _ViewerState { + // ignore: unused_element + Logger get _log => _$log_ViewerState; +} diff --git a/app/lib/widget/viewer_detail_pane.dart b/app/lib/widget/viewer_detail_pane.dart index f12ff0dc..7dfa0cc8 100644 --- a/app/lib/widget/viewer_detail_pane.dart +++ b/app/lib/widget/viewer_detail_pane.dart @@ -35,9 +35,12 @@ import 'package:nc_photos/widget/gps_map.dart'; import 'package:nc_photos/widget/handler/add_selection_to_album_handler.dart'; import 'package:nc_photos/widget/list_tile_center_leading.dart'; import 'package:nc_photos/widget/photo_date_time_edit_dialog.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:path/path.dart' as path_lib; import 'package:tuple/tuple.dart'; +part 'viewer_detail_pane.g.dart'; + class ViewerDetailPane extends StatefulWidget { const ViewerDetailPane({ Key? key, @@ -65,6 +68,7 @@ class ViewerDetailPane extends StatefulWidget { final VoidCallback? onSlideshowPressed; } +@npLog class _ViewerDetailPaneState extends State { _ViewerDetailPaneState() { final c = KiwiContainer().resolve(); @@ -496,9 +500,6 @@ class _ViewerDetailPaneState extends State { late final bool _canRemoveFromAlbum = _checkCanRemoveFromAlbum(); var _shouldBlockGpsMap = true; - - static final _log = - Logger("widget.viewer_detail_pane._ViewerDetailPaneState"); } class _DetailPaneButton extends StatelessWidget { diff --git a/app/lib/widget/viewer_detail_pane.g.dart b/app/lib/widget/viewer_detail_pane.g.dart new file mode 100644 index 00000000..1bfc1e09 --- /dev/null +++ b/app/lib/widget/viewer_detail_pane.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'viewer_detail_pane.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$log_ViewerDetailPaneState = + Logger("widget.viewer_detail_pane._ViewerDetailPaneState"); + +extension _$_ViewerDetailPaneStateNpLog on _ViewerDetailPaneState { + // ignore: unused_element + Logger get _log => _$log_ViewerDetailPaneState; +} diff --git a/app/lib/widget/viewer_mixin.dart b/app/lib/widget/viewer_mixin.dart index 768adf8f..458c25a2 100644 --- a/app/lib/widget/viewer_mixin.dart +++ b/app/lib/widget/viewer_mixin.dart @@ -8,8 +8,12 @@ import 'package:nc_photos/platform/k.dart' as platform_k; import 'package:nc_photos/pref.dart'; import 'package:nc_photos/throttler.dart'; import 'package:nc_photos/widget/disposable.dart'; +import 'package:np_codegen/np_codegen.dart'; import 'package:screen_brightness/screen_brightness.dart'; +part 'viewer_mixin.g.dart'; + +@npLog mixin ViewerControllersMixin on DisposableManagerMixin { @override @@ -50,8 +54,6 @@ mixin ViewerControllersMixin } SystemChrome.setPreferredOrientations(prefer); } - - static final _log = Logger("widget.viewer_mixin.ViewerControllersMixin"); } /// Control the screen brightness according to the settings diff --git a/app/lib/widget/viewer_mixin.g.dart b/app/lib/widget/viewer_mixin.g.dart new file mode 100644 index 00000000..0f51af7a --- /dev/null +++ b/app/lib/widget/viewer_mixin.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'viewer_mixin.dart'; + +// ************************************************************************** +// NpLogGenerator +// ************************************************************************** + +// ignore: non_constant_identifier_names +final _$logViewerControllersMixin = + Logger("widget.viewer_mixin.ViewerControllersMixin"); + +extension _$ViewerControllersMixinNpLog on ViewerControllersMixin { + // ignore: unused_element + Logger get _log => _$logViewerControllersMixin; +} diff --git a/app/pubspec.lock b/app/pubspec.lock index 63fe05a0..e63e6431 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -833,6 +833,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.1" + np_codegen: + dependency: "direct dev" + description: + path: "../codegen" + relative: true + source: path + version: "1.0.0" octo_image: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 71954930..db782dbc 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -123,6 +123,8 @@ dev_dependencies: sdk: flutter # integration_test: # sdk: flutter + np_codegen: + path: ../codegen to_string: git: url: https://gitlab.com/nkming2/dart-to-string diff --git a/codegen/.gitignore b/codegen/.gitignore new file mode 100644 index 00000000..65c34dc8 --- /dev/null +++ b/codegen/.gitignore @@ -0,0 +1,10 @@ +# Files and directories created by pub. +.dart_tool/ +.packages + +# Conventional directory for build outputs. +build/ + +# Omit committing pubspec.lock for library packages; see +# https://dart.dev/guides/libraries/private-files#pubspeclock. +pubspec.lock diff --git a/codegen/analysis_options.yaml b/codegen/analysis_options.yaml new file mode 100644 index 00000000..dee8927a --- /dev/null +++ b/codegen/analysis_options.yaml @@ -0,0 +1,30 @@ +# This file configures the static analysis results for your project (errors, +# warnings, and lints). +# +# This enables the 'recommended' set of lints from `package:lints`. +# This set helps identify many issues that may lead to problems when running +# or consuming Dart code, and enforces writing Dart using a single, idiomatic +# style and format. +# +# If you want a smaller set of lints you can change this to specify +# 'package:lints/core.yaml'. These are just the most critical lints +# (the recommended set includes the core lints). +# The core lints are also what is used by pub.dev for scoring packages. + +include: package:lints/recommended.yaml + +# Uncomment the following section to specify additional rules. + +# linter: +# rules: +# - camel_case_types + +# analyzer: +# exclude: +# - path/to/excluded/files/** + +# For more information about the core and recommended set of lints, see +# https://dart.dev/go/core-lints + +# For additional information about configuring this file, see +# https://dart.dev/guides/language/analysis-options diff --git a/codegen/build.yaml b/codegen/build.yaml new file mode 100644 index 00000000..5d1ceab3 --- /dev/null +++ b/codegen/build.yaml @@ -0,0 +1,10 @@ +builders: + np_log: + import: "package:np_codegen/builder.dart" + builder_factories: ["npLogBuilder"] + # The `partId` argument to `SharedPartBuilder` is "some_cool_builder" + build_extensions: {".dart": [".np_log.g.part"]} + auto_apply: dependents + build_to: cache + # To copy the `.g.part` content into `.g.dart` in the source tree + applies_builders: ["source_gen:combining_builder"] diff --git a/codegen/lib/builder.dart b/codegen/lib/builder.dart new file mode 100644 index 00000000..55d4cbb2 --- /dev/null +++ b/codegen/lib/builder.dart @@ -0,0 +1,6 @@ +import 'package:build/build.dart'; +import 'package:np_codegen/src/np_log_generator.dart'; +import 'package:source_gen/source_gen.dart'; + +Builder npLogBuilder(BuilderOptions options) => + SharedPartBuilder([NpLogGenerator()], "np_log"); diff --git a/codegen/lib/np_codegen.dart b/codegen/lib/np_codegen.dart new file mode 100644 index 00000000..67feb773 --- /dev/null +++ b/codegen/lib/np_codegen.dart @@ -0,0 +1,3 @@ +library np_codegen; + +export 'src/np_log_annotations.dart'; diff --git a/codegen/lib/src/np_log_annotations.dart b/codegen/lib/src/np_log_annotations.dart new file mode 100644 index 00000000..75dee954 --- /dev/null +++ b/codegen/lib/src/np_log_annotations.dart @@ -0,0 +1,5 @@ +class NpLog { + const NpLog(); +} + +const npLog = NpLog(); diff --git a/codegen/lib/src/np_log_generator.dart b/codegen/lib/src/np_log_generator.dart new file mode 100644 index 00000000..afb03810 --- /dev/null +++ b/codegen/lib/src/np_log_generator.dart @@ -0,0 +1,58 @@ +import 'package:analyzer/dart/element/element.dart'; +import 'package:build/build.dart'; +import 'package:np_codegen/src/np_log_annotations.dart'; +import 'package:source_gen/source_gen.dart'; + +/// Add a properly tagged logger to a class or extension +/// +/// If used with extension, the extension and the extended class must be in +/// separated file +class NpLogGenerator extends GeneratorForAnnotation { + const NpLogGenerator(); + + @override + dynamic generateForAnnotatedElement( + Element element, + ConstantReader annotation, + BuildStep buildStep, + ) { + if (element is ClassElement) { + final clazz = element; + return """ +// ignore: non_constant_identifier_names +final _\$log${clazz.name} = Logger("${_buildLogTag(clazz)}"); + +extension _\$${clazz.name}NpLog on ${clazz.name} { + // ignore: unused_element + Logger get _log => _\$log${clazz.name}; +} +"""; + } else if (element is ExtensionElement) { + final extension = element; + return """ +// ignore: non_constant_identifier_names +final _\$log${extension.name} = Logger("${_buildLogTag(extension)}"); + +extension _\$${extension.name}NpLog on ${extension.extendedType.element2!.name} { + // ignore: unused_element + Logger get _log => _\$log${extension.name}; +} +"""; + } else { + print("Only class/extension is supported"); + return null; + } + } + + String _buildLogTag(Element clazz) { + // a path looks like this: package:super/my/secret/source.dart + final path = clazz.library!.identifier; + // my/secret/source.dart + final relativePath = path.substring(path.indexOf("/") + 1); + final extSearchFrom = relativePath.lastIndexOf("/") + 1; + final extI = relativePath.indexOf(".", extSearchFrom); + // my.secret.source + final prefix = relativePath.substring(0, extI).replaceAll("/", "."); + return "$prefix.${clazz.name}"; + } +} diff --git a/codegen/pubspec.yaml b/codegen/pubspec.yaml new file mode 100644 index 00000000..7f0b2a84 --- /dev/null +++ b/codegen/pubspec.yaml @@ -0,0 +1,22 @@ +name: np_codegen +description: A starting point for Dart libraries or applications. +version: 1.0.0 +# homepage: https://www.example.com + +environment: + sdk: '>=2.17.0 <3.0.0' + +dependencies: + analyzer: '>=4.0.0' + build: ^2.3.1 + source_gen: ^1.2.6 + +dev_dependencies: + build_test: ^2.1.5 + lints: ^2.0.0 + test: ^1.16.0 + code_gen_tester: + git: + url: https://github.com/rrousselGit/functional_widget + ref: v0.10.0 + path: packages/code_gen_tester diff --git a/codegen/test/np_log_test.dart b/codegen/test/np_log_test.dart new file mode 100644 index 00000000..616f77af --- /dev/null +++ b/codegen/test/np_log_test.dart @@ -0,0 +1,27 @@ +import 'package:code_gen_tester/code_gen_tester.dart'; +import 'package:np_codegen/src/np_log_generator.dart'; +import 'package:test/test.dart'; + +// dummy class to free us from importing the actual logger library +class Logger { + Logger(String name); +} + +void main() { + final tester = SourceGenTester.fromPath("test/src/np_log.dart"); + final generator = NpLogGenerator(); + Future expectGen(String name, Matcher matcher) async => + expectGenerateNamed(await tester, name, generator, matcher); + + test("NpLog", () async { + await expectGen("Test", completion(""" +// ignore: non_constant_identifier_names +final _\$logTest = Logger("np_log.Test"); + +extension _\$TestNpLog on Test { + // ignore: unused_element + Logger get _log => _\$logTest; +} +""")); + }); +} diff --git a/codegen/test/src/np_log.dart b/codegen/test/src/np_log.dart new file mode 100644 index 00000000..5670e463 --- /dev/null +++ b/codegen/test/src/np_log.dart @@ -0,0 +1,4 @@ +import 'package:np_codegen/np_codegen.dart'; + +@npLog +class Test {}