Fix mod manager update edge cases

realdoomsboygaming · realdoomsboygaming · commit b8421a71c3d1 · 2026-04-29T17:08:35.000-05:00
diff --git a/Natives/LauncherNavigationController.m b/Natives/LauncherNavigationController.m
@@ -430,6 +430,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
             BOOL hitEnter = task.postInstallHitEnter;
             void (^finishInstall)(void) = ^{
                 [task finalizeModInstall];
+                [task finalizeModpackMetadata];
                 [self reloadProfileList];
                 if (installerPath) {
                     [self enterModInstallerWithPath:installerPath hitEnterAfterWindowShown:hitEnter];
diff --git a/Natives/MinecraftResourceDownloadTask.h b/Natives/MinecraftResourceDownloadTask.h
@@ -10,6 +10,7 @@
 @property NSString *postInstallInstallerPath;
 @property BOOL postInstallHitEnter;
 @property NSArray<NSDictionary *> *postInstallManualDownloads;
+@property NSDictionary *postInstallModpackMetadataPlan;
 @property(nonatomic, copy) void(^handleError)(void);
 
 - (NSURLSessionDownloadTask *)createDownloadTask:(NSString *)url size:(NSUInteger)size sha:(NSString *)sha altName:(NSString *)altName toPath:(NSString *)path;
@@ -22,5 +23,6 @@
 - (void)downloadModpackFromAPI:(ModpackAPI *)api detail:(NSDictionary *)modDetail atIndex:(NSUInteger)selectedVersion;
 - (void)downloadModsWithPlan:(NSDictionary *)plan store:(ModManagerStore *)store;
 - (void)finalizeModInstall;
+- (void)finalizeModpackMetadata;
 
 @end
diff --git a/Natives/MinecraftResourceDownloadTask.m b/Natives/MinecraftResourceDownloadTask.m
@@ -568,6 +568,47 @@ - (void)finalizeModInstall {
     [NSNotificationCenter.defaultCenter postNotificationName:@"ModManagerModsChanged" object:self.postInstallModStore];
 }
 
+- (void)finalizeModpackMetadata {
+    NSDictionary *plan = self.postInstallModpackMetadataPlan;
+    if (![plan isKindOfClass:NSDictionary.class]) {
+        return;
+    }
+
+    NSString *destPath = plan[@"destPath"];
+    NSArray *records = [plan[@"records"] isKindOfClass:NSArray.class] ? plan[@"records"] : @[];
+    if (![destPath isKindOfClass:NSString.class] || destPath.length == 0 || records.count == 0) {
+        return;
+    }
+
+    NSString *modsDir = [destPath stringByAppendingPathComponent:@"mods"];
+    NSMutableDictionary *mods = [NSMutableDictionary new];
+    for (NSDictionary *record in records) {
+        if (![record isKindOfClass:NSDictionary.class]) {
+            continue;
+        }
+        NSString *fileName = record[@"fileName"];
+        if (![fileName isKindOfClass:NSString.class] || fileName.length == 0 ||
+            [fileName containsString:@"/"] || [fileName containsString:@"\\"] || [fileName containsString:@":"]) {
+            continue;
+        }
+
+        NSString *path = [modsDir stringByAppendingPathComponent:fileName];
+        if (![NSFileManager.defaultManager fileExistsAtPath:path]) {
+            NSLog(@"[ModManager] Skipping modpack metadata for missing mod %@", fileName);
+            continue;
+        }
+        mods[fileName] = record;
+    }
+
+    NSString *metadataPath = [destPath stringByAppendingPathComponent:@"amethyst_mods.json"];
+    NSError *error = saveJSONToFile(@{@"version": @1, @"mods": mods}, metadataPath);
+    if (error) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            showDialog(localize(@"Error", nil), [NSString stringWithFormat:@"Modpack installed, but mod metadata could not be saved: %@", error.localizedDescription]);
+        });
+    }
+}
+
 #pragma mark - Utilities
 
 - (void)prepareForDownload {
diff --git a/Natives/installer/modpack/CurseForgeAPI.m b/Natives/installer/modpack/CurseForgeAPI.m
@@ -635,6 +635,10 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas
         }
     }
     downloader.postInstallManualDownloads = manualDownloads.copy;
