* Divide synnchronization releases on two parts

anilibria · May 20, 2022 · a33dafd · a33dafd
1 parent d26109a
commit a33dafd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/src/Classes/Services/anilibriaapiservice.cpp b/src/Classes/Services/anilibriaapiservice.cpp
@@ -45,7 +45,7 @@ AnilibriaApiService::AnilibriaApiService(QObject *parent) : QObject(parent),
     }
 }
 
-void AnilibriaApiService::getAllReleases()
+void AnilibriaApiService::getAllReleases(const int count, const int page)
 {
     auto networkManager = new QNetworkAccessManager(this);
     QNetworkRequest request(QUrl(AnilibriaApiPath + "public/api/index.php"));
@@ -54,8 +54,8 @@ void AnilibriaApiService::getAllReleases()
 
     QUrlQuery params;
     params.addQueryItem("query", "list");
-    params.addQueryItem("page", "1");
-    params.addQueryItem("perPage", "1500");
+    params.addQueryItem("page", QString::number(page));
+    params.addQueryItem("perPage", QString::number(count));
 
     connect(networkManager,&QNetworkAccessManager::finished,this,&AnilibriaApiService::getAllReleasesResponse);
 

diff --git a/src/Classes/Services/anilibriaapiservice.h b/src/Classes/Services/anilibriaapiservice.h
@@ -35,7 +35,7 @@ class AnilibriaApiService : public QObject
     QQueue<int>* m_QueuedDeletedFavorites;
     QString m_FavoriteToken;
 
-    void getAllReleases();
+    void getAllReleases(const int count, const int page);
     void getYoutubeVideos();
     void getSchedule();
     void signin(QString email, QString password, QString fa2code);

diff --git a/src/Classes/Services/synchronizationservice.cpp b/src/Classes/Services/synchronizationservice.cpp
@@ -40,9 +40,9 @@ SynchronizationService::SynchronizationService(QObject *parent) : QObject(parent
     connect(m_dlService, &DLService::allSynchronized, this, &SynchronizationService::saveReleasesFromDLToCache);
 }
 
-void SynchronizationService::synchronizeReleases()
+void SynchronizationService::synchronizeReleases(const int page)
 {
-    m_AnilibriaApiService->getAllReleases();
+    m_AnilibriaApiService->getAllReleases(800, page);
 }
 
 void SynchronizationService::synchronizeSchedule()

diff --git a/src/Classes/Services/synchronizationservice.h b/src/Classes/Services/synchronizationservice.h
@@ -36,7 +36,7 @@ class SynchronizationService : public QObject
 public:    
     explicit SynchronizationService(QObject *parent = nullptr);
 
-    Q_INVOKABLE void synchronizeReleases();
+    Q_INVOKABLE void synchronizeReleases(const int page);
     Q_INVOKABLE void synchronizeSchedule();
     Q_INVOKABLE void authorize(QString email, QString password, QString fa2code);
     Q_INVOKABLE void signout(QString token);

diff --git a/src/Classes/ViewModels/releasesviewmodel.cpp b/src/Classes/ViewModels/releasesviewmodel.cpp
@@ -897,7 +897,8 @@ void ReleasesViewModel::updateAllReleases(const QString &releases, bool insideDa
                 mapToFullReleaseModel(jsonRelease.toObject(), isFirstStart, hittedMaps);
             }
 
-            markDeletedReleases(hittedMaps);
+            //temporatily disable deleting releases because synchronization diveded on few parts
+            //markDeletedReleases(hittedMaps);
 
             saveReleasesFromMemoryToFile();
             saveChanges();
@@ -1664,11 +1665,14 @@ void ReleasesViewModel::releasesUpdated()
     setCountReleases(m_releases->count());
     m_items->refresh();
 
-    m_synchronizationService->synchronizeSchedule();
-    if (!m_applicationSettings->userToken().isEmpty()) m_synchronizationService->synchronizeUserFavorites(m_applicationSettings->userToken());
+    if (m_synchronizationEnabled) {
+        m_synchronizationService->synchronizeSchedule();
+        if (!m_applicationSettings->userToken().isEmpty()) m_synchronizationService->synchronizeUserFavorites(m_applicationSettings->userToken());
 
-    setSynchronizationEnabled(false);
+        m_synchronizationService->synchronizeReleases(2);
 
+        setSynchronizationEnabled(false);
+    }
     emit afterSynchronizedReleases();
 }
 

diff --git a/src/Views/Releases.qml b/src/Views/Releases.qml
@@ -147,7 +147,7 @@ Page {
                         if (releasesViewModel.synchronizationEnabled) return;
 
                         releasesViewModel.synchronizationEnabled = true;
-                        synchronizationService.synchronizeReleases();
+                        synchronizationService.synchronizeReleases(1);
                     }
                 }
 

diff --git a/src/main.qml b/src/main.qml
@@ -631,7 +631,7 @@ ApplicationWindow {
         id: synchronizationService
         Component.onCompleted: {
             releasesViewModel.synchronizationEnabled = true;
-            synchronizeReleases();
+            synchronizeReleases(1);
         }
 
         onUserDataReceived: {