beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor: Move magic_metadata.dart under models/metadata

Browse source 
Signed-off-by: Neeraj Gupta <254676+ua741@users.noreply.github.com>
This commit is contained in:
Neeraj Gupta 2023-05-25 11:01:50 +05:30
parent e49d080e37
commit 0b1f0e9ed7
23 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/db/files_db.dart
View file

@ -10,7 +10,7 @@ import 'package:photos/models/file.dart';
import 'package:photos/models/file_load_result.dart'; import 'package:photos/models/file_load_result.dart';
import 'package:photos/models/file_type.dart'; import 'package:photos/models/file_type.dart';
import 'package:photos/models/location/location.dart'; import 'package:photos/models/location/location.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/utils/file_uploader_util.dart'; import 'package:photos/utils/file_uploader_util.dart';
import 'package:sqflite/sqflite.dart'; import 'package:sqflite/sqflite.dart';
import 'package:sqflite_migration/sqflite_migration.dart'; import 'package:sqflite_migration/sqflite_migration.dart';

2
lib/models/collection.dart
View file

@ -2,7 +2,7 @@ import 'dart:convert';
import 'dart:core'; import 'dart:core';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
class Collection { class Collection {
final int id; final int id;

2
lib/models/file.dart
View file

@ -9,7 +9,7 @@ import 'package:photos/core/constants.dart';
import 'package:photos/models/ente_file.dart'; import 'package:photos/models/ente_file.dart';
import 'package:photos/models/file_type.dart'; import 'package:photos/models/file_type.dart';
import 'package:photos/models/location/location.dart'; import 'package:photos/models/location/location.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/services/feature_flag_service.dart'; import 'package:photos/services/feature_flag_service.dart';
import 'package:photos/utils/date_time_util.dart'; import 'package:photos/utils/date_time_util.dart';
import 'package:photos/utils/exif_util.dart'; import 'package:photos/utils/exif_util.dart';

0
lib/models/magic_metadata.dart → lib/models/metadata/magic_metadata.dart
View file

2
lib/services/collections_service.dart
View file

@ -26,7 +26,7 @@ import 'package:photos/models/collection.dart';
import 'package:photos/models/collection_file_item.dart'; import 'package:photos/models/collection_file_item.dart';
import 'package:photos/models/collection_items.dart'; import 'package:photos/models/collection_items.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/services/app_lifecycle_service.dart'; import 'package:photos/services/app_lifecycle_service.dart';
import 'package:photos/services/file_magic_service.dart'; import 'package:photos/services/file_magic_service.dart';
import 'package:photos/services/local_sync_service.dart'; import 'package:photos/services/local_sync_service.dart';

2
lib/services/file_magic_service.dart
View file

@ -13,7 +13,7 @@ import 'package:photos/events/force_reload_home_gallery_event.dart';
import 'package:photos/events/local_photos_updated_event.dart'; import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/extensions/list.dart'; import 'package:photos/extensions/list.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/services/remote_sync_service.dart'; import 'package:photos/services/remote_sync_service.dart';
import 'package:photos/utils/crypto_util.dart'; import 'package:photos/utils/crypto_util.dart';
import 'package:photos/utils/file_download_util.dart'; import 'package:photos/utils/file_download_util.dart';

2
lib/services/files_service.dart
View file

@ -7,7 +7,7 @@ import 'package:photos/db/files_db.dart';
import 'package:photos/extensions/list.dart'; import 'package:photos/extensions/list.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import "package:photos/models/file_load_result.dart"; import "package:photos/models/file_load_result.dart";
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/services/file_magic_service.dart'; import 'package:photos/services/file_magic_service.dart';
import "package:photos/services/ignored_files_service.dart"; import "package:photos/services/ignored_files_service.dart";
import 'package:photos/utils/date_time_util.dart'; import 'package:photos/utils/date_time_util.dart';

2
lib/services/hidden_service.dart
View file

@ -10,7 +10,7 @@ import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/models/api/collection/create_request.dart'; import 'package:photos/models/api/collection/create_request.dart';
import 'package:photos/models/collection.dart'; import 'package:photos/models/collection.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import 'package:photos/services/file_magic_service.dart'; import 'package:photos/services/file_magic_service.dart';
import 'package:photos/utils/crypto_util.dart'; import 'package:photos/utils/crypto_util.dart';

2
lib/ui/actions/collection/collection_sharing_actions.dart
View file

@ -8,7 +8,7 @@ import 'package:photos/models/api/collection/create_request.dart';
import 'package:photos/models/collection.dart'; import 'package:photos/models/collection.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/files_split.dart'; import 'package:photos/models/files_split.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import 'package:photos/services/hidden_service.dart'; import 'package:photos/services/hidden_service.dart';
import 'package:photos/services/user_service.dart'; import 'package:photos/services/user_service.dart';

2
lib/ui/collections/archived_collections_button_widget.dart
View file

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:photos/core/configuration.dart'; import 'package:photos/core/configuration.dart';
import 'package:photos/db/files_db.dart'; import 'package:photos/db/files_db.dart';
import "package:photos/generated/l10n.dart"; import "package:photos/generated/l10n.dart";
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import "package:photos/services/collections_service.dart"; import "package:photos/services/collections_service.dart";
import 'package:photos/ui/viewer/gallery/archive_page.dart'; import 'package:photos/ui/viewer/gallery/archive_page.dart';
import 'package:photos/utils/navigation_util.dart'; import 'package:photos/utils/navigation_util.dart';

2
lib/ui/viewer/actions/file_selection_actions_widget.dart
View file

@ -8,7 +8,7 @@ import 'package:photos/models/device_collection.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/files_split.dart'; import 'package:photos/models/files_split.dart';
import 'package:photos/models/gallery_type.dart'; import 'package:photos/models/gallery_type.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/models/selected_files.dart'; import 'package:photos/models/selected_files.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import 'package:photos/services/hidden_service.dart'; import 'package:photos/services/hidden_service.dart';

2
lib/ui/viewer/actions/file_selection_overlay_bar.dart
View file

@ -3,7 +3,7 @@ import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart'; import 'package:photos/models/collection.dart';
import 'package:photos/models/device_collection.dart'; import 'package:photos/models/device_collection.dart';
import 'package:photos/models/gallery_type.dart'; import 'package:photos/models/gallery_type.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/models/selected_files.dart'; import 'package:photos/models/selected_files.dart';
import 'package:photos/theme/ente_theme.dart'; import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/collection_action_sheet.dart'; import 'package:photos/ui/collection_action_sheet.dart';

2
lib/ui/viewer/file/fading_app_bar.dart
View file

@ -14,7 +14,7 @@ import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart'; import 'package:photos/models/file_type.dart';
import 'package:photos/models/ignored_file.dart'; import 'package:photos/models/ignored_file.dart';
import "package:photos/models/magic_metadata.dart"; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/models/selected_files.dart'; import 'package:photos/models/selected_files.dart';
import 'package:photos/models/trash_file.dart'; import 'package:photos/models/trash_file.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';

4
lib/ui/viewer/file/file_details_widget.dart
View file

@ -5,7 +5,7 @@ import "package:photos/core/configuration.dart";
import "package:photos/generated/l10n.dart"; import "package:photos/generated/l10n.dart";
import "package:photos/models/file.dart"; import "package:photos/models/file.dart";
import "package:photos/models/file_type.dart"; import "package:photos/models/file_type.dart";
import "package:photos/models/magic_metadata.dart"; import 'package:photos/models/metadata/magic_metadata.dart';
import "package:photos/services/file_magic_service.dart"; import "package:photos/services/file_magic_service.dart";
import "package:photos/services/update_service.dart"; import "package:photos/services/update_service.dart";
import 'package:photos/theme/ente_theme.dart'; import 'package:photos/theme/ente_theme.dart';
@ -177,7 +177,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
]); ]);
} }
if(!UpdateService.instance.isFdroidFlavor()) { if (!UpdateService.instance.isFdroidFlavor()) {
fileDetailsTiles.addAll([ fileDetailsTiles.addAll([
ObjectsItemWidget(file), ObjectsItemWidget(file),
const FileDetailsDivider(), const FileDetailsDivider(),

2
lib/ui/viewer/file/zoomable_image.dart
View file

@ -13,7 +13,7 @@ import 'package:photos/db/files_db.dart';
import 'package:photos/events/files_updated_event.dart'; import 'package:photos/events/files_updated_event.dart';
import 'package:photos/events/local_photos_updated_event.dart'; import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import "package:photos/models/magic_metadata.dart"; import 'package:photos/models/metadata/magic_metadata.dart';
import "package:photos/services/file_magic_service.dart"; import "package:photos/services/file_magic_service.dart";
import 'package:photos/ui/common/loading_widget.dart'; import 'package:photos/ui/common/loading_widget.dart';
import 'package:photos/utils/file_util.dart'; import 'package:photos/utils/file_util.dart';

2
lib/ui/viewer/file/zoomable_live_image.dart
View file

@ -10,7 +10,7 @@ import 'package:photos/core/constants.dart';
import "package:photos/generated/l10n.dart"; import "package:photos/generated/l10n.dart";
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import "package:photos/models/file_type.dart"; import "package:photos/models/file_type.dart";
import "package:photos/models/magic_metadata.dart"; import 'package:photos/models/metadata/magic_metadata.dart';
import "package:photos/services/file_magic_service.dart"; import "package:photos/services/file_magic_service.dart";
import 'package:photos/ui/viewer/file/zoomable_image.dart'; import 'package:photos/ui/viewer/file/zoomable_image.dart';
import 'package:photos/utils/file_util.dart'; import 'package:photos/utils/file_util.dart';

2
lib/ui/viewer/gallery/archive_page.dart
View file

@ -6,7 +6,7 @@ import 'package:photos/db/files_db.dart';
import 'package:photos/events/files_updated_event.dart'; import 'package:photos/events/files_updated_event.dart';
import "package:photos/generated/l10n.dart"; import "package:photos/generated/l10n.dart";
import 'package:photos/models/gallery_type.dart'; import 'package:photos/models/gallery_type.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/models/selected_files.dart'; import 'package:photos/models/selected_files.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import "package:photos/ui/components/album_horizontal_list_widget.dart"; import "package:photos/ui/components/album_horizontal_list_widget.dart";

2
lib/ui/viewer/gallery/gallery_app_bar_widget.dart
View file

@ -12,7 +12,7 @@ import 'package:photos/models/backup_status.dart';
import 'package:photos/models/collection.dart'; import 'package:photos/models/collection.dart';
import 'package:photos/models/device_collection.dart'; import 'package:photos/models/device_collection.dart';
import 'package:photos/models/gallery_type.dart'; import 'package:photos/models/gallery_type.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/models/selected_files.dart'; import 'package:photos/models/selected_files.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import 'package:photos/services/sync_service.dart'; import 'package:photos/services/sync_service.dart';

2
lib/utils/diff_fetcher.dart
View file

@ -5,7 +5,7 @@ import 'package:logging/logging.dart';
import 'package:photos/core/network/network.dart'; import 'package:photos/core/network/network.dart';
import 'package:photos/db/files_db.dart'; import 'package:photos/db/files_db.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/utils/crypto_util.dart'; import 'package:photos/utils/crypto_util.dart';
import 'package:photos/utils/file_download_util.dart'; import 'package:photos/utils/file_download_util.dart';

2
lib/utils/file_uploader.dart
View file

@ -23,7 +23,7 @@ import 'package:photos/main.dart';
import 'package:photos/models/encryption_result.dart'; import 'package:photos/models/encryption_result.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart'; import 'package:photos/models/file_type.dart';
import "package:photos/models/magic_metadata.dart"; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/models/upload_url.dart'; import 'package:photos/models/upload_url.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import "package:photos/services/file_magic_service.dart"; import "package:photos/services/file_magic_service.dart";

2
lib/utils/file_uploader_util.dart
View file

@ -17,7 +17,7 @@ import 'package:photos/core/errors.dart';
import 'package:photos/models/file.dart' as ente; import 'package:photos/models/file.dart' as ente;
import 'package:photos/models/file_type.dart'; import 'package:photos/models/file_type.dart';
import "package:photos/models/location/location.dart"; import "package:photos/models/location/location.dart";
import "package:photos/models/magic_metadata.dart"; import 'package:photos/models/metadata/magic_metadata.dart';
import "package:photos/services/file_magic_service.dart"; import "package:photos/services/file_magic_service.dart";
import 'package:photos/utils/crypto_util.dart'; import 'package:photos/utils/crypto_util.dart';
import 'package:photos/utils/file_util.dart'; import 'package:photos/utils/file_util.dart';

2
lib/utils/magic_util.dart
View file

@ -6,7 +6,7 @@ import 'package:photos/events/force_reload_home_gallery_event.dart';
import "package:photos/generated/l10n.dart"; import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection.dart'; import 'package:photos/models/collection.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import 'package:photos/services/file_magic_service.dart'; import 'package:photos/services/file_magic_service.dart';
import 'package:photos/ui/common/progress_dialog.dart'; import 'package:photos/ui/common/progress_dialog.dart';

2
lib/utils/trash_diff_fetcher.dart
View file

@ -3,7 +3,7 @@ import 'dart:math';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:photos/core/network/network.dart'; import 'package:photos/core/network/network.dart';
import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/metadata/magic_metadata.dart';
import 'package:photos/models/trash_file.dart'; import 'package:photos/models/trash_file.dart';
import 'package:photos/utils/crypto_util.dart'; import 'package:photos/utils/crypto_util.dart';
import 'package:photos/utils/file_download_util.dart'; import 'package:photos/utils/file_download_util.dart';