+    downloader.postInstallModpackMetadataPlan = @{
+        @"destPath": destPath,
+        @"records": modManagerRecords.copy
+    };
 
     NSMutableOrderedSet<NSString *> *overrideDirs = [NSMutableOrderedSet orderedSet];
     NSString *manifestOverrides = manifest[@"overrides"];
@@ -655,7 +659,6 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas
             return;
         }
     }
-    [self saveModManagerMetadataRecords:modManagerRecords toPath:destPath];
 
     [NSFileManager.defaultManager removeItemAtPath:packagePath error:nil];
 
diff --git a/Natives/installer/mods/ModManagerViewController.m b/Natives/installer/mods/ModManagerViewController.m
@@ -89,10 +89,18 @@ - (void)updateBusyPrompt {
     }
 }
 
+- (void)updateBusyControls {
+    BOOL busy = self.checkingUpdates || self.checkingDependencies;
+    self.tableView.userInteractionEnabled = !busy;
+    self.searchController.searchBar.userInteractionEnabled = !busy;
+    for (UIBarButtonItem *item in self.navigationItem.rightBarButtonItems) {
+        item.enabled = !busy;
+    }
+}
+
 - (void)setCheckingUpdates:(BOOL)checkingUpdates {
     _checkingUpdates = checkingUpdates;
     UIBarButtonItem *updateItem = self.navigationItem.rightBarButtonItems.lastObject;
-    updateItem.enabled = !checkingUpdates;
     if (checkingUpdates) {
         UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleMedium];
         [indicator startAnimating];
@@ -101,80 +109,148 @@ - (void)setCheckingUpdates:(BOOL)checkingUpdates {
         updateItem.customView = nil;
         updateItem.image = [UIImage systemImageNamed:@"arrow.triangle.2.circlepath"];
     }
+    [self updateBusyControls];
     [self updateBusyPrompt];
 }
 
 - (void)setCheckingDependencies:(BOOL)checkingDependencies {
     _checkingDependencies = checkingDependencies;
-    self.tableView.userInteractionEnabled = !checkingDependencies;
+    [self updateBusyControls];
     [self updateBusyPrompt];
 }
 
 - (BOOL)modCanCheckForUpdate:(NSDictionary *)mod {
     NSString *source = mod[@"source"];
+    id projectID = mod[@"projectId"];
+    BOOL hasProjectID = projectID && projectID != NSNull.null && [[projectID description] length] > 0;
     return [source isKindOfClass:NSString.class] &&
         ![source isEqualToString:@"manual"] &&
-        mod[@"projectId"] &&
+        hasProjectID &&
         ![mod[@"missing"] boolValue];
 }
 
