Merged Pull Request #10 with fixes

h4ck-rOOt · Jan 30, 2017 · 52327f2 · 52327f2
1 parent f018758
commit 52327f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/LyndaDecryptor/Decryptor.cs b/LyndaDecryptor/Decryptor.cs
@@ -126,8 +126,10 @@ public void DecryptAll(string folderPath, string outputFolder = "")
             if (!Directory.Exists(folderPath))
                 throw new DirectoryNotFoundException();
 
-            if (!string.IsNullOrWhiteSpace(outputFolder))
-                OutputDirectory = Directory.Exists(outputFolder) ? new DirectoryInfo(outputFolder) : Directory.CreateDirectory(outputFolder);
+            if(string.IsNullOrWhiteSpace(outputFolder))
+                outputFolder = Path.Combine(Path.GetDirectoryName(folderPath), "decrypted");
+
+            OutputDirectory = Directory.Exists(outputFolder) ? new DirectoryInfo(outputFolder) : Directory.CreateDirectory(outputFolder);
 
             foreach (string entry in Directory.EnumerateFiles(folderPath, "*.lynda", SearchOption.AllDirectories))
             {

diff --git a/LyndaDecryptor/Program.cs b/LyndaDecryptor/Program.cs
@@ -46,7 +46,7 @@ static void Main(string[] args)
 
 
                 if (decryptorOptions.UsageMode == Mode.Folder)
-                    decryptor.DecryptAll(decryptorOptions.InputPath, decryptorOptions.OutputPath);
+                    decryptor.DecryptAll(decryptorOptions.InputPath, decryptorOptions.OutputFolder);
                 else if (decryptorOptions.UsageMode == Mode.File)
                     decryptor.Decrypt(decryptorOptions.InputPath, decryptorOptions.OutputPath);
             }