Finalize SourceForge provider install and update flows

2026-03-21 01:58:47 +00:00 · 2026-03-21 01:58:47 +00:00 · f260790d91
commit f260790d91
parent eaa9a3b52d
11 changed files with 718 additions and 65 deletions
--- a/crates/aim-core/tests/adapter_contract.rs
+++ b/crates/aim-core/tests/adapter_contract.rs
@ -233,7 +233,7 @@ fn sourceforge_candidate_sources_can_resolve_to_latest_download() {
 }

 #[test]
-fn sourceforge_version_folder_candidates_can_return_no_installable_artifact() {
+fn sourceforge_version_folder_candidates_can_resolve_to_latest_download() {
    let adapter: &dyn SourceAdapter = &SourceForgeAdapter;

    let result = adapter
@ -247,10 +247,112 @@ fn sourceforge_version_folder_candidates_can_return_no_installable_artifact() {
    );

    let resolution = adapter.resolve_source(&result).unwrap();
-    assert_eq!(
+    assert!(matches!(
        resolution,
-        AdapterResolveOutcome::NoInstallableArtifact { source: result }
+        AdapterResolveOutcome::Resolved(AdapterResolution {
+            source,
+            release: ResolvedRelease { version, .. },
+        }) if source.kind == SourceKind::SourceForge
+            && source.locator
+                == "https://sourceforge.net/projects/team-app/files/releases/v1-0/download"
+            && source.normalized_kind == NormalizedSourceKind::SourceForge
+            && source.tracks_latest
+            && version == "latest"
+    ));
+}
+
+#[test]
+fn sourceforge_prerelease_folder_candidates_can_resolve_to_latest_download() {
+    let adapter: &dyn SourceAdapter = &SourceForgeAdapter;
+
+    let result = adapter
+        .normalize("https://sourceforge.net/projects/team-app/files/releases/beta/download")
+        .unwrap();
+
+    assert_eq!(result.kind, SourceKind::SourceForge);
+    assert_eq!(
+        result.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
    );
+
+    let resolution = adapter.resolve_source(&result).unwrap();
+    assert!(matches!(
+        resolution,
+        AdapterResolveOutcome::Resolved(AdapterResolution {
+            source,
+            release: ResolvedRelease { version, .. },
+        }) if source.kind == SourceKind::SourceForge
+            && source.locator
+                == "https://sourceforge.net/projects/team-app/files/releases/beta/download"
+            && source.normalized_kind == NormalizedSourceKind::SourceForge
+            && source.tracks_latest
+            && version == "latest"
+    ));
+}
+
+#[test]
+fn sourceforge_dotted_release_folder_candidates_can_resolve_to_latest_download() {
+    let adapter: &dyn SourceAdapter = &SourceForgeAdapter;
+
+    let result = adapter
+        .normalize("https://sourceforge.net/projects/team-app/files/releases/2026.03/download")
+        .unwrap();
+
+    assert_eq!(result.kind, SourceKind::SourceForge);
+    assert_eq!(
+        result.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
+    );
+
+    let resolution = adapter.resolve_source(&result).unwrap();
+    assert!(matches!(
+        resolution,
+        AdapterResolveOutcome::Resolved(AdapterResolution {
+            source,
+            release: ResolvedRelease { version, .. },
+        }) if source.kind == SourceKind::SourceForge
+            && source.locator
+                == "https://sourceforge.net/projects/team-app/files/releases/2026.03/download"
+            && source.normalized_kind == NormalizedSourceKind::SourceForge
+            && source.tracks_latest
+            && version == "latest"
+    ));
+}
+
+#[test]
+fn sourceforge_file_like_release_candidates_resolve_to_releases_root() {
+    let adapter: &dyn SourceAdapter = &SourceForgeAdapter;
+
+    let result = adapter
+        .normalize(
+            "https://sourceforge.net/projects/team-app/files/releases/team-app-1.0.0.AppImage/download",
+        )
+        .unwrap();
+
+    assert_eq!(result.kind, SourceKind::SourceForge);
+    assert_eq!(
+        result.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
+    );
+    assert_eq!(
+        result.requested_asset_name.as_deref(),
+        Some("team-app-1.0.0.AppImage")
+    );
+
+    let resolution = adapter.resolve_source(&result).unwrap();
+    assert!(matches!(
+        resolution,
+        AdapterResolveOutcome::Resolved(AdapterResolution {
+            source,
+            release: ResolvedRelease { version, .. },
+        }) if source.kind == SourceKind::SourceForge
+            && source.locator
+                == "https://sourceforge.net/projects/team-app/files/releases"
+            && source.normalized_kind == NormalizedSourceKind::SourceForge
+            && source.tracks_latest
+            && source.requested_asset_name.as_deref() == Some("team-app-1.0.0.AppImage")
+            && version == "latest"
+    ));
 }

 #[test]
--- a/crates/aim-core/tests/install_failures.rs
+++ b/crates/aim-core/tests/install_failures.rs
@ -67,26 +67,3 @@ fn supported_sourceforge_project_without_latest_download_reports_no_installable_
        other => panic!("expected no-installable-artifact error, got {other:?}"),
    }
 }
