Show assemblies and shared libraries total differences in summary

Author: radekdoulik

ApkDescription.cs

@@ -27,6 +27,8 @@ public class ApkDescription {
 		[DataMember]
 		readonly Dictionary<string, FileProperties> Entries = new Dictionary<string, FileProperties> ();
 
+		Dictionary<string, (long Difference, long OriginalTotal)> totalDifferences = new Dictionary<string, (long, long)> ();
+
 		public static ApkDescription Load (string path)
 		{
 			if (!File.Exists (path)) {
@@ -103,12 +105,63 @@ void SaveDescription (string path)
 			}
 		}
 
-		static public void PrintDifference (string key, long diff, string comment = null, string padding = null)
+		static ConsoleColor PrintDifferenceStart (string key, long diff, string comment = null, string padding = null)
 		{
-			var color = diff > 0 ? ConsoleColor.Red : ConsoleColor.Green;
-			Program.ColorWrite ($"{padding}  {diff:+;-;+}{Math.Abs (diff),12}", color);
+			var color = diff == 0 ? ConsoleColor.Gray : diff > 0 ? ConsoleColor.Red : ConsoleColor.Green;
+			Program.ColorWrite ($"{padding}  {diff:+;-;+}{Math.Abs (diff),12:#,0}", color);
 			Program.ColorWrite ($" {key}", ConsoleColor.Gray);
-			Program.ColorWriteLine (comment, color);
+			Program.ColorWrite (comment, color);
+
+			return color;
+		}
+
+		static public void PrintDifference (string key, long diff, string comment = null, string padding = null)
+		{
+			PrintDifferenceStart (key, diff, comment, padding);
+			Console.WriteLine ();
+		}
+
+		static public void PrintDifference (string key, long diff, long orig, string comment = null, string padding = null)
+		{
+			var color = PrintDifferenceStart (key, diff, comment, padding);
+
+			if (orig != 0)
+				Program.ColorWrite ($" {(float)diff/orig:0.00%} (of {orig:#,0})", color);
+
+			Console.WriteLine ();
+		}
+
+		void AddToTotal (string entry, long size)
+		{
+			var entryDiff = EntryDiff.ForExtension (Path.GetExtension (entry));
+			if (entryDiff == null)
+				return;
+
+			var diffType = entryDiff.Name;
+			if (!totalDifferences.ContainsKey (diffType))
+				totalDifferences.Add (diffType, (0, size));
+			else {
+				var info = totalDifferences [diffType];
+				totalDifferences [diffType] = (info.Difference, info.OriginalTotal + size);
+			}
+		}
+
+		bool AddToDifference (string entry, long diff, out EntryDiff entryDiff)
+		{
+			entryDiff = EntryDiff.ForExtension (Path.GetExtension (entry));
+
+			if (entryDiff == null)
+				return false;
+
+			var diffType = entryDiff.Name;
+			if (!totalDifferences.ContainsKey (diffType))
+				totalDifferences.Add (diffType, (diff, 0));
+			else {
+				var info = totalDifferences [diffType];
+				totalDifferences [diffType] = (info.Difference + diff, info.OriginalTotal);
+			}
+
+			return true;
 		}
 
 		public void Compare (ApkDescription other)
@@ -129,6 +182,8 @@ public void Compare (ApkDescription other)
 					differences [key] = -Entries [key].Size;
 					singles.Add (key);
 				}
+
+				AddToTotal (key, Entries [key].Size);
 			}
 
 			foreach (var key in other.Entries.Keys) {
@@ -147,24 +202,26 @@ public void Compare (ApkDescription other)
 
 				PrintDifference (diff.Key, diff.Value, single ? $" *{(diff.Value > 0 ? 2 : 1)}" : null);
 
+				EntryDiff entryDiff;
+				if (!AddToDifference (diff.Key, diff.Value, out entryDiff))
+					continue;
+
 				if (comparingApks && !single)
-					CompareEntries (new KeyValuePair<string, FileProperties> (diff.Key, Entries [diff.Key]), new KeyValuePair<string, FileProperties> (diff.Key, other.Entries [diff.Key]), other);
+					CompareEntries (new KeyValuePair<string, FileProperties> (diff.Key, Entries [diff.Key]), new KeyValuePair<string, FileProperties> (diff.Key, other.Entries [diff.Key]), other, entryDiff);
 			}
 
 			Program.ColorWriteLine ("Summary:", ConsoleColor.Green);
 			if (Program.Verbose)
 				Program.ColorWriteLine ($"  apk1: {PackageSize,12}  {PackagePath}\n  apk2: {other.PackageSize,12}  {other.PackagePath}", ConsoleColor.Gray);
 
+			foreach (var total in totalDifferences)
+				PrintDifference ($"{total.Key} ", total.Value.Difference, total.Value.OriginalTotal);
+
 			PrintDifference ("Package size difference", other.PackageSize - PackageSize);
 		}
 
-		void CompareEntries (KeyValuePair<string, FileProperties> entry, KeyValuePair<string, FileProperties> other, ApkDescription otherApk)
+		void CompareEntries (KeyValuePair<string, FileProperties> entry, KeyValuePair<string, FileProperties> other, ApkDescription otherApk, EntryDiff diff)
 		{
-			var diff = EntryDiff.ForExtension (Path.GetExtension (entry.Key));
-
-			if (diff == null)
-				return;
-
 			var tmpDir = Path.Combine (Path.GetTempPath (), Path.GetRandomFileName ());
 			var tmpDirOther = Path.Combine (Path.GetTempPath (), Path.GetRandomFileName ());
 

AssemblyDiff.cs

@@ -14,6 +14,8 @@ public AssemblyDiff ()
 		{
 		}
 
+		public override string Name { get { return "Assemblies"; } }
+
 		TypeDefinition GetTypeDefinition (MetadataReader reader, TypeDefinitionHandle handle, out string fullName)
 		{
 			var typeDef = reader.GetTypeDefinition (handle);

EntryDiff.cs

@@ -2,6 +2,9 @@
 
 namespace apkdiff {
 	public abstract class EntryDiff {
+
+		public abstract string Name { get; }
+
 		public static EntryDiff ForExtension (string extension)
 		{
 			switch (extension) {

SharedLibraryDiff.cs

@@ -8,6 +8,8 @@ public SharedLibraryDiff ()
 		{
 		}
 
+		public override string Name { get { return "Shared libraries"; } }
+
 		string RunCommand (string cmd, string arguments)
 		{
 			String output;