Update logging messages

Author: z80andrew

SerialDisk/Common/Constants.cs

@@ -21,7 +21,7 @@ public static Dictionary<string, string> ConsoleParameterMappings
                     { "--disk-size", "DiskSettings:DiskSizeMiB" },
                     { "--tos-version", "DiskSettings:DiskTOSCompatibility" },
                     { "--root-directory-sectors", "DiskSettings:RootDirectorySectors" },
-                    { "--data-compression", "CompressionIsEnabled" },
+                    { "--compression", "CompressionIsEnabled" },
 
                     { "--port", "SerialSettings:PortName" },
                     { "--baud-rate", "SerialSettings:BaudRate" },

SerialDisk/Comms/Serial.cs

@@ -370,10 +370,9 @@ private void SendData()
             _logger.Log("Sending data...", LoggingLevel.Verbose);
 
             if (_receivedSectorCount == 1)
-                _logger.Log("Reading sector " + _receivedSectorIndex + " (" + _localDisk.Parameters.BytesPerSector + " Bytes)... ", LoggingLevel.Info);
+                _logger.Log("Reading sector " + _receivedSectorIndex, LoggingLevel.Info);
             else
-                _logger.Log("Reading sectors " + _receivedSectorIndex + " - " + (_receivedSectorIndex + _receivedSectorCount - 1) + " (" + (_receivedSectorCount * _localDisk.Parameters.BytesPerSector) + " Bytes)... ", LoggingLevel.Info);
-
+                _logger.Log("Reading sectors " + _receivedSectorIndex + " - " + (_receivedSectorIndex + _receivedSectorCount - 1), LoggingLevel.Info);
 
             byte[] sendDataBuffer = _localDisk.ReadSectors((int)_receivedSectorIndex, (int)_receivedSectorCount);
 
@@ -383,13 +382,19 @@ private void SendData()
 
             if(_compressionIsEnabled) serialFlags |= _serialFlags.compression;
 
-            _logger.Log($"Sending data flags: {serialFlags.ToString()}...", LoggingLevel.Verbose);
+            _logger.Log($"Sending serial flags: {serialFlags.ToString()}...", LoggingLevel.Verbose);
             _serialPort.BaseStream.WriteByte(Convert.ToByte(serialFlags));
 
+            var numUncompressedBytes = sendDataBuffer.Length;
+
+            string sendingMessage = $"Sending {numUncompressedBytes} bytes";
+
             if (serialFlags.HasFlag(_serialFlags.compression))
             {
                 sendDataBuffer = Utilities.LZ4.CompressAsStandardLZ4Block(sendDataBuffer);
 
+                sendingMessage = $"Sending {sendDataBuffer.Length} bytes";
+
                 _transferStartDateTime = DateTime.Now;
 
                 byte[] dataLenBuffer = new byte[4];
@@ -398,11 +403,15 @@ private void SendData()
                 dataLenBuffer[2] = (byte)((sendDataBuffer.Length >> 8) & 0xff);
                 dataLenBuffer[3] = (byte)(sendDataBuffer.Length & 0xff);
 
-                _logger.Log($"Sending compressed data ({sendDataBuffer.Length} bytes)...", LoggingLevel.Verbose);
+                float percentageOfOriginalSize = (100 / (float)numUncompressedBytes) * sendDataBuffer.Length;
+
+                _logger.Log($"Compression: { percentageOfOriginalSize.ToString("00.0")}% of { numUncompressedBytes} bytes", LoggingLevel.Verbose);
 
                 _serialPort.BaseStream.Write(dataLenBuffer, 0, dataLenBuffer.Length);
             }
 
+            _logger.Log(sendingMessage, LoggingLevel.Info);
+
             for (int i = 0; i < sendDataBuffer.Length; i++)
             {
                 _serialPort.BaseStream.WriteByte(sendDataBuffer[i]);