Fix ignoring user specified data directory (jo3bingham#39)

nekiro · web-flow · commit b0c3899fbd6a · 2020-08-21T10:42:27.000-04:00
* Fix ignoring user specified data directory

* Fix pointed out problems, correctly check for string being invalid and log more descriptive message
diff --git a/Apps/Extract/Program.cs b/Apps/Extract/Program.cs
@@ -453,14 +453,25 @@ private static void ExtractRecordings(List<string> filenames)
                     Console.WriteLine($"Client version: {version}");
                     if (int.TryParse(version.Replace(".", ""), out var versionNumber))
                     {
-                        var clientDataDirectory = $"ClientData/{versionNumber}";
-                        if (!Directory.Exists(clientDataDirectory))
+                        if (!string.IsNullOrEmpty(_tibiaDirectory))
                         {
-                            Console.WriteLine($"ClientData directory for version {version} doesn't exist. Falling back to default Tibia directory.");
+                            if (!Directory.Exists(_tibiaDirectory))
+                            {
+                                Console.WriteLine($"[Error] The provided directory does not exist: ${_tibiaDirectory}");
+                                return;
+                            }
                         }
                         else
                         {
-                            _tibiaDirectory = clientDataDirectory;
+                            var clientDataDirectory = $"ClientData/{versionNumber}";
+                            if (!Directory.Exists(clientDataDirectory))
+                            {
+                                Console.WriteLine($"ClientData directory for version {version} doesn't exist. Falling back to default Tibia directory.");
+                            }
+                            else
+                            {
+                                _tibiaDirectory = clientDataDirectory;
+                            }
                         }
                     }
                     else

Original file line number	Diff line number	Diff line change
`@@ -453,14 +453,25 @@ private static void ExtractRecordings(List<string> filenames)`
`453`	`453`	`Console.WriteLine($"Client version: {version}");`
`454`	`454`	`if (int.TryParse(version.Replace(".", ""), out var versionNumber))`
`455`	`455`	`{`
`456`		`- var clientDataDirectory = $"ClientData/{versionNumber}";`
`457`		`- if (!Directory.Exists(clientDataDirectory))`
	`456`	`+ if (!string.IsNullOrEmpty(_tibiaDirectory))`
`458`	`457`	`{`
`459`		`- Console.WriteLine($"ClientData directory for version {version} doesn't exist. Falling back to default Tibia directory.");`
	`458`	`+ if (!Directory.Exists(_tibiaDirectory))`
	`459`	`+ {`
	`460`	`+ Console.WriteLine($"[Error] The provided directory does not exist: ${_tibiaDirectory}");`
	`461`	`+ return;`
	`462`	`+ }`
`460`	`463`	`}`
`461`	`464`	`else`
`462`	`465`	`{`
`463`		`- _tibiaDirectory = clientDataDirectory;`
	`466`	`+ var clientDataDirectory = $"ClientData/{versionNumber}";`
	`467`	`+ if (!Directory.Exists(clientDataDirectory))`
	`468`	`+ {`
	`469`	`+ Console.WriteLine($"ClientData directory for version {version} doesn't exist. Falling back to default Tibia directory.");`
	`470`	`+ }`
	`471`	`+ else`
	`472`	`+ {`
	`473`	`+ _tibiaDirectory = clientDataDirectory;`
	`474`	`+ }`
`464`	`475`	`}`
`465`	`476`	`}`
`466`	`477`	`else`