-
-#[test]
-fn supported_sourceforge_version_folder_candidate_without_installable_artifact_reports_no_installable_artifact()
- {
-    let error = build_add_plan_with(
-        "https://sourceforge.net/projects/team-app/files/releases/v1-0/download",
-        &FixtureGitHubTransport,
-    )
-    .unwrap_err();
-
-    match error {
-        BuildAddPlanError::NoInstallableArtifact { source } => {
-            assert_eq!(source.kind, SourceKind::SourceForge);
-            assert_eq!(
-                source.locator,
-                "https://sourceforge.net/projects/team-app/files/releases/v1-0/download"
-            );
-            assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
-            assert_eq!(source.normalized_kind.as_str(), "sourceforge-candidate");
-        }
-        other => panic!("expected no-installable-artifact error, got {other:?}"),
-    }
-}
--- a/crates/aim-core/tests/install_integration.rs
+++ b/crates/aim-core/tests/install_integration.rs
@ -387,6 +387,28 @@ fn sourceforge_candidate_builds_concrete_install_candidate() {
    }));
 }

+#[test]
+fn sourceforge_release_folder_builds_concrete_install_candidate() {
+    let mut reporter = |_event: &OperationEvent| {};
+    let query = "https://sourceforge.net/projects/team-app/files/releases/beta/download";
+
+    let plan = build_add_plan_with_reporter(query, &FixtureGitHubTransport, &mut reporter).unwrap();
+
+    assert_eq!(plan.resolution.source.kind, SourceKind::SourceForge);
+    assert_eq!(plan.resolution.source.locator, query);
+    assert_eq!(
+        plan.resolution.source.normalized_kind,
+        NormalizedSourceKind::SourceForge
+    );
+    assert!(plan.resolution.source.tracks_latest);
+    assert_eq!(plan.resolution.release.version, "latest");
+    assert_eq!(plan.selected_artifact.url, query);
+    assert_eq!(plan.selected_artifact.version, "latest");
+    assert_eq!(plan.selected_artifact.selection_reason, "provider-release");
+    assert_eq!(plan.update_strategy.preferred.locator, query);
+    assert_eq!(plan.update_strategy.preferred.reason, "provider-release");
+}
+
 #[test]
 fn sourceforge_latest_download_builds_concrete_install_candidate() {
    let mut reporter = |_event: &OperationEvent| {};
@ -431,3 +453,104 @@ fn sourceforge_latest_download_install_preserves_truthful_origin() {
    );
    assert_eq!(installed.selected_artifact.url, query);
 }
