From 5a6f77a3f838e10fa24da14651d4f3fda5fb453a Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Tue, 2 Jul 2024 18:15:38 +0200 Subject: [PATCH] fix file download --- PadelClub/Views/Navigation/MainView.swift | 6 +++++- PadelClub/Views/Navigation/Umpire/PadelClubView.swift | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/PadelClub/Views/Navigation/MainView.swift b/PadelClub/Views/Navigation/MainView.swift index c7f7001..863975f 100644 --- a/PadelClub/Views/Navigation/MainView.swift +++ b/PadelClub/Views/Navigation/MainView.swift @@ -59,7 +59,11 @@ struct MainView: View { ActivityView() .tabItem(for: .activity) .onAppear { - if let lastDataSource, lastDataSource != URL.importDateFormatter.string(from: Date()), checkingFiles == false, importingFiles == false { + if lastDataSource == nil, checkingFiles == false, importingFiles == false { + Task { + await self._checkSourceFileAvailability() + } + } else if let lastDataSource, lastDataSource != URL.importDateFormatter.string(from: Date()), checkingFiles == false, importingFiles == false { Task { await self._checkSourceFileAvailability() } diff --git a/PadelClub/Views/Navigation/Umpire/PadelClubView.swift b/PadelClub/Views/Navigation/Umpire/PadelClubView.swift index e08d35e..820a5e6 100644 --- a/PadelClub/Views/Navigation/Umpire/PadelClubView.swift +++ b/PadelClub/Views/Navigation/Umpire/PadelClubView.swift @@ -9,6 +9,7 @@ import SwiftUI import LeStorage struct PadelClubView: View { + @State private var uuid: UUID = UUID() @State private var checkingFilesAttempt: Int = 0 @State private var checkingFiles: Bool = false @AppStorage("importingFiles") var importingFiles: Bool = false @@ -107,8 +108,8 @@ struct PadelClubView: View { } description: { Text("Padel Club peut importer toutes les données publiques de la FFT concernant tous les compétiteurs et compétitrices.") } actions: { - if lastDataSource != nil { - RowButtonView("Démarrer l'importation") { + if let _mostRecentDateAvailable { + RowButtonView("Démarrer l'importation de \(URL.importDateFormatter.string(from: _mostRecentDateAvailable))") { _startImporting() } } @@ -177,6 +178,7 @@ struct PadelClubView: View { } } } + .id(uuid) .task { await self._checkSourceFileAvailability() } @@ -238,6 +240,7 @@ struct PadelClubView: View { private func _downloadPreviousDate() async { await SourceFileManager.shared.getAllFiles(initialDate: "08-2022") + self.uuid = UUID() } }