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

[mob] Remove fields & code related to person table

Browse source
This commit is contained in:
Neeraj Gupta 2024-04-05 07:50:03 +05:30
parent be06d45e3a
commit bd4c506fdd
3 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mobile/lib/face/db.dart
View file

@ -49,7 +49,6 @@ class FaceMLDataDB {
Future _onCreate(Database db, int version) async {
await db.execute(createFacesTable);
await db.execute(createPersonTable);
await db.execute(createClusterPersonTable);
await db.execute(createClusterSummaryTable);
await db.execute(createNotPersonFeedbackTable);
@ -637,7 +636,6 @@ class FaceMLDataDB {
await db.execute(dropClusterSummaryTable);
await db.execute(dropNotPersonFeedbackTable);
await db.execute(createPersonTable);
await db.execute(createClusterPersonTable);
await db.execute(createNotPersonFeedbackTable);
await db.execute(createClusterSummaryTable);
@ -651,7 +649,6 @@ class FaceMLDataDB {
await db.execute(dropClusterPersonTable);
await db.execute(dropNotPersonFeedbackTable);
await db.execute(dropClusterSummaryTable);
await db.execute(createPersonTable);
await db.execute(createClusterPersonTable);
await db.execute(createNotPersonFeedbackTable);
await db.execute(createClusterSummaryTable);

16
mobile/lib/face/db_fields.dart
View file

@ -48,22 +48,6 @@ const dropFaceClustersTable = 'DROP TABLE IF EXISTS $faceClustersTable';
// People Table Fields & Schema Queries
const personTable = 'person';
const idColumn = 'id';
const nameColumn = 'name';
const enteUserIdColumn = 'ente_user_id';
const personHiddenColumn = 'hidden';
const clusterToFaceIdJson = 'clusterToFaceIds';
const coverFaceIDColumn = 'cover_face_id';
const createPersonTable = '''CREATE TABLE IF NOT EXISTS $personTable (
$idColumn TEXT NOT NULL UNIQUE,
$nameColumn TEXT NOT NULL DEFAULT '',
$personHiddenColumn INTEGER NOT NULL DEFAULT 0,
$clusterToFaceIdJson TEXT NOT NULL DEFAULT '{}',
$coverFaceIDColumn TEXT,
PRIMARY KEY($idColumn)
);
''';
const deletePersonTable = 'DROP TABLE IF EXISTS $personTable';
//End People Table Fields & Schema Queries

26
mobile/lib/face/db_model_mappers.dart
View file

@ -3,7 +3,6 @@ import "dart:convert";
import 'package:photos/face/db_fields.dart';
import "package:photos/face/model/detection.dart";
import "package:photos/face/model/face.dart";
import "package:photos/face/model/person.dart";
import "package:photos/generated/protos/ente/common/vector.pb.dart";
import "package:photos/models/ml/ml_versions.dart";
@ -25,31 +24,6 @@ bool sqlIntToBool(int? value, {bool defaultValue = false}) {
}
}
Map<String, dynamic> mapPersonToRow(PersonEntity p) {
return {
idColumn: p.remoteID,
nameColumn: p.data.name,
personHiddenColumn: boolToSQLInt(p.data.isHidden),
coverFaceIDColumn: p.data.avatarFaceId,
clusterToFaceIdJson:
p.data.assigned != null ? jsonEncode(p.data.assigned!.toList()) : '{}',
};
}
PersonEntity mapRowToPerson(Map<String, dynamic> row) {
return PersonEntity(
row[idColumn] as String,
PersonData(
name: row[nameColumn] as String,
isHidden: sqlIntToBool(row[personHiddenColumn] as int),
avatarFaceId: row[coverFaceIDColumn] as String?,
assigned: (json.decode(row[clusterToFaceIdJson] as String) as List)
.map((e) => ClusterInfo.fromJson(e as Map<String, dynamic>))
.toList(),
),
);
}
Map<String, dynamic> mapRemoteToFaceDB(Face face) {
return {
faceIDColumn: face.faceID,