+
+#[test]
+fn sourceforge_release_folder_install_preserves_truthful_origin() {
+    let root = tempdir().unwrap();
+
+    unsafe {
+        std::env::set_var("AIM_GITHUB_FIXTURE_MODE", "1");
+    }
+
+    let mut reporter = |_event: &OperationEvent| {};
+    let query = "https://sourceforge.net/projects/team-app/files/releases/beta/download";
+    let plan = build_add_plan_with_reporter(query, &FixtureGitHubTransport, &mut reporter).unwrap();
+
+    let installed =
+        install_app_with_reporter(query, &plan, root.path(), InstallScope::User, &mut reporter)
+            .unwrap();
+
+    assert_eq!(installed.record.source_input.as_deref(), Some(query));
+    assert_eq!(
+        installed.record.installed_version.as_deref(),
+        Some("latest")
+    );
+    assert_eq!(installed.source.kind, SourceKind::SourceForge);
+    assert_eq!(installed.source.locator, query);
+    assert_eq!(
+        installed.source.canonical_locator.as_deref(),
+        Some("team-app")
+    );
+    assert_eq!(
+        installed.source.normalized_kind,
+        NormalizedSourceKind::SourceForge
+    );
+    assert_eq!(installed.selected_artifact.url, query);
+}
+
+#[test]
+fn sourceforge_file_like_release_download_uses_releases_root_for_source_and_original_url_for_artifact()
+ {
+    let mut reporter = |_event: &OperationEvent| {};
+    let query =
+        "https://sourceforge.net/projects/team-app/files/releases/team-app-1.0.0.AppImage/download";
+
+    let plan = build_add_plan_with_reporter(query, &FixtureGitHubTransport, &mut reporter).unwrap();
+
+    assert_eq!(plan.resolution.source.kind, SourceKind::SourceForge);
+    assert_eq!(
+        plan.resolution.source.locator,
+        "https://sourceforge.net/projects/team-app/files/releases"
+    );
+    assert_eq!(
+        plan.resolution.source.requested_asset_name.as_deref(),
+        Some("team-app-1.0.0.AppImage")
+    );
+    assert_eq!(plan.resolution.release.version, "latest");
+    assert_eq!(plan.selected_artifact.url, query);
+    assert_eq!(plan.selected_artifact.version, "latest");
+    assert_eq!(plan.selected_artifact.selection_reason, "provider-release");
+    assert_eq!(
+        plan.update_strategy.preferred.locator,
+        "https://sourceforge.net/projects/team-app/files/releases"
+    );
+    assert_eq!(plan.update_strategy.preferred.reason, "provider-release");
+}
+
+#[test]
+fn sourceforge_file_like_release_download_install_preserves_input_but_stores_releases_root() {
+    let root = tempdir().unwrap();
+
+    unsafe {
+        std::env::set_var("AIM_GITHUB_FIXTURE_MODE", "1");
+    }
+
+    let mut reporter = |_event: &OperationEvent| {};
+    let query =
+        "https://sourceforge.net/projects/team-app/files/releases/team-app-1.0.0.AppImage/download";
+    let plan = build_add_plan_with_reporter(query, &FixtureGitHubTransport, &mut reporter).unwrap();
+
+    let installed =
+        install_app_with_reporter(query, &plan, root.path(), InstallScope::User, &mut reporter)
+            .unwrap();
+
+    assert_eq!(installed.record.source_input.as_deref(), Some(query));
+    assert_eq!(
+        installed.record.installed_version.as_deref(),
+        Some("latest")
+    );
+    assert_eq!(installed.source.kind, SourceKind::SourceForge);
+    assert_eq!(
+        installed.source.locator,
+        "https://sourceforge.net/projects/team-app/files/releases"
+    );
+    assert_eq!(
+        installed.source.requested_asset_name.as_deref(),
+        Some("team-app-1.0.0.AppImage")
+    );
+    assert_eq!(
+        installed.source.canonical_locator.as_deref(),
+        Some("team-app")
+    );
+    assert_eq!(installed.selected_artifact.url, query);
+}
--- a/crates/aim-core/tests/query_resolution.rs
+++ b/crates/aim-core/tests/query_resolution.rs
@ -128,15 +128,39 @@ fn preserves_direct_url_classification() {
 }

 #[test]
