Merge pull request #49 from LuccaSA/FixPassFileAgrs

Fix du déchiffrement avec un mot de passe par fichier
LuccaSA · Mar 9, 2023 · 6c6da7b · 6c6da7b
2 parents 69e19b4 + 2a73adb
commit 6c6da7b
Showing 1 changed file with 25 additions and 19 deletions.
diff --git a/TCC.Lib/Dependencies/CompressionCommands.cs b/TCC.Lib/Dependencies/CompressionCommands.cs
@@ -136,33 +136,39 @@ public string DecompressCommand(DecompressionBlock block, TccOption option)
                     cmd.Append($" | {_ext.Tar()} xf - ");
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(option));
+                    throw new ArgumentOutOfRangeException(nameof(option), "Unknown PasswordMode");
             }
             return cmd.ToString();
         }
 
         private static string PasswordCommand(TccOption option, Block block)
         {
-            string passwdCommand;
-            if (option.PasswordOption.PasswordMode == PasswordMode.InlinePassword
-                && option.PasswordOption is InlinePasswordOption inlinePassword)
-            {
-                if (String.IsNullOrWhiteSpace(inlinePassword.Password))
-                {
-                    throw new CommandLineException("Password missing");
-                }
-                passwdCommand = "-k " + inlinePassword.Password;
-            }
-            else
+
+            switch (option.PasswordOption.PasswordMode)
             {
-                if (String.IsNullOrWhiteSpace(block.BlockPasswordFile))
-                {
-                    throw new CommandLineException("Password file missing");
-                }
-                passwdCommand = "-kfile " + block.BlockPasswordFile.Escape();
+                case PasswordMode.None:
+                    return string.Empty;
+                case PasswordMode.InlinePassword when option.PasswordOption is InlinePasswordOption inlinePassword:
+                    if (string.IsNullOrWhiteSpace(inlinePassword.Password))
+                    {
+                        throw new CommandLineException("Password missing");
+                    }
+                    return "-k " + inlinePassword.Password;
+                case PasswordMode.PasswordFile when option.PasswordOption is PasswordFileOption passwordFile:
+                    if (string.IsNullOrWhiteSpace(passwordFile.PasswordFile))
+                    {
+                        throw new CommandLineException("Password file missing");
+                    }
+                    return "-kfile " + passwordFile.PasswordFile.Escape();
+                case PasswordMode.PublicKey:
+                    if (string.IsNullOrWhiteSpace(block.BlockPasswordFile))
+                    {
+                        throw new CommandLineException("Password file missing");
+                    }
+                    return "-kfile " + block.BlockPasswordFile.Escape();
+                default:
+                    throw new NotSupportedException($"PasswordMode: {option.PasswordOption.PasswordMode} is not supported");
             }
-
-            return passwdCommand;
         }
     }
 }