feat: jellyfin
This commit is contained in:
+294
-50
@@ -12,11 +12,46 @@ import '../utils/global_key_utils.dart';
|
||||
|
||||
part 'app_database.g.dart';
|
||||
|
||||
/// String values stored in [OfflineWatchProgress.actionType] (use `.name`).
|
||||
enum OfflineActionType { progress, watched, unwatched }
|
||||
/// Action queued in the offline watch-progress sync table. The serialized
|
||||
/// form ([id]) is what gets persisted in [OfflineWatchProgress.actionType];
|
||||
/// keep these strings stable across renames so existing rows resolve.
|
||||
enum OfflineActionType {
|
||||
progress,
|
||||
watched,
|
||||
unwatched;
|
||||
|
||||
/// Stable string id used for persistence. Survives an enum-name rename
|
||||
/// (e.g. `progress` → `inProgress`) — `.name` would corrupt every row.
|
||||
String get id => switch (this) {
|
||||
OfflineActionType.progress => 'progress',
|
||||
OfflineActionType.watched => 'watched',
|
||||
OfflineActionType.unwatched => 'unwatched',
|
||||
};
|
||||
|
||||
/// Inverse of [id]. Throws on unknown so a typo in production doesn't
|
||||
/// silently fall back to the wrong action.
|
||||
static OfflineActionType fromId(String id) => switch (id) {
|
||||
'progress' => OfflineActionType.progress,
|
||||
'watched' => OfflineActionType.watched,
|
||||
'unwatched' => OfflineActionType.unwatched,
|
||||
_ => throw ArgumentError('Unknown OfflineActionType id: $id'),
|
||||
};
|
||||
}
|
||||
|
||||
// Simplified database with API cache for offline support
|
||||
@DriftDatabase(tables: [DownloadedMedia, DownloadQueue, ApiCache, OfflineWatchProgress, SyncRules])
|
||||
@DriftDatabase(
|
||||
tables: [
|
||||
DownloadedMedia,
|
||||
DownloadOwners,
|
||||
DownloadQueue,
|
||||
ApiCache,
|
||||
OfflineWatchProgress,
|
||||
SyncRules,
|
||||
Connections,
|
||||
Profiles,
|
||||
ProfileConnections,
|
||||
],
|
||||
)
|
||||
class AppDatabase extends _$AppDatabase {
|
||||
AppDatabase() : super(_openConnection());
|
||||
|
||||
@@ -26,11 +61,20 @@ class AppDatabase extends _$AppDatabase {
|
||||
AppDatabase.forTesting(super.e);
|
||||
|
||||
@override
|
||||
int get schemaVersion => 13;
|
||||
int get schemaVersion => 14;
|
||||
|
||||
@override
|
||||
MigrationStrategy get migration {
|
||||
return MigrationStrategy(
|
||||
// Enforce ProfileConnections → Profiles/Connections cascades.
|
||||
// Drift turns FKs *off* during migrations, so the per-connection
|
||||
// pragma we set in `_openConnection` is wiped on first open. This
|
||||
// hook runs after migrations and re-enables it for subsequent
|
||||
// queries — also applies to in-memory test databases that don't go
|
||||
// through `_openConnection`.
|
||||
beforeOpen: (details) async {
|
||||
await customStatement('PRAGMA foreign_keys = ON');
|
||||
},
|
||||
onCreate: (Migrator m) async {
|
||||
await m.createAll();
|
||||
},
|
||||
@@ -41,19 +85,17 @@ class AppDatabase extends _$AppDatabase {
|
||||
}
|
||||
if (from < 8) {
|
||||
appLogger.i('Adding bgTaskId column to DownloadedMedia (v8 migration)');
|
||||
try {
|
||||
await m.addColumn(downloadedMedia, downloadedMedia.bgTaskId);
|
||||
} catch (e) {
|
||||
appLogger.w('bgTaskId column may already exist: $e');
|
||||
}
|
||||
await _ignoreAlreadyExists(
|
||||
'DownloadedMedia.bgTaskId column',
|
||||
() => m.addColumn(downloadedMedia, downloadedMedia.bgTaskId),
|
||||
);
|
||||
}
|
||||
if (from < 9) {
|
||||
appLogger.i('Adding mediaIndex column to DownloadedMedia (v9 migration)');
|
||||
try {
|
||||
await m.addColumn(downloadedMedia, downloadedMedia.mediaIndex);
|
||||
} catch (e) {
|
||||
appLogger.w('mediaIndex column may already exist: $e');
|
||||
}
|
||||
await _ignoreAlreadyExists(
|
||||
'DownloadedMedia.mediaIndex column',
|
||||
() => m.addColumn(downloadedMedia, downloadedMedia.mediaIndex),
|
||||
);
|
||||
}
|
||||
if (from < 10) {
|
||||
appLogger.i('Adding SyncRules table (v10 migration)');
|
||||
@@ -61,19 +103,14 @@ class AppDatabase extends _$AppDatabase {
|
||||
}
|
||||
if (from < 11) {
|
||||
appLogger.i('Adding enabled column to SyncRules (v11 migration)');
|
||||
try {
|
||||
await m.addColumn(syncRules, syncRules.enabled);
|
||||
} catch (e) {
|
||||
appLogger.w('enabled column may already exist: $e');
|
||||
}
|
||||
await _ignoreAlreadyExists('SyncRules.enabled column', () => m.addColumn(syncRules, syncRules.enabled));
|
||||
}
|
||||
if (from < 12) {
|
||||
appLogger.i('Adding downloadFilter column to SyncRules (v12 migration)');
|
||||
try {
|
||||
await m.addColumn(syncRules, syncRules.downloadFilter);
|
||||
} catch (e) {
|
||||
appLogger.w('downloadFilter column may already exist: $e');
|
||||
}
|
||||
await _ignoreAlreadyExists(
|
||||
'SyncRules.downloadFilter column',
|
||||
() => m.addColumn(syncRules, syncRules.downloadFilter),
|
||||
);
|
||||
}
|
||||
if (from < 13) {
|
||||
appLogger.i('Adding indexes on DownloadedMedia hot-queried columns (v13 migration)');
|
||||
@@ -84,38 +121,158 @@ class AppDatabase extends _$AppDatabase {
|
||||
'idx_downloaded_media_grandparent': idxDownloadedMediaGrandparent,
|
||||
};
|
||||
for (final entry in indexes.entries) {
|
||||
try {
|
||||
await m.create(entry.value);
|
||||
} catch (e) {
|
||||
appLogger.w('Index ${entry.key} may already exist: $e');
|
||||
}
|
||||
await _ignoreAlreadyExists('Index ${entry.key}', () => m.create(entry.value));
|
||||
}
|
||||
}
|
||||
if (from < 14) {
|
||||
appLogger.i(
|
||||
'Adding Connections, Profiles, ProfileConnections, DownloadOwners + scope/profile columns (v14 migration)',
|
||||
);
|
||||
|
||||
await m.createTable(connections);
|
||||
await m.create(idxConnectionsKind);
|
||||
|
||||
await m.createTable(profiles);
|
||||
await m.create(idxProfilesKind);
|
||||
|
||||
await m.createTable(profileConnections);
|
||||
await m.create(idxProfileConnectionsConnectionId);
|
||||
await m.create(idxProfileConnectionsProfileId);
|
||||
|
||||
await _ignoreAlreadyExists('DownloadOwners table', () => m.createTable(downloadOwners));
|
||||
await _ignoreAlreadyExists('Index idx_download_owners_profile', () => m.create(idxDownloadOwnersProfile));
|
||||
await _ignoreAlreadyExists(
|
||||
'Index idx_download_owners_global_key',
|
||||
() => m.create(idxDownloadOwnersGlobalKey),
|
||||
);
|
||||
|
||||
await _ignoreAlreadyExists(
|
||||
'DownloadedMedia.clientScopeId column',
|
||||
() => m.addColumn(downloadedMedia, downloadedMedia.clientScopeId),
|
||||
);
|
||||
await _ignoreAlreadyExists(
|
||||
'OfflineWatchProgress.clientScopeId column',
|
||||
() => m.addColumn(offlineWatchProgress, offlineWatchProgress.clientScopeId),
|
||||
);
|
||||
await _ignoreAlreadyExists('SyncRules.profileId column', () => m.addColumn(syncRules, syncRules.profileId));
|
||||
await _ignoreAlreadyExists(
|
||||
'OfflineWatchProgress.profileId column',
|
||||
() => m.addColumn(offlineWatchProgress, offlineWatchProgress.profileId),
|
||||
);
|
||||
|
||||
await customStatement('''
|
||||
UPDATE downloaded_media
|
||||
SET client_scope_id = (
|
||||
SELECT id FROM connections
|
||||
WHERE kind = 'jellyfin'
|
||||
AND substr(id, 1, length(downloaded_media.server_id) + 1) = downloaded_media.server_id || '/'
|
||||
LIMIT 1
|
||||
)
|
||||
WHERE client_scope_id IS NULL
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM connections
|
||||
WHERE kind = 'jellyfin'
|
||||
AND substr(id, 1, length(downloaded_media.server_id) + 1) = downloaded_media.server_id || '/'
|
||||
)
|
||||
''');
|
||||
await customStatement('''
|
||||
UPDATE offline_watch_progress
|
||||
SET client_scope_id = (
|
||||
SELECT id FROM connections
|
||||
WHERE kind = 'jellyfin'
|
||||
AND substr(id, 1, length(offline_watch_progress.server_id) + 1) = offline_watch_progress.server_id || '/'
|
||||
LIMIT 1
|
||||
)
|
||||
WHERE client_scope_id IS NULL
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM connections
|
||||
WHERE kind = 'jellyfin'
|
||||
AND substr(id, 1, length(offline_watch_progress.server_id) + 1) = offline_watch_progress.server_id || '/'
|
||||
)
|
||||
''');
|
||||
|
||||
await m.create(idxOfflineWatchProgressServer);
|
||||
await _ignoreAlreadyExists('Index idx_sync_rules_profile', () => m.create(idxSyncRulesProfile));
|
||||
await _ignoreAlreadyExists(
|
||||
'Index idx_offline_watch_progress_profile',
|
||||
() => m.create(idxOfflineWatchProgressProfile),
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _ignoreAlreadyExists(String label, Future<void> Function() operation) async {
|
||||
try {
|
||||
await operation();
|
||||
} catch (e) {
|
||||
final message = e.toString().toLowerCase();
|
||||
if (message.contains('already exists') || message.contains('duplicate column name')) {
|
||||
appLogger.w('$label already exists during migration: $e');
|
||||
return;
|
||||
}
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// Offline Watch Progress Operations
|
||||
// ============================================================
|
||||
|
||||
Expression<bool> _clientScopePredicate(GeneratedColumn<String> column, String? clientScopeId) {
|
||||
return clientScopeId == null ? column.isNull() : column.equals(clientScopeId);
|
||||
}
|
||||
|
||||
Expression<bool> _nullableTextPredicate(GeneratedColumn<String> column, String? value) {
|
||||
return value == null ? column.isNull() : column.equals(value);
|
||||
}
|
||||
|
||||
/// Get all pending offline watch actions for sync
|
||||
Future<List<OfflineWatchProgressItem>> getPendingWatchActions() {
|
||||
return (select(offlineWatchProgress)..orderBy([(t) => OrderingTerm.asc(t.createdAt)])).get();
|
||||
Future<List<OfflineWatchProgressItem>> getPendingWatchActions({String? profileId}) {
|
||||
final query = select(offlineWatchProgress)..orderBy([(t) => OrderingTerm.asc(t.createdAt)]);
|
||||
if (profileId != null) {
|
||||
query.where((t) => t.profileId.equals(profileId));
|
||||
}
|
||||
return query.get();
|
||||
}
|
||||
|
||||
/// Claim pre-v18 offline watch actions for [profileId]. Those rows predate
|
||||
/// profile ownership and have `NULL profile_id`; the first active profile
|
||||
/// inherits them so already-watched offline progress is not stranded.
|
||||
Future<void> adoptLegacyOfflineWatchActionsForProfile(String profileId) async {
|
||||
if (profileId.isEmpty) return;
|
||||
await (update(
|
||||
offlineWatchProgress,
|
||||
)..where((t) => t.profileId.isNull())).write(OfflineWatchProgressCompanion(profileId: Value(profileId)));
|
||||
}
|
||||
|
||||
/// Get pending watch actions for a specific server
|
||||
Future<List<OfflineWatchProgressItem>> getPendingWatchActionsForServer(String serverId) {
|
||||
Future<List<OfflineWatchProgressItem>> getPendingWatchActionsForServer(String serverId, {String? profileId}) {
|
||||
return (select(offlineWatchProgress)
|
||||
..where((t) => t.serverId.equals(serverId))
|
||||
..where(
|
||||
(t) =>
|
||||
t.serverId.equals(serverId) &
|
||||
(profileId == null ? const Constant(true) : t.profileId.equals(profileId)),
|
||||
)
|
||||
..orderBy([(t) => OrderingTerm.asc(t.createdAt)]))
|
||||
.get();
|
||||
}
|
||||
|
||||
/// Get the latest action for a specific item
|
||||
Future<OfflineWatchProgressItem?> getLatestWatchAction(String globalKey) {
|
||||
Future<OfflineWatchProgressItem?> getLatestWatchAction(
|
||||
String globalKey, {
|
||||
String? profileId,
|
||||
bool filterProfile = false,
|
||||
String? clientScopeId,
|
||||
bool filterClientScope = false,
|
||||
}) {
|
||||
return (select(offlineWatchProgress)
|
||||
..where((t) => t.globalKey.equals(globalKey))
|
||||
..where(
|
||||
(t) =>
|
||||
t.globalKey.equals(globalKey) &
|
||||
(filterProfile ? _nullableTextPredicate(t.profileId, profileId) : const Constant(true)) &
|
||||
(filterClientScope ? _clientScopePredicate(t.clientScopeId, clientScopeId) : const Constant(true)),
|
||||
)
|
||||
..orderBy([(t) => OrderingTerm.desc(t.updatedAt)])
|
||||
..limit(1))
|
||||
.getSingleOrNull();
|
||||
@@ -125,19 +282,32 @@ class AppDatabase extends _$AppDatabase {
|
||||
///
|
||||
/// Returns a map of globalKey -> latest action for each key.
|
||||
/// Keys with no actions will not be present in the returned map.
|
||||
Future<Map<String, OfflineWatchProgressItem>> getLatestWatchActionsForKeys(Set<String> globalKeys) async {
|
||||
Future<Map<String, OfflineWatchProgressItem>> getLatestWatchActionsForKeys(
|
||||
Set<String> globalKeys, {
|
||||
String? profileId,
|
||||
bool filterProfile = false,
|
||||
Map<String, String?>? clientScopeIdsByGlobalKey,
|
||||
}) async {
|
||||
if (globalKeys.isEmpty) return {};
|
||||
|
||||
// Query all actions for the given keys
|
||||
final allActions =
|
||||
await (select(offlineWatchProgress)
|
||||
..where((t) => t.globalKey.isIn(globalKeys))
|
||||
..where(
|
||||
(t) =>
|
||||
t.globalKey.isIn(globalKeys) &
|
||||
(filterProfile ? _nullableTextPredicate(t.profileId, profileId) : const Constant(true)),
|
||||
)
|
||||
..orderBy([(t) => OrderingTerm.desc(t.updatedAt)]))
|
||||
.get();
|
||||
|
||||
// Group by globalKey and take the latest (first due to ordering)
|
||||
final result = <String, OfflineWatchProgressItem>{};
|
||||
for (final action in allActions) {
|
||||
if (clientScopeIdsByGlobalKey != null && clientScopeIdsByGlobalKey.containsKey(action.globalKey)) {
|
||||
final expectedScope = clientScopeIdsByGlobalKey[action.globalKey];
|
||||
if (!_clientScopeValuesMatch(action.clientScopeId, expectedScope)) continue;
|
||||
}
|
||||
// Only keep the first (latest) action for each key
|
||||
result.putIfAbsent(action.globalKey, () => action);
|
||||
}
|
||||
@@ -145,9 +315,17 @@ class AppDatabase extends _$AppDatabase {
|
||||
return result;
|
||||
}
|
||||
|
||||
/// Insert or update a progress action (merges with existing)
|
||||
bool _clientScopeValuesMatch(String? actual, String? expected) {
|
||||
final normalizedActual = actual == null || actual.isEmpty ? null : actual;
|
||||
final normalizedExpected = expected == null || expected.isEmpty ? null : expected;
|
||||
return normalizedActual == normalizedExpected;
|
||||
}
|
||||
|
||||
/// Insert or update a progress action (merges with existing).
|
||||
Future<void> upsertProgressAction({
|
||||
String? profileId,
|
||||
required String serverId,
|
||||
String? clientScopeId,
|
||||
required String ratingKey,
|
||||
required int viewOffset,
|
||||
required int duration,
|
||||
@@ -159,7 +337,13 @@ class AppDatabase extends _$AppDatabase {
|
||||
// Check for existing progress entry
|
||||
final existing =
|
||||
await (select(offlineWatchProgress)
|
||||
..where((t) => t.globalKey.equals(globalKey) & t.actionType.equals(OfflineActionType.progress.name))
|
||||
..where(
|
||||
(t) =>
|
||||
t.globalKey.equals(globalKey) &
|
||||
_nullableTextPredicate(t.profileId, profileId) &
|
||||
_clientScopePredicate(t.clientScopeId, clientScopeId) &
|
||||
t.actionType.equals(OfflineActionType.progress.id),
|
||||
)
|
||||
..limit(1))
|
||||
.getSingleOrNull();
|
||||
|
||||
@@ -170,6 +354,8 @@ class AppDatabase extends _$AppDatabase {
|
||||
viewOffset: Value(viewOffset),
|
||||
duration: Value(duration),
|
||||
shouldMarkWatched: Value(shouldMarkWatched),
|
||||
profileId: Value(profileId),
|
||||
clientScopeId: Value(clientScopeId),
|
||||
updatedAt: Value(now),
|
||||
),
|
||||
);
|
||||
@@ -178,9 +364,11 @@ class AppDatabase extends _$AppDatabase {
|
||||
await into(offlineWatchProgress).insert(
|
||||
OfflineWatchProgressCompanion.insert(
|
||||
serverId: serverId,
|
||||
profileId: Value(profileId),
|
||||
clientScopeId: Value(clientScopeId),
|
||||
ratingKey: ratingKey,
|
||||
globalKey: globalKey,
|
||||
actionType: OfflineActionType.progress.name,
|
||||
actionType: OfflineActionType.progress.id,
|
||||
viewOffset: Value(viewOffset),
|
||||
duration: Value(duration),
|
||||
shouldMarkWatched: Value(shouldMarkWatched),
|
||||
@@ -191,10 +379,12 @@ class AppDatabase extends _$AppDatabase {
|
||||
}
|
||||
}
|
||||
|
||||
/// Insert a manual watch action (watched or unwatched)
|
||||
/// Removes conflicting actions for the same item
|
||||
/// Insert a manual watch action (watched or unwatched).
|
||||
/// Removes conflicting actions for the same item.
|
||||
Future<void> insertWatchAction({
|
||||
String? profileId,
|
||||
required String serverId,
|
||||
String? clientScopeId,
|
||||
required String ratingKey,
|
||||
required String actionType, // 'watched' or 'unwatched'
|
||||
}) async {
|
||||
@@ -202,12 +392,20 @@ class AppDatabase extends _$AppDatabase {
|
||||
final now = DateTime.now().millisecondsSinceEpoch;
|
||||
|
||||
// Remove conflicting actions (opposite action type and progress)
|
||||
await (delete(offlineWatchProgress)..where((t) => t.globalKey.equals(globalKey))).go();
|
||||
await (delete(offlineWatchProgress)..where(
|
||||
(t) =>
|
||||
t.globalKey.equals(globalKey) &
|
||||
_nullableTextPredicate(t.profileId, profileId) &
|
||||
_clientScopePredicate(t.clientScopeId, clientScopeId),
|
||||
))
|
||||
.go();
|
||||
|
||||
// Insert the new action
|
||||
await into(offlineWatchProgress).insert(
|
||||
OfflineWatchProgressCompanion.insert(
|
||||
serverId: serverId,
|
||||
profileId: Value(profileId),
|
||||
clientScopeId: Value(clientScopeId),
|
||||
ratingKey: ratingKey,
|
||||
globalKey: globalKey,
|
||||
actionType: actionType,
|
||||
@@ -234,10 +432,12 @@ class AppDatabase extends _$AppDatabase {
|
||||
}
|
||||
|
||||
/// Get count of pending sync items
|
||||
Future<int> getPendingSyncCount() async {
|
||||
final count = await (selectOnly(offlineWatchProgress)..addColumns([offlineWatchProgress.id.count()]))
|
||||
.map((row) => row.read(offlineWatchProgress.id.count()))
|
||||
.getSingle();
|
||||
Future<int> getPendingSyncCount({String? profileId}) async {
|
||||
final query = selectOnly(offlineWatchProgress)..addColumns([offlineWatchProgress.id.count()]);
|
||||
if (profileId != null) {
|
||||
query.where(offlineWatchProgress.profileId.equals(profileId));
|
||||
}
|
||||
final count = await query.map((row) => row.read(offlineWatchProgress.id.count())).getSingle();
|
||||
return count ?? 0;
|
||||
}
|
||||
|
||||
@@ -250,8 +450,12 @@ class AppDatabase extends _$AppDatabase {
|
||||
// Sync Rules Operations
|
||||
// ============================================================
|
||||
|
||||
Future<List<SyncRuleItem>> getSyncRules() {
|
||||
return select(syncRules).get();
|
||||
Future<List<SyncRuleItem>> getSyncRules({String? profileId}) {
|
||||
final query = select(syncRules);
|
||||
if (profileId != null) {
|
||||
query.where((t) => t.profileId.equals(profileId));
|
||||
}
|
||||
return query.get();
|
||||
}
|
||||
|
||||
Future<SyncRuleItem?> getSyncRule(String globalKey) {
|
||||
@@ -259,6 +463,7 @@ class AppDatabase extends _$AppDatabase {
|
||||
}
|
||||
|
||||
Future<void> insertSyncRule({
|
||||
String profileId = '',
|
||||
required String serverId,
|
||||
required String ratingKey,
|
||||
required String globalKey,
|
||||
@@ -267,9 +472,15 @@ class AppDatabase extends _$AppDatabase {
|
||||
int mediaIndex = 0,
|
||||
String downloadFilter = 'unwatched',
|
||||
}) async {
|
||||
await into(syncRules).insertOnConflictUpdate(
|
||||
// [insertOnConflictUpdate] defaults the conflict target to the primary
|
||||
// key (`id`), which is auto-incremented — the conflict never triggers
|
||||
// and the row's UNIQUE [globalKey] constraint blows up instead. Drive
|
||||
// the upsert off the public [globalKey] so re-creating a rule for the same
|
||||
// shared target updates the existing row.
|
||||
await into(syncRules).insert(
|
||||
SyncRulesCompanion.insert(
|
||||
serverId: serverId,
|
||||
profileId: Value(profileId),
|
||||
ratingKey: ratingKey,
|
||||
globalKey: globalKey,
|
||||
targetType: targetType,
|
||||
@@ -278,9 +489,39 @@ class AppDatabase extends _$AppDatabase {
|
||||
mediaIndex: Value(mediaIndex),
|
||||
downloadFilter: Value(downloadFilter),
|
||||
),
|
||||
onConflict: DoUpdate(
|
||||
(_) => SyncRulesCompanion(
|
||||
serverId: Value(serverId),
|
||||
profileId: Value(profileId),
|
||||
ratingKey: Value(ratingKey),
|
||||
targetType: Value(targetType),
|
||||
episodeCount: Value(episodeCount),
|
||||
mediaIndex: Value(mediaIndex),
|
||||
downloadFilter: Value(downloadFilter),
|
||||
),
|
||||
target: [syncRules.globalKey],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Claim pre-v16 public sync rules for [profileId]. Rules created before
|
||||
/// profile ownership have an empty profile id and a public global key.
|
||||
Future<void> adoptLegacySyncRulesForProfile(String profileId) async {
|
||||
if (profileId.isEmpty) return;
|
||||
final legacyRules = await (select(syncRules)..where((t) => t.profileId.equals(''))).get();
|
||||
for (final rule in legacyRules) {
|
||||
final scopedKey = buildProfileScopedGlobalKey(profileId, rule.serverId, rule.ratingKey);
|
||||
final duplicate = await getSyncRule(scopedKey);
|
||||
if (duplicate != null) {
|
||||
await (delete(syncRules)..where((t) => t.id.equals(rule.id))).go();
|
||||
continue;
|
||||
}
|
||||
await (update(syncRules)..where((t) => t.id.equals(rule.id))).write(
|
||||
SyncRulesCompanion(profileId: Value(profileId), globalKey: Value(scopedKey)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> updateSyncRuleCount(String globalKey, int episodeCount) async {
|
||||
await (update(
|
||||
syncRules,
|
||||
@@ -346,6 +587,9 @@ LazyDatabase _openConnection() {
|
||||
setup: (db) {
|
||||
db.execute('PRAGMA journal_mode=WAL');
|
||||
db.execute('PRAGMA synchronous=NORMAL');
|
||||
// Enforce ProfileConnections → Profiles/Connections cascades.
|
||||
// SQLite requires this on every connection — it's not persisted.
|
||||
db.execute('PRAGMA foreign_keys = ON');
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
+4800
-525
File diff suppressed because it is too large
Load Diff
@@ -2,12 +2,84 @@ import 'package:drift/drift.dart';
|
||||
|
||||
import 'app_database.dart';
|
||||
import '../models/download_models.dart';
|
||||
import '../profiles/profile.dart';
|
||||
|
||||
/// Extension methods on AppDatabase for download operations
|
||||
extension DownloadDatabaseOperations on AppDatabase {
|
||||
/// Insert a new download into the database
|
||||
Future<void> addDownloadOwner({required String profileId, required String globalKey}) async {
|
||||
if (profileId.isEmpty) return;
|
||||
await into(downloadOwners).insert(
|
||||
DownloadOwnersCompanion.insert(
|
||||
profileId: profileId,
|
||||
globalKey: globalKey,
|
||||
createdAt: DateTime.now().millisecondsSinceEpoch,
|
||||
),
|
||||
mode: InsertMode.insertOrIgnore,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> removeDownloadOwner({required String profileId, required String globalKey}) async {
|
||||
await (delete(downloadOwners)..where((t) => t.profileId.equals(profileId) & t.globalKey.equals(globalKey))).go();
|
||||
}
|
||||
|
||||
Future<void> removeDownloadOwnersForProfile(String profileId) async {
|
||||
if (profileId.isEmpty) return;
|
||||
await (delete(downloadOwners)..where((t) => t.profileId.equals(profileId))).go();
|
||||
}
|
||||
|
||||
Future<Set<String>> getDownloadOwnerKeysForProfile(String profileId) async {
|
||||
if (profileId.isEmpty) return const {};
|
||||
final rows = await (select(downloadOwners)..where((t) => t.profileId.equals(profileId))).get();
|
||||
return rows.map((row) => row.globalKey).toSet();
|
||||
}
|
||||
|
||||
Future<int> getDownloadOwnerCount(String globalKey) async {
|
||||
return (await _validDownloadOwnerRows(globalKey)).length;
|
||||
}
|
||||
|
||||
Future<bool> hasDownloadOwner(String globalKey, {String? excludingProfileId}) async {
|
||||
final rows = await _validDownloadOwnerRows(globalKey, excludingProfileId: excludingProfileId);
|
||||
return rows.isNotEmpty;
|
||||
}
|
||||
|
||||
Future<List<DownloadOwnerItem>> _validDownloadOwnerRows(String globalKey, {String? excludingProfileId}) async {
|
||||
final rows = await (select(downloadOwners)..where((t) => t.globalKey.equals(globalKey))).get();
|
||||
if (rows.isEmpty) return const [];
|
||||
final candidates = rows
|
||||
.where((row) => excludingProfileId == null || excludingProfileId.isEmpty || row.profileId != excludingProfileId)
|
||||
.toList(growable: false);
|
||||
if (candidates.isEmpty) return const [];
|
||||
|
||||
final localProfileRows = await select(profiles).get();
|
||||
final localProfileIds = localProfileRows.map((row) => row.id).toSet();
|
||||
final connectionRows = await select(connections).get();
|
||||
final connectionIds = connectionRows.map((row) => row.id).toSet();
|
||||
return candidates
|
||||
.where((row) {
|
||||
if (localProfileIds.contains(row.profileId)) return true;
|
||||
final plexHome = parsePlexHomeProfileId(row.profileId);
|
||||
if (plexHome != null) return connectionIds.contains(plexHome.accountConnectionId);
|
||||
return localProfileIds.isEmpty;
|
||||
})
|
||||
.toList(growable: false);
|
||||
}
|
||||
|
||||
/// Claim pre-v17 shared download rows for [profileId]. Rows that already
|
||||
/// have any owner are left untouched so later profiles do not inherit them.
|
||||
Future<void> adoptLegacyDownloadsForProfile(String profileId) async {
|
||||
if (profileId.isEmpty) return;
|
||||
final rows = await select(downloadedMedia).get();
|
||||
for (final row in rows) {
|
||||
if (await getDownloadOwnerCount(row.globalKey) == 0) {
|
||||
await addDownloadOwner(profileId: profileId, globalKey: row.globalKey);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Insert a new download into the database.
|
||||
Future<void> insertDownload({
|
||||
required String serverId,
|
||||
String? clientScopeId,
|
||||
required String ratingKey,
|
||||
required String globalKey,
|
||||
required String type,
|
||||
@@ -19,6 +91,7 @@ extension DownloadDatabaseOperations on AppDatabase {
|
||||
await into(downloadedMedia).insert(
|
||||
DownloadedMediaCompanion.insert(
|
||||
serverId: serverId,
|
||||
clientScopeId: Value(clientScopeId),
|
||||
ratingKey: ratingKey,
|
||||
globalKey: globalKey,
|
||||
type: type,
|
||||
@@ -135,18 +208,41 @@ extension DownloadDatabaseOperations on AppDatabase {
|
||||
|
||||
/// Delete a download
|
||||
Future<void> deleteDownload(String globalKey) async {
|
||||
await (delete(downloadOwners)..where((t) => t.globalKey.equals(globalKey))).go();
|
||||
await (delete(downloadedMedia)..where((t) => t.globalKey.equals(globalKey))).go();
|
||||
await (delete(downloadQueue)..where((t) => t.mediaGlobalKey.equals(globalKey))).go();
|
||||
}
|
||||
|
||||
/// Get all downloaded episodes for a season
|
||||
Future<List<DownloadedMediaItem>> getEpisodesBySeason(String seasonKey) {
|
||||
return (select(downloadedMedia)..where((t) => t.parentRatingKey.equals(seasonKey))).get();
|
||||
Future<List<DownloadedMediaItem>> getEpisodesBySeason(
|
||||
String seasonKey, {
|
||||
String? serverId,
|
||||
String? clientScopeId,
|
||||
bool filterClientScope = false,
|
||||
}) {
|
||||
return (select(downloadedMedia)..where(
|
||||
(t) =>
|
||||
t.parentRatingKey.equals(seasonKey) &
|
||||
_optionalServerPredicate(t.serverId, serverId) &
|
||||
_optionalClientScopePredicate(t.clientScopeId, clientScopeId, filterClientScope: filterClientScope),
|
||||
))
|
||||
.get();
|
||||
}
|
||||
|
||||
/// Get all downloaded episodes for a show
|
||||
Future<List<DownloadedMediaItem>> getEpisodesByShow(String showKey) {
|
||||
return (select(downloadedMedia)..where((t) => t.grandparentRatingKey.equals(showKey))).get();
|
||||
Future<List<DownloadedMediaItem>> getEpisodesByShow(
|
||||
String showKey, {
|
||||
String? serverId,
|
||||
String? clientScopeId,
|
||||
bool filterClientScope = false,
|
||||
}) {
|
||||
return (select(downloadedMedia)..where(
|
||||
(t) =>
|
||||
t.grandparentRatingKey.equals(showKey) &
|
||||
_optionalServerPredicate(t.serverId, serverId) &
|
||||
_optionalClientScopePredicate(t.clientScopeId, clientScopeId, filterClientScope: filterClientScope),
|
||||
))
|
||||
.get();
|
||||
}
|
||||
|
||||
/// Get all downloaded items for a specific server
|
||||
@@ -154,6 +250,24 @@ extension DownloadDatabaseOperations on AppDatabase {
|
||||
return (select(downloadedMedia)..where((t) => t.serverId.equals(serverId))).get();
|
||||
}
|
||||
|
||||
Expression<bool> _optionalServerPredicate(GeneratedColumn<String> column, String? serverId) {
|
||||
return serverId == null ? const Constant(true) : column.equals(serverId);
|
||||
}
|
||||
|
||||
Expression<bool> _optionalClientScopePredicate(
|
||||
GeneratedColumn<String> column,
|
||||
String? clientScopeId, {
|
||||
required bool filterClientScope,
|
||||
}) {
|
||||
if (!filterClientScope && (clientScopeId == null || clientScopeId.isEmpty)) {
|
||||
return const Constant(true);
|
||||
}
|
||||
if (clientScopeId == null || clientScopeId.isEmpty) {
|
||||
return column.isNull() | column.equals('');
|
||||
}
|
||||
return column.equals(clientScopeId);
|
||||
}
|
||||
|
||||
/// Update the background_downloader task ID for a download
|
||||
Future<void> updateBgTaskId(String globalKey, String? taskId) async {
|
||||
await (update(
|
||||
|
||||
+145
-3
@@ -1,9 +1,10 @@
|
||||
import 'package:drift/drift.dart';
|
||||
|
||||
/// Key-value cache table for Plex API responses.
|
||||
/// Key-value cache table for media-server API responses (Plex, Jellyfin).
|
||||
/// Used for offline support - stores raw JSON responses.
|
||||
class ApiCache extends Table {
|
||||
/// Composite key: serverId:endpoint (e.g., "abc123:/library/metadata/12345")
|
||||
/// Composite key: serverId:endpoint (e.g., "abc123:/library/metadata/12345"
|
||||
/// for Plex, "abc123:/Users/.../Items/..." for Jellyfin)
|
||||
TextColumn get cacheKey => text()();
|
||||
|
||||
/// JSON response data
|
||||
@@ -37,6 +38,12 @@ class DownloadQueue extends Table {
|
||||
class DownloadedMedia extends Table {
|
||||
IntColumn get id => integer().autoIncrement()();
|
||||
TextColumn get serverId => text()();
|
||||
// Downloads are intentionally app-wide/shared, keyed by the public
|
||||
// serverId:ratingKey globalKey below. For Jellyfin, clientScopeId records
|
||||
// which scoped client produced the cached metadata/download request; it is
|
||||
// not part of download ownership and must not be used to hide or duplicate
|
||||
// the physical downloaded item per user/profile.
|
||||
TextColumn get clientScopeId => text().nullable()();
|
||||
TextColumn get ratingKey => text()();
|
||||
TextColumn get globalKey => text().unique()();
|
||||
TextColumn get type => text()();
|
||||
@@ -55,13 +62,35 @@ class DownloadedMedia extends Table {
|
||||
IntColumn get mediaIndex => integer().withDefault(const Constant(0))();
|
||||
}
|
||||
|
||||
/// Profile ownership for shared physical downloads.
|
||||
///
|
||||
/// [DownloadedMedia] stores one physical row per public serverId:ratingKey so
|
||||
/// files are deduped across profiles. This table controls which active profile
|
||||
/// can see/use that shared row.
|
||||
@DataClassName('DownloadOwnerItem')
|
||||
@TableIndex(name: 'idx_download_owners_profile', columns: {#profileId})
|
||||
@TableIndex(name: 'idx_download_owners_global_key', columns: {#globalKey})
|
||||
class DownloadOwners extends Table {
|
||||
TextColumn get profileId => text()();
|
||||
TextColumn get globalKey => text()();
|
||||
IntColumn get createdAt => integer()();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {profileId, globalKey};
|
||||
}
|
||||
|
||||
/// Persistent sync rules for auto-downloading unwatched episodes.
|
||||
///
|
||||
/// Each rule keeps a rolling window of N unwatched episodes for a show/season,
|
||||
/// or mirrors the current contents of a collection/playlist.
|
||||
/// Rules are owned by the active top-level profile. Downloads remain app-wide
|
||||
/// and shared by public serverId:ratingKey identity, but rule ownership must not
|
||||
/// cross users because Jellyfin permissions and watch state are user-scoped.
|
||||
@DataClassName('SyncRuleItem')
|
||||
@TableIndex(name: 'idx_sync_rules_profile', columns: {#profileId})
|
||||
class SyncRules extends Table {
|
||||
IntColumn get id => integer().autoIncrement()();
|
||||
TextColumn get profileId => text().withDefault(const Constant(''))();
|
||||
TextColumn get serverId => text()();
|
||||
TextColumn get ratingKey => text()();
|
||||
TextColumn get globalKey => text().unique()();
|
||||
@@ -74,18 +103,131 @@ class SyncRules extends Table {
|
||||
TextColumn get downloadFilter => text().withDefault(const Constant('unwatched'))();
|
||||
}
|
||||
|
||||
/// Persisted media-server connections.
|
||||
///
|
||||
/// One row per "connection" the user has added — a Plex account (with its
|
||||
/// discovered servers and active Home profile) or a single Jellyfin server.
|
||||
/// The [configJson] payload is backend-specific and parsed by the
|
||||
/// [Connection] sealed class.
|
||||
@DataClassName('ConnectionRow')
|
||||
@TableIndex(name: 'idx_connections_kind', columns: {#kind})
|
||||
class Connections extends Table {
|
||||
/// Stable identifier for the connection. For Plex it's a generated UUID
|
||||
/// (one per account); for Jellyfin it's the server's machineId.
|
||||
TextColumn get id => text()();
|
||||
|
||||
/// Backend kind: `'plex'` or `'jellyfin'`.
|
||||
TextColumn get kind => text()();
|
||||
|
||||
/// User-visible label (account email, server name).
|
||||
TextColumn get displayName => text()();
|
||||
|
||||
/// Backend-specific config payload (token, baseUrl, profile id, …).
|
||||
TextColumn get configJson => text()();
|
||||
|
||||
/// Whether this is the default connection used at app launch when only
|
||||
/// one connection is present.
|
||||
BoolColumn get isDefault => boolean().withDefault(const Constant(false))();
|
||||
|
||||
/// Timestamp this connection was added (milliseconds since epoch).
|
||||
IntColumn get createdAt => integer()();
|
||||
|
||||
/// Timestamp of the most-recent successful auth refresh (milliseconds
|
||||
/// since epoch). Null until the first successful auth.
|
||||
IntColumn get lastAuthenticatedAt => integer().nullable()();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {id};
|
||||
}
|
||||
|
||||
/// Top-level profiles — see [Profile].
|
||||
///
|
||||
/// A profile is the user-facing identity. Plex Home users auto-surface as
|
||||
/// `kind='plex_home'` rows when their parent Plex account is added; users
|
||||
/// can also create `kind='local'` rows manually. Each profile owns one or
|
||||
/// more connections via [ProfileConnections].
|
||||
@DataClassName('ProfileRow')
|
||||
@TableIndex(name: 'idx_profiles_kind', columns: {#kind})
|
||||
class Profiles extends Table {
|
||||
/// Stable identifier. For Plex Home profiles: `plex-home-{accountId}-{homeUserUuid}`
|
||||
/// (deterministic so re-discovery is idempotent). For locals: `local-{uuid}`.
|
||||
TextColumn get id => text()();
|
||||
|
||||
/// `'local'` | `'plex_home'`.
|
||||
TextColumn get kind => text()();
|
||||
|
||||
TextColumn get displayName => text()();
|
||||
|
||||
/// Plex Home users have a thumb URL; locals fall back to initials/colour.
|
||||
TextColumn get avatarThumbUrl => text().nullable()();
|
||||
|
||||
/// Per-kind config:
|
||||
/// - `local`: `{ "pinHash": "..." }`
|
||||
/// - `plex_home`: `{ "restricted": bool, "admin": bool, "hasPassword": bool, "parentConnectionId": "..." }`
|
||||
TextColumn get configJson => text()();
|
||||
|
||||
IntColumn get sortOrder => integer().withDefault(const Constant(0))();
|
||||
IntColumn get createdAt => integer()();
|
||||
IntColumn get lastUsedAt => integer().nullable()();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {id};
|
||||
}
|
||||
|
||||
/// Many-to-many join between [Profiles] and [Connections], carrying the
|
||||
/// per-profile user-level token used when the profile is active.
|
||||
///
|
||||
/// For Plex: `userToken` is a Home-user token from `/home/users/{uuid}/switch`,
|
||||
/// `userIdentifier` is the Plex Home user UUID. An empty `userToken` is a
|
||||
/// lazy-fetch sentinel — the binder calls `/switch` on first activation.
|
||||
/// The Dart-side [ProfileConnection] model surfaces empty as `null`; the
|
||||
/// column stays non-nullable here to avoid a schema migration.
|
||||
///
|
||||
/// For Jellyfin: `userToken` mirrors the Connection's accessToken (one user
|
||||
/// per Jellyfin connection) and `userIdentifier` is the Jellyfin user id.
|
||||
@DataClassName('ProfileConnectionRow')
|
||||
@TableIndex(name: 'idx_profile_connections_connection_id', columns: {#connectionId})
|
||||
@TableIndex(name: 'idx_profile_connections_profile_id', columns: {#profileId})
|
||||
class ProfileConnections extends Table {
|
||||
// No FK on profile_id: Plex Home profiles are virtual (built by
|
||||
// Profile.virtualPlexHome from PlexHomeService's live cache, never
|
||||
// persisted in `profiles`), so an FK here would reject every join row
|
||||
// they need. The two profile-delete sites clean up join rows manually
|
||||
// via ProfileConnectionRegistry.removeAllForProfile before calling
|
||||
// ProfileRegistry.remove.
|
||||
TextColumn get profileId => text()();
|
||||
TextColumn get connectionId => text().references(Connections, #id, onDelete: KeyAction.cascade)();
|
||||
TextColumn get userToken => text().withDefault(const Constant(''))();
|
||||
TextColumn get userIdentifier => text()();
|
||||
BoolColumn get isDefault => boolean().withDefault(const Constant(false))();
|
||||
IntColumn get tokenAcquiredAt => integer().nullable()();
|
||||
IntColumn get lastUsedAt => integer().nullable()();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {profileId, connectionId};
|
||||
}
|
||||
|
||||
/// Queue for offline watch progress and manual watch actions.
|
||||
///
|
||||
/// Stores watch progress updates and manual watch/unwatch actions
|
||||
/// that need to be synced to the Plex server when back online.
|
||||
/// that need to be synced to the originating media server when back online.
|
||||
@DataClassName('OfflineWatchProgressItem')
|
||||
@TableIndex(name: 'idx_offline_watch_progress_server', columns: {#serverId})
|
||||
@TableIndex(name: 'idx_offline_watch_progress_profile', columns: {#profileId})
|
||||
class OfflineWatchProgress extends Table {
|
||||
/// Auto-incrementing primary key
|
||||
IntColumn get id => integer().autoIncrement()();
|
||||
|
||||
/// Active Plezy profile that owns this queued action.
|
||||
TextColumn get profileId => text().nullable()();
|
||||
|
||||
/// Server ID this media belongs to
|
||||
TextColumn get serverId => text()();
|
||||
|
||||
/// Optional user-scoped client/cache id for backends where [serverId] is
|
||||
/// shared by multiple users on the same server.
|
||||
TextColumn get clientScopeId => text().nullable()();
|
||||
|
||||
/// Rating key of the media item
|
||||
TextColumn get ratingKey => text()();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user