yorickr/plezy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge the deduplication and dead-code removal pass

Browse Source 
Consolidates duplicated logic behind shared implementations — paginated
grid tabs, focus chrome, cached remote stores, sheet selection columns,
the server artifact store and a test fixture layer — and removes code
that had become unreachable. Net reduction of about 5,500 lines with no
behaviour change.

Where a fix had landed separately in code that moved into a shared
helper, the fix was re-applied inside the helper rather than left behind
in the copy that went away.
This commit is contained in:
edde746
2026-07-26 19:41:23 +02:00
parent 9e8cfbc7dd 13179f08cd
commit a56b9a3dfb
425 changed files with 12045 additions and 17543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/watch_together/providers/watch_together_provider.dart
-5
View File
@@ -155,11 +155,6 @@ class WatchTogetherProvider with ChangeNotifier {
bool get hasCurrentPlayback =>
currentMediaRatingKey != null && currentMediaServerId != null && currentMediaTitle != null;
/// Set the display name for this user
void setDisplayName(String name) {
_displayName = name;
}
String? _buildPlaybackKey(String? ratingKey, ServerId? serverId) {
if (ratingKey == null || serverId == null) return null;
return '$serverId:$ratingKey';
lib/watch_together/screens/watch_together_screen.dart
+71 -69
View File
@@ -227,38 +227,60 @@ class _NotInSessionViewState extends State<_NotInSessionView> with MountedSetSta
);
}
/// Persists [code] as a recent room for the active profile and refreshes the
/// list. A null [controlMode] leaves any stored mode untouched.
Future<void> _recordRecentRoom(String code, {ControlMode? controlMode}) async {
final profileId = _profileId;
if (profileId == null || profileId.isEmpty) return;
await RecentRoomsService.addOrUpdateRoom(
code,
profileId: profileId,
endpoint: _relayEndpoint,
controlMode: controlMode,
);
setStateIfMounted(() => _recentRooms = _loadRecentRooms());
}
/// Runs [action] behind a busy flag, logging [logMessage] and showing
/// [failureMessage] in a snackbar when it throws.
Future<void> _runSessionAction({
required void Function(bool busy) setBusy,
required String logMessage,
required String failureMessage,
required Future<void> Function() action,
}) async {
setState(() => setBusy(true));
try {
await action();
} catch (e) {
appLogger.e(logMessage, error: e);
if (mounted) {
showErrorSnackBar(context, '$failureMessage: $e');
}
} finally {
if (mounted) {
setState(() => setBusy(false));
}
}
}
Future<void> _createSession() async {
final controlMode = await _showControlModeDialog();
if (controlMode == null || !mounted) return;
setState(() => _isCreating = true);
try {
final sessionId = await widget.watchTogether.createSession(
controlMode: controlMode,
relayEndpoint: _relayEndpoint,
displayName: _plexDisplayName,
);
final profileId = _profileId;
if (profileId != null && profileId.isNotEmpty) {
await RecentRoomsService.addOrUpdateRoom(
sessionId,
profileId: profileId,
endpoint: _relayEndpoint,
await _runSessionAction(
setBusy: (busy) => _isCreating = busy,
logMessage: 'Failed to create session',
failureMessage: t.watchTogether.failedToCreate,
action: () async {
final sessionId = await widget.watchTogether.createSession(
controlMode: controlMode,
relayEndpoint: _relayEndpoint,
displayName: _plexDisplayName,
);
setStateIfMounted(() => _recentRooms = _loadRecentRooms());
}
} catch (e) {
appLogger.e('Failed to create session', error: e);
if (mounted) {
showErrorSnackBar(context, '${t.watchTogether.failedToCreate}: $e');
}
} finally {
if (mounted) {
setState(() => _isCreating = false);
}
}
await _recordRecentRoom(sessionId, controlMode: controlMode);
},
);
}
Future<ControlMode?> _showControlModeDialog() {
@@ -287,52 +309,32 @@ class _NotInSessionViewState extends State<_NotInSessionView> with MountedSetSta
final sessionId = await showJoinSessionDialog(context);
if (sessionId == null || !mounted) return;
setState(() => _isJoining = true);
try {
await widget.watchTogether.joinSession(sessionId, relayEndpoint: _relayEndpoint, displayName: _plexDisplayName);
final profileId = _profileId;
if (profileId != null && profileId.isNotEmpty) {
await RecentRoomsService.addOrUpdateRoom(sessionId, profileId: profileId, endpoint: _relayEndpoint);
setStateIfMounted(() => _recentRooms = _loadRecentRooms());
}
} catch (e) {
appLogger.e('Failed to join session', error: e);
if (mounted) {
showErrorSnackBar(context, '${t.watchTogether.failedToJoin}: $e');
}
} finally {
if (mounted) {
setState(() => _isJoining = false);
}
}
await _runSessionAction(
setBusy: (busy) => _isJoining = busy,
logMessage: 'Failed to join session',
failureMessage: t.watchTogether.failedToJoin,
action: () async {
await widget.watchTogether.joinSession(sessionId, relayEndpoint: _relayEndpoint, displayName: _plexDisplayName);
await _recordRecentRoom(sessionId);
},
);
}
Future<void> _enterRoom(RecentRoom room) async {
setState(() => _enteringRoomCode = room.code);
try {
await widget.watchTogether.enterRoom(
room.code,
relayEndpoint: _relayEndpoint,
controlMode: room.controlMode ?? ControlMode.anyone,
displayName: _plexDisplayName,
);
final profileId = _profileId;
if (profileId != null && profileId.isNotEmpty) {
await RecentRoomsService.addOrUpdateRoom(room.code, profileId: profileId, endpoint: _relayEndpoint);
setStateIfMounted(() => _recentRooms = _loadRecentRooms());
}
} catch (e) {
appLogger.e('Failed to enter room', error: e);
if (mounted) {
showErrorSnackBar(context, '${t.watchTogether.failedToJoin}: $e');
}
} finally {
if (mounted) {
setState(() => _enteringRoomCode = null);
}
}
await _runSessionAction(
setBusy: (busy) => _enteringRoomCode = busy ? room.code : null,
logMessage: 'Failed to enter room',
failureMessage: t.watchTogether.failedToJoin,
action: () async {
await widget.watchTogether.enterRoom(
room.code,
relayEndpoint: _relayEndpoint,
controlMode: room.controlMode ?? ControlMode.anyone,
displayName: _plexDisplayName,
);
await _recordRecentRoom(room.code);
},
);
}
Future<void> _renameRoom(RecentRoom room) async {
lib/watch_together/services/guest_playback_reconciler.dart
-1
View File
@@ -120,7 +120,6 @@ class GuestPlaybackReconciler {
Timer? _statusRefreshTimer;
PlaybackState? get latestState => _latestState;
bool get isCorrecting => _correcting;
// ---------------------------------------------------------------------
// Public inputs
lib/watch_together/services/host_playback_coordinator.dart
-1
View File
@@ -118,7 +118,6 @@ class HostPlaybackCoordinator {
bool _disposed = false;
PlaybackPhase get phase => _phase;
Set<String> get incompatiblePeers => Set.unmodifiable(_incompatiblePeers);
// ---------------------------------------------------------------------
// Public inputs
lib/watch_together/services/watch_together_peer_service.dart
+2 -20
View File
@@ -301,16 +301,7 @@ class WatchTogetherPeerService with KeepaliveMixin {
final rejectedSetup = _setupCompleter;
if (rejectedSetup == null || rejectedSetup.isCompleted) return;
final leaveCompleter = Completer<void>();
_setupCompleter = leaveCompleter;
_setupRequestType = RelayProtocol.leave;
_sendRaw({
'type': RelayProtocol.leave,
'sessionId': _sessionId,
'peerId': _myPeerId,
'reconnectToken': _reconnectToken,
'protocolVersion': _relayProtocolVersion,
});
final leaveCompleter = _announce(RelayProtocol.leave);
unawaited(() async {
try {
await leaveCompleter.future.namedTimeout(
@@ -803,16 +794,7 @@ class WatchTogetherPeerService with KeepaliveMixin {
);
}
final releaseCompleter = Completer<void>();
_setupCompleter = releaseCompleter;
_setupRequestType = _isHost ? RelayProtocol.endSession : RelayProtocol.leave;
_sendRaw({
'type': _isHost ? RelayProtocol.endSession : RelayProtocol.leave,
'sessionId': _sessionId,
'peerId': _myPeerId,
'reconnectToken': _reconnectToken,
'protocolVersion': _relayProtocolVersion,
});
final releaseCompleter = _announce(_isHost ? RelayProtocol.endSession : RelayProtocol.leave);
await releaseCompleter.future.namedTimeout(
const Duration(seconds: 10),
operation: _isHost ? 'WatchTogether end session' : 'WatchTogether leave session',