Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Unified Diff: ios/chrome/browser/reading_list/reading_list_download_service.cc

Issue 2650753003: [ReadingList iOS] Cleanup Offline directory on startup (Closed)
Patch Set: comment Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/reading_list/reading_list_download_service.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/reading_list/reading_list_download_service.cc
diff --git a/ios/chrome/browser/reading_list/reading_list_download_service.cc b/ios/chrome/browser/reading_list/reading_list_download_service.cc
index daab65cdce7a03cd09df80d8eff9eaa089d2c2f3..dc3aa52bf1812f2023cd71ec4966d4a358d474a6 100644
--- a/ios/chrome/browser/reading_list/reading_list_download_service.cc
+++ b/ios/chrome/browser/reading_list/reading_list_download_service.cc
@@ -7,7 +7,9 @@
#include <utility>
#include "base/bind.h"
+#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "components/reading_list/ios/offline_url_utils.h"
@@ -81,7 +83,7 @@ void ReadingListDownloadService::Shutdown() {
void ReadingListDownloadService::ReadingListModelLoaded(
const ReadingListModel* model) {
DCHECK_EQ(reading_list_model_, model);
- DownloadAllEntries();
+ SyncWithModel();
}
void ReadingListDownloadService::ReadingListWillRemoveEntry(
@@ -116,9 +118,49 @@ void ReadingListDownloadService::ProcessNewEntry(const GURL& url) {
}
}
-void ReadingListDownloadService::DownloadAllEntries() {
+void ReadingListDownloadService::SyncWithModel() {
DCHECK(reading_list_model_->loaded());
+ std::set<std::string> processed_directories;
+ std::set<GURL> unprocessed_entries;
for (const auto& url : reading_list_model_->Keys()) {
+ const ReadingListEntry* entry = reading_list_model_->GetEntryByURL(url);
+ switch (entry->DistilledState()) {
+ case ReadingListEntry::PROCESSED:
+ processed_directories.insert(reading_list::OfflineURLDirectoryID(url));
+ break;
+ case ReadingListEntry::WAITING:
+ case ReadingListEntry::PROCESSING:
+ case ReadingListEntry::WILL_RETRY:
+ unprocessed_entries.insert(url);
+ break;
+ case ReadingListEntry::ERROR:
+ break;
+ }
+ }
+ web::WebThread::PostTaskAndReply(
+ web::WebThread::FILE, FROM_HERE,
+ base::Bind(&ReadingListDownloadService::CleanUpFiles,
+ base::Unretained(this), processed_directories),
+ base::Bind(&ReadingListDownloadService::DownloadUnprocessedEntries,
+ base::Unretained(this), unprocessed_entries));
+}
+
+void ReadingListDownloadService::CleanUpFiles(
+ const std::set<std::string>& processed_directories) {
+ base::FileEnumerator file_enumerator(OfflineRoot(), false,
+ base::FileEnumerator::DIRECTORIES);
+ for (base::FilePath sub_directory = file_enumerator.Next();
+ !sub_directory.empty(); sub_directory = file_enumerator.Next()) {
+ std::string directory_name = sub_directory.BaseName().value();
+ if (!processed_directories.count(directory_name)) {
+ base::DeleteFile(sub_directory, true);
+ }
+ }
+}
+
+void ReadingListDownloadService::DownloadUnprocessedEntries(
+ const std::set<GURL>& unprocessed_entries) {
+ for (const GURL& url : unprocessed_entries) {
this->ScheduleDownloadEntry(url);
}
}
« no previous file with comments | « ios/chrome/browser/reading_list/reading_list_download_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698