Repair: remove database size condition check, update: small code changes

themitosan · Dec 16, 2024 · b2db154 · b2db154
1 parent 978565f
commit b2db154
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 33 deletions.
diff --git a/Lang/pt-br.json b/Lang/pt-br.json
@@ -110,7 +110,6 @@
     "repair": {
 
         "warnUnablePerformRepair": "AVISO - Não foi possível realizar reparo!\nMotivo: %VAR_0%",
-        "warnUnablePerformRepair_noRepos": "Não há repositórios no banco de dados!",
 
         "infoCheckDatabaseFiles": "INFO - Verificando lista de repositórios...",
 

diff --git a/src/lang.ts b/src/lang.ts
@@ -136,7 +136,6 @@ export var langDatabase:any = {
     "repair": {
 
         "warnUnablePerformRepair": "WARN - Unable to perform repair!\nReason: %VAR_0%",
-        "warnUnablePerformRepair_noRepos": "There is no repos on database!",
 
         "infoCheckDatabaseFiles": "INFO - Checking repo list...",
 

diff --git a/src/repair.ts b/src/repair.ts
@@ -67,10 +67,7 @@ export async function grpp_startRepairDatabase(){
     repoList = structuredClone([...Object.keys(grppSettings.repoEntries)]);
 
     // Test conditions to not run repair process
-    if (repoList.length === 0) reasonList.push(langDatabase.repair.warnUnablePerformRepair_noRepos);
     if (module_fs.existsSync(`${process.cwd()}/.temp/`) === !0) reasonList.push(langDatabase.common.errorBatchUpdateRunning);
-
-    // Check if can start repair process
     execReasonListCheck(reasonList, langDatabase.repair.warnUnablePerformRepair, async function(){
 
         // Filter git folders

diff --git a/src/update.ts b/src/update.ts
@@ -203,47 +203,59 @@ export async function grpp_processBatchFile(id:number){
 }
 
 /**
-    * Start GRPP update process
+    * Sort repos to be updatd
+    * @param repoList [string[]] List to be sorted
+    * @returns [string[]] New list with sorted items
 */
-async function grpp_startBatchUpdate(){
+async function grpp_sortBatchList(repoList:string[]):Promise<string[]> {
+    return new Promise<string[]>(function(resolve){
 
-    // Declare vars
-    var completedRunners = 0,
-        updateList:string[] = [],
-        priorityRepos:string[] = [];
+        var updateList:string[] = [],
+            priorityRepos:string[] = [];
 
-    // Set current time to measure update time, set tempDir var and check if it exists. If so, remove it and create a new one
-    tempDir = structuredClone(`${process.cwd()}/.temp`);
-    startUpdateTime = structuredClone(performance.now());
-    if (module_fs.existsSync(tempDir) === !0) module_fs.rmSync(tempDir, { recursive: !0 });
-    module_fs.mkdirSync(tempDir);
+        repoList.forEach(function(currentRepo){
 
-    // Filter repos that cannot be updated
-    createLogEntry(`INFO - Creating update list...`);
-    Object.keys(grppSettings.repoEntries).forEach(function(currentRepo){
+            // Get current repo data and check if can update
+            const repoData:grppRepoEntry = grppSettings.repoEntries[currentRepo];
+            if (repoData.canUpdate === !0){
 
-        // Get current repo data and check if can update
-        const repoData:grppRepoEntry = grppSettings.repoEntries[currentRepo];
-        if (repoData.canUpdate === !0){
+                if (repoData.isPriority === !0){
+                    priorityRepos.push(currentRepo);
+                } else {
+                    updateList.push(currentRepo);
+                }
+                totalReposQueued++;
 
-            if (repoData.isPriority === !0){
-                priorityRepos.push(currentRepo);
             } else {
-                updateList.push(currentRepo);
+                skippedRepos.push(currentRepo);
             }
-            totalReposQueued++;
 
-        } else {
-            skippedRepos.push(currentRepo);
-        }
+        });
+
+        // Put priority repos first if priority list isn't empty and return sorted list
+        if (priorityRepos.length !== 0) updateList = [ ...priorityRepos, ...updateList ];
+        resolve(updateList);
 
     });
+}
 
-    // Put priority repos first if priority list isn't empty
-    if (priorityRepos.length !== 0) updateList = [ ...priorityRepos, ...updateList ];
+/**
+    * Start GRPP update process
+*/
+async function grpp_startBatchUpdate(){
 
-    // Split update list on given runners, create GRPP batch files and set total res files / queued repos vars
-    const chunkList = spliceArrayIntoChunks(updateList, grppSettings.maxReposPerList);
+    // Set current time to measure update time, set tempDir var and check if it exists. If so, remove it and create a new one
+    var completedRunners = 0;
+    tempDir = structuredClone(`${process.cwd()}/.temp`);
+    startUpdateTime = structuredClone(performance.now());
+    if (module_fs.existsSync(tempDir) === !0) module_fs.rmSync(tempDir, { recursive: !0 });
+    module_fs.mkdirSync(tempDir);
+
+    // Split update list on given runners, create GRPP batch file and set total res files / queued repos vars
+    createLogEntry(`INFO - Creating update list...`);
+    const
+        updateList = await grpp_sortBatchList(Object.keys(grppSettings.repoEntries)),
+        chunkList = spliceArrayIntoChunks(updateList, grppSettings.maxReposPerList);
     module_fs.writeFileSync(`${tempDir}/GRPP_BATCH.json`, JSON.stringify({ batchList: chunkList }), 'utf-8');
     totalResFiles = structuredClone(chunkList.length);