From f16a781fcfe9cd29a23e5d627d1364ca2d46fe8b Mon Sep 17 00:00:00 2001
From: Zaxar163 <zahar.vcherachny@yandex.ru>
Date: Wed, 3 Jul 2019 20:15:09 +0300
Subject: [PATCH] =?UTF-8?q?[FEATURE]=20=D0=9E=D0=BF=D1=82=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B0=D0=BB=D0=B3=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D1=82=D0=BC=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../launcher/downloader/UpdateData.java       | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/downloader/UpdateData.java b/LauncherAPI/src/main/java/pro/gravit/launcher/downloader/UpdateData.java
index 227ad017..f248c45b 100644
--- a/LauncherAPI/src/main/java/pro/gravit/launcher/downloader/UpdateData.java
+++ b/LauncherAPI/src/main/java/pro/gravit/launcher/downloader/UpdateData.java
@@ -2,6 +2,7 @@
 
 import java.io.IOError;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -10,28 +11,50 @@
 import pro.gravit.utils.helper.IOHelper;
 
 public final class UpdateData {
+	private static final class Pair {
+		private int cnt = 0;
+		private long size = 0;
+	}
 	public static final int COUNT_LIMIT = 4;
 	public static final long AVG_LIMIT = IOHelper.MB*4;
 	public static final long TOTAL_LIMIT = IOHelper.MB*16;
-	
+	public static final double SIMPLE_DOWNLOAD_SIZE_COFF = 0.75D;
+	public static final double SIMPLE_DOWNLOAD_FILE_COPF = 0.5D;
+
 	private UpdateData() {
 	}
 
+	public static boolean needsZip(Pair p) {
+        long avg = p.size/(long)p.cnt;
+        return p.size < TOTAL_LIMIT && avg < AVG_LIMIT && p.cnt > COUNT_LIMIT;
+	}
+
 	public static boolean needsZip(HashedDir hDir) {
-        AtomicLong size = new AtomicLong();
-        AtomicInteger cnt = new AtomicInteger();
+        return needsZip(count(hDir));
+	}
+
+	public static boolean needsZipUpdate(HashedDir origd, HashedDir entryd) {
+		Pair orig = count(origd);
+		Pair entry = count(entryd);
+		if (!needsZip(orig)) return false;
+		double coffSize = BigDecimal.valueOf(entry.size).divide(BigDecimal.valueOf(orig.size)).doubleValue();
+		double coffCnt = BigDecimal.valueOf(entry.cnt).divide(BigDecimal.valueOf(orig.cnt)).doubleValue();
+		return coffSize >= SIMPLE_DOWNLOAD_SIZE_COFF && SIMPLE_DOWNLOAD_FILE_COPF <= coffCnt;
+	}
+	
+	private static Pair count(HashedDir hDir) {
+		final Pair pair = new Pair();
         try {
 			hDir.walk(IOHelper.CROSS_SEPARATOR, (p,n,e) -> {
 				if (e.getType().equals(HashedEntry.Type.FILE)) {
-					cnt.incrementAndGet();
-					size.addAndGet(e.size());
+					pair.cnt++;
+					pair.size += e.size();
 				}
 				return HashedDir.WalkAction.CONTINUE;
 			});
 		} catch (IOException e) {
 			throw new IOError(e); // never happen
 		}
-        long avg = size.get()/(long)cnt.get();
-        return size.get() < TOTAL_LIMIT && avg < AVG_LIMIT && cnt.get() > COUNT_LIMIT;
+        return pair;
 	}
 }