mirror of
https://github.com/vleeuwenmenno/supplements.git
synced 2025-09-11 18:29:12 +02:00
feat: adds auto sync feature and fixes UI a bit up
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../services/database_sync_service.dart';
|
||||
import '../services/auto_sync_service.dart';
|
||||
import 'settings_provider.dart';
|
||||
|
||||
class SimpleSyncProvider with ChangeNotifier {
|
||||
final DatabaseSyncService _syncService = DatabaseSyncService();
|
||||
@@ -9,6 +10,12 @@ class SimpleSyncProvider with ChangeNotifier {
|
||||
// Callback for UI refresh after sync
|
||||
VoidCallback? _onSyncCompleteCallback;
|
||||
|
||||
// Auto-sync service
|
||||
AutoSyncService? _autoSyncService;
|
||||
|
||||
// Track if current sync is auto-triggered
|
||||
bool _isAutoSync = false;
|
||||
|
||||
// Getters
|
||||
SyncStatus get status => _syncService.status;
|
||||
String? get lastError => _syncService.lastError;
|
||||
@@ -17,6 +24,14 @@ class SimpleSyncProvider with ChangeNotifier {
|
||||
bool get isSyncing => status == SyncStatus.downloading ||
|
||||
status == SyncStatus.merging ||
|
||||
status == SyncStatus.uploading;
|
||||
bool get isAutoSync => _isAutoSync;
|
||||
AutoSyncService? get autoSyncService => _autoSyncService;
|
||||
|
||||
// Auto-sync error handling getters
|
||||
bool get isAutoSyncDisabledDueToErrors => _autoSyncService?.isAutoDisabledDueToErrors ?? false;
|
||||
int get autoSyncConsecutiveFailures => _autoSyncService?.consecutiveFailures ?? 0;
|
||||
String? get autoSyncLastError => _autoSyncService?.lastErrorMessage;
|
||||
bool get hasAutoSyncScheduledRetry => _autoSyncService?.hasScheduledRetry ?? false;
|
||||
|
||||
// Configuration getters
|
||||
String? get serverUrl => _syncService.serverUrl;
|
||||
@@ -43,6 +58,23 @@ class SimpleSyncProvider with ChangeNotifier {
|
||||
_onSyncCompleteCallback = callback;
|
||||
}
|
||||
|
||||
/// Initialize auto-sync service with settings provider
|
||||
void initializeAutoSync(SettingsProvider settingsProvider) {
|
||||
_autoSyncService = AutoSyncService(
|
||||
syncProvider: this,
|
||||
settingsProvider: settingsProvider,
|
||||
);
|
||||
|
||||
if (kDebugMode) {
|
||||
print('SimpleSyncProvider: Auto-sync service initialized');
|
||||
}
|
||||
}
|
||||
|
||||
/// Triggers auto-sync if enabled and configured
|
||||
void triggerAutoSyncIfEnabled() {
|
||||
_autoSyncService?.triggerAutoSync();
|
||||
}
|
||||
|
||||
Future<void> _loadConfiguration() async {
|
||||
await _syncService.loadSavedConfiguration();
|
||||
notifyListeners(); // Notify UI that configuration might be available
|
||||
@@ -67,11 +99,14 @@ class SimpleSyncProvider with ChangeNotifier {
|
||||
return await _syncService.testConnection();
|
||||
}
|
||||
|
||||
Future<void> syncDatabase() async {
|
||||
Future<void> syncDatabase({bool isAutoSync = false}) async {
|
||||
if (!isConfigured) {
|
||||
throw Exception('Sync not configured');
|
||||
}
|
||||
|
||||
_isAutoSync = isAutoSync;
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
await _syncService.syncDatabase();
|
||||
} catch (e) {
|
||||
@@ -79,6 +114,9 @@ class SimpleSyncProvider with ChangeNotifier {
|
||||
print('SupplementsLog: Sync failed in provider: $e');
|
||||
}
|
||||
rethrow;
|
||||
} finally {
|
||||
_isAutoSync = false;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,20 +125,46 @@ class SimpleSyncProvider with ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Resets auto-sync error state and re-enables auto-sync if it was disabled
|
||||
void resetAutoSyncErrors() {
|
||||
_autoSyncService?.resetErrorState();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
String getStatusText() {
|
||||
final syncType = _isAutoSync ? 'Auto-sync' : 'Sync';
|
||||
|
||||
// Check for auto-sync specific errors first
|
||||
if (isAutoSyncDisabledDueToErrors) {
|
||||
return 'Auto-sync disabled due to repeated failures. ${autoSyncLastError ?? 'Check sync settings.'}';
|
||||
}
|
||||
|
||||
switch (status) {
|
||||
case SyncStatus.idle:
|
||||
if (hasAutoSyncScheduledRetry) {
|
||||
return 'Auto-sync will retry shortly...';
|
||||
}
|
||||
return 'Ready to sync';
|
||||
case SyncStatus.downloading:
|
||||
return 'Downloading remote database...';
|
||||
return '$syncType: Downloading remote database...';
|
||||
case SyncStatus.merging:
|
||||
return 'Merging databases...';
|
||||
return '$syncType: Merging databases...';
|
||||
case SyncStatus.uploading:
|
||||
return 'Uploading database...';
|
||||
return '$syncType: Uploading database...';
|
||||
case SyncStatus.completed:
|
||||
return 'Sync completed successfully';
|
||||
return '$syncType completed successfully';
|
||||
case SyncStatus.error:
|
||||
return 'Sync failed: ${lastError ?? 'Unknown error'}';
|
||||
// For auto-sync errors, show more specific messages
|
||||
if (_isAutoSync && autoSyncLastError != null) {
|
||||
return 'Auto-sync failed: $autoSyncLastError';
|
||||
}
|
||||
return '$syncType failed: ${lastError ?? 'Unknown error'}';
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_autoSyncService?.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user