+- (NSArray<NSDictionary *> *)modsNeedingUpdateMetadataRefreshFromMods:(NSArray<NSDictionary *> *)mods {
+    NSMutableArray *result = [NSMutableArray new];
+    for (NSDictionary *mod in mods) {
+        NSString *source = mod[@"source"];
+        id projectID = mod[@"projectId"];
+        NSString *sha = [mod[@"sha1"] isKindOfClass:NSString.class] ? mod[@"sha1"] : nil;
+        NSString *path = [mod[@"path"] isKindOfClass:NSString.class] ? mod[@"path"] : nil;
+        if ([source isEqualToString:@"modrinth"] &&
+            ![mod[@"missing"] boolValue] &&
+            (!projectID || projectID == NSNull.null || [[projectID description] length] == 0) &&
+            (sha.length > 0 || path.length > 0)) {
+            [result addObject:mod];
+        }
+    }
+    return result;
+}
+
+- (NSString *)updateIdentityForMod:(NSDictionary *)mod {
+    NSString *source = mod[@"source"];
+    id projectID = mod[@"projectId"];
+    if ([source isKindOfClass:NSString.class] && projectID && projectID != NSNull.null && [[projectID description] length] > 0) {
+        return [NSString stringWithFormat:@"%@:%@", source, [[projectID description] lowercaseString]];
+    }
+
+    NSString *fileName = mod[@"fileName"];
+    if ([fileName isKindOfClass:NSString.class] && fileName.length > 0) {
+        return [@"file:" stringByAppendingString:fileName.lowercaseString];
+    }
+    return nil;
+}
+
+- (NSArray<NSMutableDictionary *> *)modsByMergingUpdateResults:(NSDictionary<NSString *, NSDictionary *> *)updatesByIdentity {
+    NSArray<NSMutableDictionary *> *freshMods = [self.store installedModsMatchingQuery:self.searchController.searchBar.text ?: @""];
+    NSMutableArray<NSMutableDictionary *> *mergedMods = [NSMutableArray arrayWithCapacity:freshMods.count];
+    for (NSDictionary *mod in freshMods) {
+        NSMutableDictionary *copy = mod.mutableCopy;
+        NSString *identity = [self updateIdentityForMod:mod];
+        NSDictionary *update = identity ? updatesByIdentity[identity] : nil;
+        if (update) {
+            copy[@"availableUpdate"] = update;
+        } else {
+            [copy removeObjectForKey:@"availableUpdate"];
+        }
+        [mergedMods addObject:copy];
+    }
+    return mergedMods;
+}
+
 - (void)actionCheckUpdates {
     if (self.checkingUpdates) {
         return;
     }
-    NSArray *mods = [self.store installedMods];
-    NSMutableArray *updatedMods = [NSMutableArray arrayWithCapacity:mods.count];
-    NSMutableArray<NSNumber *> *updateIndexes = [NSMutableArray new];
-    for (NSUInteger i = 0; i < mods.count; i++) {
-        NSDictionary *mod = mods[i];
-        [updatedMods addObject:mod.mutableCopy];
-        if ([self modCanCheckForUpdate:mod]) {
-            [updateIndexes addObject:@(i)];
-        }
-    }
     self.updateCheckCompleted = 0;
-    self.updateCheckTotal = updateIndexes.count;
+    self.updateCheckTotal = 0;
     self.checkingUpdates = YES;
-    if (updateIndexes.count == 0) {
-        self.checkingUpdates = NO;
-        self.mods = updatedMods;
-        [self.tableView reloadData];
-        return;
-    }
 
     dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-    dispatch_group_t group = dispatch_group_create();
-    dispatch_semaphore_t limit = dispatch_semaphore_create(4);
     NSDictionary *profileInfo = self.store.profileInfo;
-    for (NSNumber *indexNumber in updateIndexes) {
-        dispatch_group_async(group, queue, ^{
-            dispatch_semaphore_wait(limit, DISPATCH_TIME_FOREVER);
-            NSUInteger index = indexNumber.unsignedIntegerValue;
-            NSDictionary *mod = mods[index];
+    dispatch_async(queue, ^{
+        NSArray *mods = [self.store installedMods];
+        NSArray *refreshCandidates = [self modsNeedingUpdateMetadataRefreshFromMods:mods];
+        if (refreshCandidates.count > 0) {
             ModManagerAPI *api = [ModManagerAPI new];
-            NSError *error = nil;
-            NSDictionary *update = [api latestVersionForInstalledMod:mod profileInfo:profileInfo error:&error];
-            NSMutableDictionary *copy = mod.mutableCopy;
-            if (update) {
-                copy[@"availableUpdate"] = update;
-            } else {
-                [copy removeObjectForKey:@"availableUpdate"];
+            NSArray *records = [api refreshedMetadataForInstalledMods:refreshCandidates profileInfo:profileInfo];
+            if (records.count > 0) {
+                NSError *saveError = [self.store saveMetadataRecords:records replacingFileNames:@[] replacements:@[]];
+                if (saveError) {
+                    NSLog(@"[ModManager] Failed to refresh update metadata: %@", saveError.localizedDescription);
+                } else {
+                    mods = [self.store installedMods];
+                }
             }
-            @synchronized (updatedMods) {
-                updatedMods[index] = copy;
+        }
+
+        NSMutableArray<NSDictionary *> *checkMods = [NSMutableArray new];
+        for (NSDictionary *mod in mods) {
+            if ([self modCanCheckForUpdate:mod]) {
+                [checkMods addObject:mod];
+            }
+        }
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.updateCheckTotal = checkMods.count;
+            [self updateBusyPrompt];
+            if (checkMods.count == 0) {
+                self.mods = [self modsByMergingUpdateResults:@{}];
+                [self.tableView reloadData];
+                self.checkingUpdates = NO;
             }
-            dispatch_async(dispatch_get_main_queue(), ^{
-                self.updateCheckCompleted += 1;
-                [self updateBusyPrompt];
-            });
-            dispatch_semaphore_signal(limit);
         });
-    }
+        if (checkMods.count == 0) {
+            return;
+        }
+
+        NSMutableDictionary<NSString *, NSDictionary *> *updatesByIdentity = [NSMutableDictionary new];
+        dispatch_group_t group = dispatch_group_create();
+        dispatch_semaphore_t limit = dispatch_semaphore_create(4);
+        for (NSDictionary *mod in checkMods) {
+            dispatch_group_async(group, queue, ^{
+                dispatch_semaphore_wait(limit, DISPATCH_TIME_FOREVER);
+                ModManagerAPI *api = [ModManagerAPI new];
+                NSError *error = nil;
+                NSDictionary *update = [api latestVersionForInstalledMod:mod profileInfo:profileInfo error:&error];
+                NSString *identity = [self updateIdentityForMod:mod];
+                if (update && identity.length > 0) {
+                    @synchronized (updatesByIdentity) {
+                        updatesByIdentity[identity] = update;
+                    }
+                }
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    self.updateCheckCompleted += 1;
+                    [self updateBusyPrompt];
+                });
+                dispatch_semaphore_signal(limit);
+            });
+        }
 
-    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
-        self.checkingUpdates = NO;
-        self.mods = updatedMods;
-        [self.tableView reloadData];
+        dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+            self.mods = [self modsByMergingUpdateResults:updatesByIdentity];
+            [self.tableView reloadData];
+            self.checkingUpdates = NO;
+        });
     });
 }
 
