Merge remote-tracking branch 'origin/clean_console_output' into mac_arm64

Author: xdegtyarev

Analyzer/AnalyzerTool.cs

@@ -30,6 +30,10 @@ public int Analyze(string path, string databaseName, string searchPattern, bool
         int lastLength = 0;
         foreach (var file in files)
         {
+            // Automatically ignore these annoying OS X style files meta files.
+            if (Path.GetFileName(file) == ".DS_Store")
+                continue;
+
             try
             {
                 UnityArchive archive = null;
@@ -44,9 +48,11 @@ public int Analyze(string path, string databaseName, string searchPattern, bool
 
                     var relativePath = Path.GetRelativePath(path, file);
 
-                    Console.Write($"\rProcessing {i * 100 / files.Length}% ({i}/{files.Length}) {file}");
-
                     writer.WriteSerializedFile(relativePath, file, Path.GetDirectoryName(file));
+
+                    var message = $"Processing {i * 100 / files.Length}% ({i}/{files.Length}) {file}";
+                    Console.Write($"\rProcessing {i * 100 / files.Length}% ({i}/{files.Length}) {file}");
+                    lastLength = message.Length;
                 }
 
                 if (archive != null)
@@ -71,22 +77,29 @@ public int Analyze(string path, string databaseName, string searchPattern, bool
                                 }
                                 catch (Exception e)
                                 {
-                                    Console.Error.WriteLine($"Error processing {node.Path} in archive {file}");
+                                    Console.Error.WriteLine($"\rError processing {node.Path} in archive {file}{new string(' ', Math.Max(0, lastLength - message.Length))}");
+                                    Console.Error.WriteLine(e);
+                                    Console.WriteLine();
                                 }
                             }
                         }
                     }
                     finally
                     {
+                        Console.Write($"\r{new string(' ', lastLength)}");
                         writer.EndAssetBundle();
                         archive.Dispose();
                     }
                 }
             }
-            catch (Exception e)
+            catch(NotSupportedException) {
+                Console.Error.WriteLine();
+                //Console.Error.WriteLine($"File not supported: {file}"); // This is commented out because another codepath will output "failed to load"
+            }
+            catch (Exception e) 
             {
                 Console.Error.WriteLine();
-                Console.Error.WriteLine($"Error processing file {file}!");
+                Console.Error.WriteLine($"Error processing file: {file}");
                 Console.Write($"{e.GetType()}: ");
                 Console.WriteLine(e.Message);
                 Console.WriteLine(e.StackTrace);

Analyzer/PPtrAndCrcProcessor.cs

@@ -290,7 +290,7 @@ private void ProcessManagedReferenceRegistry(TypeTreeNode node)
         }
         else
         {
-            throw new Exception("Unsupported ManagedReferenceRegistry version");
+            throw new Exception($"Unsupported ManagedReferenceRegistry version {version}");
         }
     }
 

Analyzer/SQLite/SQLiteWriter.cs

@@ -78,10 +78,10 @@ public void Begin()
 
         foreach (var handler in m_Handlers.Values)
         {
-            Console.WriteLine($"Init handler: {handler.GetType().Name}");
-            Console.WriteLine($"Connection state before init: {m_Database.State}");
+            // Console.WriteLine($"Init handler: {handler.GetType().Name}");
+            // Console.WriteLine($"Connection state before init: {m_Database.State}");
             handler.Init(m_Database);
-            Console.WriteLine($"Connection state after init: {m_Database.State}");
+            // Console.WriteLine($"Connection state after init: {m_Database.State}");
 
         }
 
@@ -289,15 +289,7 @@ public void WriteSerializedFile(string relativePath, string fullPath, string con
 
                 if (!m_SkipReferences)
                 {
-                    try
-                    {
-                        crc32 = pptrReader.Process(currentObjectId, offset, root);
-                    }
-                    catch (Exception e)
-                    {
-                        Console.Error.WriteLine(e);
-                        throw;
-                    }
+                    crc32 = pptrReader.Process(currentObjectId, offset, root);
                 }
 
                 m_AddObjectCommand.Parameters["@id"].Value = currentObjectId;
@@ -325,7 +317,6 @@ public void WriteSerializedFile(string relativePath, string fullPath, string con
         }
         catch (Exception e)
         {
-            Console.Error.WriteLine($"Error processing {serializedFileId} error: {e.Message}");
             transaction.Rollback();
             throw;
         }

TextDumper/TextDumperTool.cs

@@ -262,7 +262,7 @@ void DumpManagedReferenceRegistry(TypeTreeNode node, ref long offset, int level)
         }
         else
         {
-            throw new Exception("Unsupported ManagedReferenceRegistry version");
+            throw new Exception($"Unsupported ManagedReferenceRegistry version {version}");
         }
     }
 

UnityFileSystem/TypeTreeReaders/RandomAccessReader.cs

@@ -117,7 +117,7 @@ public RandomAccessReader(SerializedFile serializedFile, TypeTreeNode node, Unit
                 }
                 else
                 {
-                    throw new Exception("Unsupported ManagedReferenceRegistry version");
+                    throw new Exception($"Unsupported ManagedReferenceRegistry version {version}");
                 }
             }
             else if (isReferencedObject)