Renamed functions to better reflect their behavior

GoobyCorp · Feb 5, 2024 · 3030803 · 3030803
1 parent 94d9304
commit 3030803
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Program.cs b/Program.cs
@@ -41,7 +41,7 @@ static async Task<int> Main(string[] args) {
             }
 
             Console.WriteLine("Fetching download links and files...");
-            List<Task> tl = entries.ToList().Select((e) => FindDownloadExtractPackage(e.Creator, e.Mod)).ToList();
+            List<Task> tl = entries.ToList().Select((e) => FindDownloadExtractPackageAsync(e.Creator, e.Mod)).ToList();
             await Task.WhenAll(tl);
 
             Console.WriteLine("Creating modpack...");
@@ -57,7 +57,7 @@ static async Task<int> Main(string[] args) {
             return 0;
         }
 
-        internal static async Task FindDownloadExtractPackage(string creator, string mod) {
+        internal static async Task FindDownloadExtractPackageAsync(string creator, string mod) {
             var pe = await ThunderstoreAPI.PackageExperimental(creator, mod);
             string path = Path.Combine(DOWNLOAD_DIR, pe.Latest.FullName + ".zip");
             Console.WriteLine($"Downloading \"{pe.Namespace}/{pe.Name}\" version \"{pe.Latest.VersionNumber}\" to \"{path}\"...");
@@ -66,7 +66,7 @@ internal static async Task FindDownloadExtractPackage(string creator, string mod
         }
 
         internal static async Task ExtractModPackageAsync(string path) {
-            await Utilities.ExtractZipEntriesWithPrefix(path, PLUGIN_PREFIX, MODS_DIR);
+            await Utilities.ExtractZipEntriesWithPrefixAsync(path, PLUGIN_PREFIX, MODS_DIR);
         }
 
         internal static async Task CreateModPackageAsync(string path) {

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # This Company Is Getting Lethal
 
-A program for creating Lethal Company modpacks from [Thunderstore](https://thunderstore.io/c/lethal-company/)
+A program for creating [Lethal Company](https://store.steampowered.com/app/1966720/Lethal_Company/) modpacks from [Thunderstore](https://thunderstore.io/c/lethal-company/)
 
 A `config.json` file is required for this to work:
 

diff --git a/Utilities.cs b/Utilities.cs
@@ -4,7 +4,7 @@ namespace ThisCompanyIsGettingLethal
 {
     internal class Utilities
     {
-        internal static async Task ExtractZipEntriesWithPrefix(string zipPath, string prefix, string outPath) {
+        internal static async Task ExtractZipEntriesWithPrefixAsync(string zipPath, string prefix, string outPath) {
             using (ZipArchive archive = ZipFile.OpenRead(zipPath)) {
                 foreach (var entry in archive.Entries) {
                     if (String.IsNullOrEmpty(entry.Name))
@@ -13,8 +13,9 @@ internal static async Task ExtractZipEntriesWithPrefix(string zipPath, string pr
                         continue;
 
                     string finalPath = Path.Combine(outPath, Path.GetRelativePath(prefix, entry.FullName));
+                    if (String.IsNullOrEmpty(finalPath))
+                        continue;
                     string finalDir = Path.GetDirectoryName(finalPath);
-
                     if (String.IsNullOrEmpty(finalDir))
                         continue;