diff --git a/Natives/installer/mods/ModSearchViewController.m b/Natives/installer/mods/ModSearchViewController.m
@@ -137,8 +137,20 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 - (void)showVersionMenuForProject:(NSDictionary *)project versions:(NSArray<NSDictionary *> *)versions atIndexPath:(NSIndexPath *)indexPath {
     UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
     UIAlertController *sheet = [UIAlertController alertControllerWithTitle:project[@"title"] message:@"Select a compatible version to install." preferredStyle:UIAlertControllerStyleActionSheet];
-    sheet.popoverPresentationController.sourceView = cell;
-    sheet.popoverPresentationController.sourceRect = cell.bounds;
+    UIPopoverPresentationController *popover = sheet.popoverPresentationController;
+    if (cell) {
+        popover.sourceView = cell;
+        popover.sourceRect = cell.bounds;
+    } else {
+        CGRect sourceRect = CGRectMake(CGRectGetMidX(self.view.bounds), CGRectGetMidY(self.view.bounds), 1, 1);
+        if (indexPath.section < self.tableView.numberOfSections &&
+            indexPath.row < [self.tableView numberOfRowsInSection:indexPath.section]) {
+            CGRect rowRect = [self.tableView rectForRowAtIndexPath:indexPath];
+            sourceRect = [self.view convertRect:rowRect fromView:self.tableView];
+        }
+        popover.sourceView = self.view;
+        popover.sourceRect = sourceRect;
+    }
 
     NSUInteger count = MIN(versions.count, 12);
     for (NSUInteger i = 0; i < count; i++) {

Original file line number	Diff line number	Diff line change
`@@ -635,6 +635,10 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas`
`635`	`635`	`}`
`636`	`636`	`}`
`637`	`637`	`downloader.postInstallManualDownloads = manualDownloads.copy;`
	`638`	`+ downloader.postInstallModpackMetadataPlan = @{`
	`639`	`+ @"destPath": destPath,`
	`640`	`+ @"records": modManagerRecords.copy`
	`641`	`+ };`
`638`	`642`
`639`	`643`	`NSMutableOrderedSet<NSString > overrideDirs = [NSMutableOrderedSet orderedSet];`
`640`	`644`	`NSString *manifestOverrides = manifest[@"overrides"];`
`@@ -655,7 +659,6 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas`
`655`	`659`	`return;`
`656`	`660`	`}`
`657`	`661`	`}`
`658`		`- [self saveModManagerMetadataRecords:modManagerRecords toPath:destPath];`
`659`	`662`
`660`	`663`	`[NSFileManager.defaultManager removeItemAtPath:packagePath error:nil];`
`661`	`664`