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

Setup photos and folders to use separate DBs for simplicity

Browse source
This commit is contained in:
Vishnu Mohandas 2020-05-25 20:04:49 +05:30
parent 266c13fe05
commit fd8d1a3e99
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/db/folder_db.dart
View file

@ -1,3 +1,4 @@
import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:path/path.dart'; import 'package:path/path.dart';
@ -6,7 +7,8 @@ import 'package:sqflite/sqflite.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
class FolderDB { class FolderDB {
static final _databaseName = "ente.db"; // TODO: Use different tables within the same database
static final _databaseName = "ente.folder.db";
static final _databaseVersion = 1; static final _databaseVersion = 1;
static final table = 'folders'; static final table = 'folders';
@ -87,7 +89,7 @@ class FolderDB {
row[columnName] = folder.name; row[columnName] = folder.name;
row[columnOwner] = folder.owner; row[columnOwner] = folder.owner;
row[columnDeviceFolder] = folder.deviceFolder; row[columnDeviceFolder] = folder.deviceFolder;
row[columnSharedWith] = folder.sharedWith.toString(); row[columnSharedWith] = jsonEncode(folder.sharedWith.toList());
row[columnUpdateTimestamp] = folder.updateTimestamp; row[columnUpdateTimestamp] = folder.updateTimestamp;
return row; return row;
} }
@ -98,7 +100,9 @@ class FolderDB {
row[columnName], row[columnName],
row[columnOwner], row[columnOwner],
row[columnDeviceFolder], row[columnDeviceFolder],
Set<String>.from(row[columnSharedWith]), (jsonDecode(row[columnSharedWith]) as List<dynamic>)
.cast<String>()
.toSet(),
row[columnUpdateTimestamp], row[columnUpdateTimestamp],
); );
} }

5
lib/db/photo_db.dart
View file

@ -6,7 +6,8 @@ import 'package:sqflite/sqflite.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
class PhotoDB { class PhotoDB {
static final _databaseName = "ente.db"; // TODO: Use different tables within the same database
static final _databaseName = "ente.photos.db";
static final _databaseVersion = 1; static final _databaseVersion = 1;
static final table = 'photos'; static final table = 'photos';
@ -85,7 +86,7 @@ class PhotoDB {
final db = await instance.database; final db = await instance.database;
final results = await db.query( final results = await db.query(
table, table,
where: '$columnIsDeleted = 0', where: '$columnLocalId IS NOT NULL AND $columnIsDeleted = 0',
orderBy: '$columnCreateTimestamp DESC', orderBy: '$columnCreateTimestamp DESC',
); );
return _convertToPhotos(results); return _convertToPhotos(results);