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

Rename DBs

Browse source
This commit is contained in:
Vishnu Mohandas 2020-07-20 16:33:09 +05:30
parent da15cc1290
commit a5810abf98
11 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/db/file_db.dart → lib/db/files_db.dart
View file

@ -8,12 +8,12 @@ import 'package:path/path.dart';
import 'package:sqflite/sqflite.dart';
import 'package:path_provider/path_provider.dart';
class FileDB {
class FilesDB {
// TODO: Use different tables within the same database
static final _databaseName = "ente.files.db";
static final _databaseVersion = 1;
static final Logger _logger = Logger("FileDB");
static final Logger _logger = Logger("FilesDB");
static final table = 'files';
@ -32,8 +32,8 @@ class FileDB {
static final columnUpdationTime = 'updation_time';
// make this a singleton class
FileDB._privateConstructor();
static final FileDB instance = FileDB._privateConstructor();
FilesDB._privateConstructor();
static final FilesDB instance = FilesDB._privateConstructor();
// only have a single app-wide reference to the database
static Database _database;

6
lib/db/folder_db.dart → lib/db/folders_db.dart
View file

@ -6,7 +6,7 @@ import 'package:photos/models/folder.dart';
import 'package:sqflite/sqflite.dart';
import 'package:path_provider/path_provider.dart';
class FolderDB {
class FoldersDB {
// TODO: Use different tables within the same database
static final _databaseName = "ente.folder.db";
static final _databaseVersion = 1;
@ -20,8 +20,8 @@ class FolderDB {
static final columnSharedWith = 'shared_with';
static final columnUpdationTime = 'updation_time';
FolderDB._privateConstructor();
static final FolderDB instance = FolderDB._privateConstructor();
FoldersDB._privateConstructor();
static final FoldersDB instance = FoldersDB._privateConstructor();
static Database _database;
Future<Database> get database async {

4
lib/face_search_manager.dart
View file

@ -1,6 +1,6 @@
import 'package:dio/dio.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:logging/logging.dart';
import 'package:photos/models/face.dart';
@ -54,7 +54,7 @@ class FaceSearchManager {
}
for (File file in result) {
try {
files.add(await FileDB.instance.getMatchingFile(
files.add(await FilesDB.instance.getMatchingFile(
file.localId,
file.title,
file.deviceFolder,

4
lib/file_repository.dart
View file

@ -1,6 +1,6 @@
import 'package:logging/logging.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/models/file.dart';
@ -16,7 +16,7 @@ class FileRepository {
}
Future<List<File>> loadFiles() async {
var files = await FileDB.instance.getAllLocalFiles();
var files = await FilesDB.instance.getAllLocalFiles();
_files.clear();
_files.addAll(files);

20
lib/folder_service.dart
View file

@ -3,8 +3,8 @@ import 'dart:developer';
import 'package:dio/dio.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/db/folder_db.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/folders_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/remote_sync_event.dart';
import 'package:photos/events/user_authenticated_event.dart';
import 'package:photos/models/folder.dart';
@ -36,18 +36,18 @@ class FolderSharingService {
_isSyncInProgress = true;
return getFolders().then((f) async {
var folders = f.toSet();
var currentFolders = await FolderDB.instance.getFolders();
var currentFolders = await FoldersDB.instance.getFolders();
for (final currentFolder in currentFolders) {
if (!folders.contains(currentFolder)) {
_logger.info("Folder deleted: " + currentFolder.toString());
await FileDB.instance.deleteFilesInRemoteFolder(currentFolder.id);
await FolderDB.instance.deleteFolder(currentFolder);
await FilesDB.instance.deleteFilesInRemoteFolder(currentFolder.id);
await FoldersDB.instance.deleteFolder(currentFolder);
}
}
for (final folder in folders) {
if (folder.owner != Configuration.instance.getUsername()) {
await syncDiff(folder);
await FolderDB.instance.putFolder(folder);
await FoldersDB.instance.putFolder(folder);
}
}
Bus.instance.fire(RemoteSyncEvent(true));
@ -60,7 +60,7 @@ class FolderSharingService {
int lastSyncTimestamp = 0;
try {
File file =
await FileDB.instance.getLastSyncedFileInRemoteFolder(folder.id);
await FilesDB.instance.getLastSyncedFileInRemoteFolder(folder.id);
lastSyncTimestamp = file.updationTime;
} catch (e) {
// Folder has never been synced
@ -69,11 +69,11 @@ class FolderSharingService {
for (File file in diff) {
try {
var existingPhoto =
await FileDB.instance.getMatchingRemoteFile(file.uploadedFileId);
await FileDB.instance.update(
await FilesDB.instance.getMatchingRemoteFile(file.uploadedFileId);
await FilesDB.instance.update(
existingPhoto.generatedId, file.uploadedFileId, file.updationTime);
} catch (e) {
await FileDB.instance.insert(file);
await FilesDB.instance.insert(file);
}
}
if (diff.length == _diffLimit) {

4
lib/photo_sync_manager.dart
View file

@ -4,7 +4,7 @@ import 'dart:math';
import 'package:logging/logging.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/photo_upload_event.dart';
import 'package:photos/events/user_authenticated_event.dart';
import 'package:photos/file_repository.dart';
@ -22,7 +22,7 @@ import 'package:photos/events/remote_sync_event.dart';
class PhotoSyncManager {
final _logger = Logger("PhotoSyncManager");
final _dio = Dio();
final _db = FileDB.instance;
final _db = FilesDB.instance;
bool _isSyncInProgress = false;
Future<void> _existingSync;
SharedPreferences _prefs;

6
lib/ui/detail_page.dart
View file

@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:like_button/like_button.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:photos/core/cache/image_cache.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/favorite_files_repository.dart';
import 'package:photos/file_repository.dart';
import 'package:photos/models/file_type.dart';
@ -326,8 +326,8 @@ class _DetailPageState extends State<DetailPage> {
await PhotoManager.editor.deleteWithIds([file.localId]);
deleteEverywhere
? await FileDB.instance.markForDeletion(file)
: await FileDB.instance.delete(file);
? await FilesDB.instance.markForDeletion(file)
: await FilesDB.instance.delete(file);
FileRepository.instance.reloadFiles();
}

10
lib/ui/device_folders_gallery_widget.dart
View file

@ -3,7 +3,7 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/local_photos_updated_event.dart';
import 'package:photos/favorite_files_repository.dart';
import 'package:photos/models/device_folder.dart';
@ -69,10 +69,10 @@ class _DeviceFolderGalleryWidgetState extends State<DeviceFolderGalleryWidget> {
}
Future<List<DeviceFolder>> _getDeviceFolders() async {
final paths = await FileDB.instance.getLocalPaths();
final paths = await FilesDB.instance.getLocalPaths();
final folders = List<DeviceFolder>();
for (final path in paths) {
final file = await FileDB.instance.getLatestFileInPath(path);
final file = await FilesDB.instance.getLatestFileInPath(path);
final folderName = p.basename(path);
folders.add(
DeviceFolder(folderName, path, file, FolderNameFilter(folderName)));
@ -82,12 +82,12 @@ class _DeviceFolderGalleryWidgetState extends State<DeviceFolderGalleryWidget> {
.compareTo(first.thumbnail.creationTime);
});
if (FavoriteFilesRepository.instance.hasFavorites()) {
final file = await FileDB.instance.getLatestFileAmongGeneratedIds(
final file = await FilesDB.instance.getLatestFileAmongGeneratedIds(
FavoriteFilesRepository.instance.getLiked().toList());
folders.insert(0,
DeviceFolder("Favorites", "/Favorites", file, FavoriteItemsFilter()));
}
final videos = await FileDB.instance.getAllVideos();
final videos = await FilesDB.instance.getAllVideos();
if (videos.length > 0) {
folders.insert(
0, DeviceFolder("Videos", "/Videos", videos[0], VideoFileFilter()));

6
lib/ui/gallery_app_bar_widget.dart
View file

@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/remote_sync_event.dart';
import 'package:photos/models/file.dart';
import 'package:photos/file_repository.dart';
@ -175,8 +175,8 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
for (File file in widget.selectedFiles.files) {
deleteEverywhere
? await FileDB.instance.markForDeletion(file)
: await FileDB.instance.delete(file);
? await FilesDB.instance.markForDeletion(file)
: await FilesDB.instance.delete(file);
}
await FileRepository.instance.reloadFiles();
_clearSelectedFiles();

8
lib/ui/remote_folder_gallery_widget.dart
View file

@ -5,8 +5,8 @@ import 'package:flutter/widgets.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/db/folder_db.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/folders_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/events/remote_sync_event.dart';
import 'package:photos/models/folder.dart';
import 'package:photos/ui/loading_widget.dart';
@ -75,7 +75,7 @@ class _RemoteFolderGalleryWidgetState extends State<RemoteFolderGalleryWidget> {
}
Future<List<Folder>> _getRemoteFolders() async {
final folders = await FolderDB.instance.getFolders();
final folders = await FoldersDB.instance.getFolders();
final filteredFolders = List<Folder>();
for (final folder in folders) {
if (folder.owner == Configuration.instance.getUsername()) {
@ -83,7 +83,7 @@ class _RemoteFolderGalleryWidgetState extends State<RemoteFolderGalleryWidget> {
}
try {
folder.thumbnailPhoto =
await FileDB.instance.getLatestFileInRemoteFolder(folder.id);
await FilesDB.instance.getLatestFileInRemoteFolder(folder.id);
} catch (e) {
_logger.warning(e.toString());
}

4
lib/ui/remote_folder_page.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:photos/db/file_db.dart';
import 'package:photos/db/files_db.dart';
import 'package:photos/folder_service.dart';
import 'package:photos/models/folder.dart';
import 'package:photos/models/selected_files.dart';
@ -21,7 +21,7 @@ class _RemoteFolderPageState extends State<RemoteFolderPage> {
@override
Widget build(Object context) {
var gallery = Gallery(
asyncLoader: (lastFile, limit) => FileDB.instance.getAllInFolder(
asyncLoader: (lastFile, limit) => FilesDB.instance.getAllInFolder(
widget.folder.id,
lastFile == null
? DateTime.now().microsecondsSinceEpoch