From 852a5d7d85e5a59b471c54d55dcf451cd6c34aa5 Mon Sep 17 00:00:00 2001
From: abbodi1406 <abbodi86@gmail.com>
Date: Sat, 25 Sep 2021 19:18:22 +0300
Subject: [PATCH] Fix missing duplicate files

if 2nd file size < 1st file size, it's mistakenly skipped
e.g. Microsoft-Windows-Client-LanguagePack-Package multiple files
---
 get.php | 62 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/get.php b/get.php
index 433dc78..e19693c 100644
--- a/get.php
+++ b/get.php
@@ -159,17 +159,17 @@ function uupGetFiles(
         return $filesInfoList;
     }
 
+    $diffs = preg_grep('/.*_Diffs_.*|.*_Forward_CompDB_.*|\.cbsu\.cab$/i', array_keys($filesInfoList));
+    foreach($diffs as $val) {
+        if(isset($filesInfoList[$val])) unset($filesInfoList[$val]);
+    }
+
     if(!$sha256capable) {
         $baseless = preg_grep('/^baseless_|-baseless\....$/i', array_keys($filesInfoList));
         foreach($baseless as $val) {
             if(isset($filesInfoList[$val])) unset($filesInfoList[$val]);
         }
 
-        $diffs = preg_grep('/.*_Diffs_.*|.*_Forward_CompDB_.*|\.cbsu\.cab$/i', array_keys($filesInfoList));
-        foreach($diffs as $val) {
-            if(isset($filesInfoList[$val])) unset($filesInfoList[$val]);
-        }
-
         $psf = array_keys($filesInfoList);
         $psf = preg_grep('/\.psf$/i', $psf);
 
@@ -254,7 +254,8 @@ function uupGetFiles(
                     $name = $val;
                     $newFiles[$name] = $filesInfoList[$name];
                 } else {
-                    $failedFile = $val;
+                    $failedFile = true;
+					consoleLogger("Missing file: $val");
                 }
             }
         } else {
@@ -265,13 +266,13 @@ function uupGetFiles(
                 if(isset($filesInfoList[$name])) {
                     $newFiles[$name] = $filesInfoList[$name];
                 } else {
-                    $failedFile = $name;
+                    $failedFile = true;
+					consoleLogger("Missing file: $name");
                 }
             }
         }
 
         if($failedFile) {
-            consoleLogger("Missing file: $failedFile");
             return array('error' => 'MISSING_FILES');
         }
 
@@ -379,9 +380,17 @@ function uupGetOnlineFiles($updateId, $rev, $info, $cacheRequests, $type) {
             $size = $info[$sha1]['size'];
         }
 
-        if(!isset($fileSizes[$name])) $fileSizes[$name] = -2;
+        if($sha256capable) {
+            $n = strrpos($name, '.');
+            if($n === false) $n = strlen($name);
+            $newName = substr($name, 0, $n).'_'.substr($sha1, 0, 8).substr($name, $n);
+        } else {
+            $newName = $uupCleanFunc($name);
+        }
 
-        if($size > $fileSizes[$name]) {
+        if(!isset($fileSizes[$newName])) $fileSizes[$newName] = -2;
+
+        if($size > $fileSizes[$newName]) {
             preg_match('/P1=(.*?)&/', $url, $expire);
             if(isset($expire[0])) {
                 $expire = $expire[1];
@@ -396,7 +405,7 @@ function uupGetOnlineFiles($updateId, $rev, $info, $cacheRequests, $type) {
                 unset($temp);
             }
 
-            $fileSizes[$name] = $size;
+            $fileSizes[$newName] = $size;
 
             $temp = array();
             $temp['sha1'] = $sha1;
@@ -407,14 +416,6 @@ function uupGetOnlineFiles($updateId, $rev, $info, $cacheRequests, $type) {
             $temp['expire'] = $expire;
             $temp['debug'] = $val->asXML();
 
-            if($sha256capable) {
-                $n = strrpos($name, '.');
-                if($n === false) $n = strlen($name);
-                $newName = substr($name, 0, $n).'_'.substr($sha1, 0, 8).substr($name, $n);
-            } else {
-                $newName = $uupCleanFunc($name);
-            }
-
             $files[$newName] = $temp;
         }
     }
@@ -447,10 +448,19 @@ function uupGetOfflineFiles($info) {
         $name = $val['name'];
         $size = $val['size'];
         $sha256 = isset($val['sha256']) ? $val['sha256'] : null;
-        if(!isset($fileSizes[$name])) $fileSizes[$name] = 0;
 
-        if($size > $fileSizes[$name]) {
-            $fileSizes[$name] = $size;
+        if($sha256capable) {
+            $n = strrpos($name, '.');
+            if($n === false) $n = strlen($name);
+            $newName = substr($name, 0, $n).'_'.substr($sha1, 0, 8).substr($name, $n);
+        } else {
+            $newName = $uupCleanFunc($name);
+        }
+
+        if(!isset($fileSizes[$newName])) $fileSizes[$newName] = 0;
+
+        if($size > $fileSizes[$newName]) {
+            $fileSizes[$newName] = $size;
 
             $temp = array();
             $temp['sha1'] = $sha1;
@@ -461,14 +471,6 @@ function uupGetOfflineFiles($info) {
             $temp['expire'] = 0;
             $temp['debug'] = null;
 
-            if($sha256capable) {
-                $n = strrpos($name, '.');
-                if($n === false) $n = strlen($name);
-                $newName = substr($name, 0, $n).'_'.substr($sha1, 0, 8).substr($name, $n);
-            } else {
-                $newName = $uupCleanFunc($name);
-            }
-
             $files[$newName] = $temp;
         }
     }