-fn preserves_sourceforge_download_url_as_direct_url() {
+fn classifies_single_segment_sourceforge_release_download_as_candidate() {
    let source = resolve_query(
        "https://sourceforge.net/projects/team-app/files/releases/team-app-1.0.0.AppImage/download",
    )
    .unwrap();

-    assert_eq!(source.kind, SourceKind::DirectUrl);
-    assert_eq!(source.input_kind, SourceInputKind::DirectUrl);
-    assert_eq!(source.normalized_kind, NormalizedSourceKind::DirectUrl);
+    assert_eq!(source.kind, SourceKind::SourceForge);
+    assert_eq!(source.input_kind, SourceInputKind::SourceForgeUrl);
+    assert_eq!(
+        source.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
+    );
+    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
+    assert_eq!(
+        source.requested_asset_name.as_deref(),
+        Some("team-app-1.0.0.AppImage")
+    );
+    assert!(!source.tracks_latest);
+}
+
+#[test]
+fn classifies_sourceforge_releases_root_as_provider_source() {
+    let source = resolve_query("https://sourceforge.net/projects/team-app/files/releases").unwrap();
+
+    assert_eq!(source.kind, SourceKind::SourceForge);
+    assert_eq!(source.input_kind, SourceInputKind::SourceForgeUrl);
+    assert_eq!(source.normalized_kind, NormalizedSourceKind::SourceForge);
+    assert_eq!(
+        source.locator,
+        "https://sourceforge.net/projects/team-app/files/releases"
+    );
+    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
+    assert!(source.tracks_latest);
 }

 #[test]
@ -162,15 +186,24 @@ fn preserves_sourceforge_extensionless_root_download_url_as_direct_url() {
 }

 #[test]
-fn preserves_sourceforge_download_url_with_query_as_direct_url() {
+fn classifies_single_segment_sourceforge_release_download_with_query_as_candidate() {
    let source = resolve_query(
        "https://sourceforge.net/projects/team-app/files/releases/team-app-1.0.0.AppImage/download?use_mirror=pilotfiber",
    )
    .unwrap();

-    assert_eq!(source.kind, SourceKind::DirectUrl);
-    assert_eq!(source.input_kind, SourceInputKind::DirectUrl);
-    assert_eq!(source.normalized_kind, NormalizedSourceKind::DirectUrl);
+    assert_eq!(source.kind, SourceKind::SourceForge);
+    assert_eq!(source.input_kind, SourceInputKind::SourceForgeUrl);
+    assert_eq!(
+        source.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
+    );
+    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
+    assert_eq!(
+        source.requested_asset_name.as_deref(),
+        Some("team-app-1.0.0.AppImage")
+    );
+    assert!(!source.tracks_latest);
 }

 #[test]
@ -253,11 +286,18 @@ fn rejects_unsupported_sourceforge_url_shape() {
 }

 #[test]
-fn rejects_unsupported_sourceforge_files_shape() {
-    let error =
-        resolve_query("https://sourceforge.net/projects/team-app/files/releases").unwrap_err();
+fn classifies_sourceforge_files_releases_shape_as_provider_source() {
+    let source = resolve_query("https://sourceforge.net/projects/team-app/files/releases").unwrap();

-    assert_eq!(error, aim_core::app::query::ResolveQueryError::Unsupported);
+    assert_eq!(source.kind, SourceKind::SourceForge);
+    assert_eq!(source.input_kind, SourceInputKind::SourceForgeUrl);
+    assert_eq!(source.normalized_kind, NormalizedSourceKind::SourceForge);
+    assert_eq!(
+        source.locator,
+        "https://sourceforge.net/projects/team-app/files/releases"
+    );
+    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
+    assert!(source.tracks_latest);
 }

 #[test]
@ -285,12 +325,19 @@ fn classifies_ambiguous_sourceforge_nested_folder_download_as_candidate() {
 }

 #[test]
-fn rejects_unsupported_sourceforge_nested_extensionless_download_shape() {
-    let error =
+fn classifies_extensionless_sourceforge_release_folder_download_as_candidate() {
+    let source =
        resolve_query("https://sourceforge.net/projects/team-app/files/releases/team-app/download")
-            .unwrap_err();
+            .unwrap();

-    assert_eq!(error, aim_core::app::query::ResolveQueryError::Unsupported);
+    assert_eq!(source.kind, SourceKind::SourceForge);
+    assert_eq!(source.input_kind, SourceInputKind::SourceForgeUrl);
+    assert_eq!(
+        source.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
+    );
+    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
+    assert!(!source.tracks_latest);
 }

 #[test]
@ -308,3 +355,35 @@ fn classifies_ambiguous_sourceforge_version_folder_download_as_candidate() {
    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
    assert!(!source.tracks_latest);
 }
+
+#[test]
+fn classifies_prerelease_named_sourceforge_release_folder_download_as_candidate() {
+    let source =
+        resolve_query("https://sourceforge.net/projects/team-app/files/releases/beta/download")
+            .unwrap();
+
+    assert_eq!(source.kind, SourceKind::SourceForge);
+    assert_eq!(source.input_kind, SourceInputKind::SourceForgeUrl);
+    assert_eq!(
+        source.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
+    );
+    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
+    assert!(!source.tracks_latest);
+}
+
+#[test]
+fn classifies_dotted_sourceforge_release_folder_download_as_candidate() {
+    let source =
+        resolve_query("https://sourceforge.net/projects/team-app/files/releases/2026.03/download")
+            .unwrap();
+
+    assert_eq!(source.kind, SourceKind::SourceForge);
+    assert_eq!(source.input_kind, SourceInputKind::SourceForgeUrl);
+    assert_eq!(
+        source.normalized_kind,
+        NormalizedSourceKind::SourceForgeCandidate
+    );
+    assert_eq!(source.canonical_locator.as_deref(), Some("team-app"));
+    assert!(!source.tracks_latest);
+}
--- a/crates/aim-core/tests/update_planning.rs
+++ b/crates/aim-core/tests/update_planning.rs
@ -238,3 +238,132 @@ fn update_execution_rebuilds_gitlab_source_without_rewriting_origin() {
        Some("example/team-app")
    );
 }
+
+#[test]
+fn update_execution_rebuilds_sourceforge_release_folder_without_rewriting_origin() {
+    let install_home = tempdir().unwrap();
+
+    unsafe {
+        std::env::set_var("AIM_GITHUB_FIXTURE_MODE", "1");
+    }
+
+    let previous = AppRecord {
+        stable_id: "team-app".to_owned(),
+        display_name: "team-app".to_owned(),
+        source_input: Some(
+            "https://sourceforge.net/projects/team-app/files/releases/beta/download".to_owned(),
+        ),
+        source: Some(SourceRef {
+            kind: SourceKind::SourceForge,
+            locator: "https://sourceforge.net/projects/team-app/files/releases/beta/download"
+                .to_owned(),
+            input_kind: SourceInputKind::SourceForgeUrl,
+            normalized_kind: NormalizedSourceKind::SourceForge,
+            canonical_locator: Some("team-app".to_owned()),
+            requested_tag: None,
+            requested_asset_name: None,
+            tracks_latest: true,
+        }),
+        installed_version: Some("latest".to_owned()),
+        update_strategy: Some(UpdateStrategy {
+            preferred: ChannelPreference {
+                kind: UpdateChannelKind::DirectAsset,
+                locator: "https://sourceforge.net/projects/team-app/files/releases/beta/download"
+                    .to_owned(),
+                reason: "provider-release".to_owned(),
+            },
+            alternates: Vec::new(),
+        }),
+        metadata: Vec::new(),
+        install: Some(InstallMetadata {
+            scope: InstallScope::User,
+            payload_path: None,
+            desktop_entry_path: None,
+            icon_path: None,
+        }),
+    };
+
+    let result = execute_updates(std::slice::from_ref(&previous), install_home.path()).unwrap();
+
+    assert_eq!(result.updated_count(), 1);
+    assert_eq!(result.failed_count(), 0);
+    assert_eq!(
+        result.apps[0].source.as_ref().unwrap().kind,
+        SourceKind::SourceForge
+    );
+    assert_eq!(
+        result.apps[0].source.as_ref().unwrap().locator,
+        "https://sourceforge.net/projects/team-app/files/releases/beta/download"
+    );
+    assert_eq!(
+        result.apps[0]
+            .source
+            .as_ref()
+            .unwrap()
+            .canonical_locator
+            .as_deref(),
+        Some("team-app")
+    );
+}
+
+#[test]
+fn update_execution_uses_stored_sourceforge_releases_root_for_file_like_inputs() {
+    let install_home = tempdir().unwrap();
+
+    unsafe {
+        std::env::set_var("AIM_GITHUB_FIXTURE_MODE", "1");
+    }
+
+    let previous = AppRecord {
+        stable_id: "team-app".to_owned(),
+        display_name: "team-app".to_owned(),
+        source_input: Some(
+            "https://sourceforge.net/projects/team-app/files/releases/team-app-1.0.0.AppImage/download"
+                .to_owned(),
+        ),
+        source: Some(SourceRef {
+            kind: SourceKind::SourceForge,
+            locator: "https://sourceforge.net/projects/team-app/files/releases".to_owned(),
+            input_kind: SourceInputKind::SourceForgeUrl,
+            normalized_kind: NormalizedSourceKind::SourceForge,
+            canonical_locator: Some("team-app".to_owned()),
+            requested_tag: None,
+            requested_asset_name: Some("team-app-1.0.0.AppImage".to_owned()),
+            tracks_latest: true,
+        }),
+        installed_version: Some("latest".to_owned()),
+        update_strategy: Some(UpdateStrategy {
+            preferred: ChannelPreference {
+                kind: UpdateChannelKind::DirectAsset,
+                locator: "https://sourceforge.net/projects/team-app/files/releases".to_owned(),
+                reason: "provider-release".to_owned(),
+            },
+            alternates: Vec::new(),
+        }),
+        metadata: Vec::new(),
+        install: Some(InstallMetadata {
+            scope: InstallScope::User,
+            payload_path: None,
+            desktop_entry_path: None,
+            icon_path: None,
+        }),
+    };
+
+    let result = execute_updates(std::slice::from_ref(&previous), install_home.path()).unwrap();
+
+    assert_eq!(result.updated_count(), 1);
+    assert_eq!(result.failed_count(), 0);
+    assert_eq!(
+        result.apps[0].source.as_ref().unwrap().locator,
+        "https://sourceforge.net/projects/team-app/files/releases"
+    );
+    assert_eq!(
+        result.apps[0]
+            .source
+            .as_ref()
+            .unwrap()
+            .requested_asset_name
+            .as_deref(),
+        None
+    );
+}