fix: version handling with extraction and validation utility

Now properly handles:
```
"@standardnotes/[email protected]" → "3.198.1"
"[email protected]" → "1.2.3"
"v1.2.3" → "1.2.3"
```

- Introduced `extract_and_validate_version` utility for consistent
  version extraction and validation across modules.
- Updated `GitHubReleaseFetcher` to use the new utility for normalizing
  version tags.
- Modified `CatalogInstallStrategy` and `URLInstallStrategy` to leverage
  the utility for extracting and validating version data.
- Added comprehensive version handling functions in `utils.py`:
  `extract_version_from_package_string`, `sanitize_version_string`,
  and `validate_version_string`.

Author: Cyber-Syntax

my_unicorn/github_client.py

@@ -10,6 +10,7 @@
 import aiohttp
 
 from .auth import GitHubAuthManager, auth_manager
+from .utils import extract_and_validate_version
 
 
 class GitHubAsset(TypedDict):
@@ -46,16 +47,28 @@ def __init__(self, owner: str, repo: str, session: aiohttp.ClientSession) -> Non
         self.session = session
 
     def _normalize_version(self, tag_name: str) -> str:
-        """Normalize version by stripping 'v' prefix.
+        """Normalize version by extracting and sanitizing version string.
+
+        Handles various formats including package@version and v-prefixed versions.
 
         Args:
-            tag_name: Version tag that may have 'v' prefix
+            tag_name: Version tag that may have 'v' prefix or package format
 
         Returns:
-            Version string without 'v' prefix
+            Sanitized version string
 
         """
-        return tag_name.lstrip("v") if tag_name else ""
+        if not tag_name:
+            return ""
+
+        # Use the comprehensive version extraction and validation
+        normalized = extract_and_validate_version(tag_name)
+
+        # Fall back to original logic if extraction fails
+        if normalized is None:
+            return tag_name.lstrip("v")
+
+        return normalized
 
     async def fetch_latest_release(self) -> GitHubReleaseDetails:
         """Fetch the latest release information from GitHub API.

my_unicorn/strategies/install_catalog.py

@@ -10,6 +10,7 @@
 from my_unicorn.download import IconAsset
 
 from ..logger import get_logger
+from ..utils import extract_and_validate_version
 from .install_url import InstallationError, InstallStrategy, ValidationError
 
 logger = get_logger(__name__)
@@ -260,7 +261,7 @@ async def _install_single_app(
                     "path": str(final_path),
                     "name": final_path.name,
                     "source": "catalog",
-                    "version": release_data.get("tag_name"),
+                    "version": extract_and_validate_version(release_data.get("tag_name", "")),
                     "icon_path": str(icon_path) if icon_path else None,
                 }
 
@@ -568,7 +569,8 @@ def _create_app_config(
             "config_version": "1.0.0",
             "source": "catalog",
             "appimage": {
-                "version": release_data.get("tag_name", "unknown"),
+                "version": extract_and_validate_version(release_data.get("tag_name", ""))
+                or "unknown",
                 "name": app_path.name,
                 "rename": appimage_config.get("rename", app_name),
                 "name_template": appimage_config.get("name_template", ""),

my_unicorn/strategies/install_url.py

@@ -7,15 +7,14 @@
 from pathlib import Path
 from typing import Any
 
-from my_unicorn.download import IconAsset
-
 from ..github_client import (
     GitHubAsset,
     GitHubClient,
     GitHubReleaseDetails,
     GitHubReleaseFetcher,
 )
 from ..logger import get_logger
+from ..utils import extract_and_validate_version
 from ..verify import Verifier
 from .install import InstallationError, InstallStrategy, ValidationError
 
@@ -219,7 +218,7 @@ async def _install_single_repo(
                     "path": str(final_path),
                     "name": final_path.name,
                     "source": "url",
-                    "version": release_data.get("tag_name"),
+                    "version": extract_and_validate_version(release_data.get("tag_name", "")),
                     "icon_path": str(icon_path) if icon_path else None,
                 }
 
@@ -315,7 +314,8 @@ async def _create_app_config(
             "config_version": "1.0.0",
             "source": "url",
             "appimage": {
-                "version": release_data.get("version", "unknown"),
+                "version": extract_and_validate_version(release_data.get("version", ""))
+                or "unknown",
                 "name": app_path.name,
                 "rename": app_name,
                 "name_template": "",

my_unicorn/utils.py

@@ -130,11 +130,73 @@ def expand_template(template: str, variables: dict[str, Any]) -> str:
         return template
 
 
+def extract_version_from_package_string(package_string: str) -> str | None:
+    """Extract version from package identifier string.
+
+    Handles formats like:
+    - "@standardnotes/[email protected]" -> "3.198.1"
+    - "[email protected]" -> "1.2.3"
+    - "v1.2.3" -> "1.2.3"
+    - "1.2.3" -> "1.2.3"
+
+    Args:
+        package_string: Package string that may contain version
+
+    Returns:
+        Extracted version string or None if not found
+
+    """
+    if not package_string:
+        return None
+
+    # Handle package@version format
+    if "@" in package_string:
+        # Split by @ and take the last part (version)
+        parts = package_string.split("@")
+        if len(parts) >= 2:
+            version_part = parts[-1]
+            # Clean up the version part
+            version_part = version_part.strip()
+            if version_part:
+                return sanitize_version_string(version_part)
+
+    # Handle direct version strings
+    return sanitize_version_string(package_string)
+
+
+def sanitize_version_string(version: str) -> str:
+    """Sanitize version string by removing invalid characters and prefixes.
+
+    Args:
+        version: Raw version string
+
+    Returns:
+        Sanitized version string
+
+    """
+    if not version:
+        return ""
+
+    # Remove common prefixes
+    version = version.lstrip("v")
+
+    # Remove any remaining @ symbols that might be present
+    version = version.replace("@", "")
+
+    # Remove quotes and other problematic characters for JSON
+    version = version.strip("\"'")
+
+    # Remove any trailing/leading whitespace
+    version = version.strip()
+
+    return version
+
+
 def validate_version_string(version: str) -> bool:
     """Validate version string format.
 
     Args:
-        version: Version string to validate
+        version: Version string to validate (should be pre-sanitized)
 
     Returns:
         True if valid version format
@@ -143,14 +205,32 @@ def validate_version_string(version: str) -> bool:
     if not version:
         return False
 
-    # Remove common prefixes
+    # The version should already be sanitized, but ensure no prefixes
     version = version.lstrip("v")
 
     # Check semantic version pattern (major.minor.patch with optional pre-release)
     pattern = r"^\d+(\.\d+)*(-[a-zA-Z0-9.-]+)?$"
     return bool(re.match(pattern, version))
 
 
+def extract_and_validate_version(package_string: str) -> str | None:
+    """Extract and validate version from package string.
+
+    Combines extraction, sanitization, and validation in one function.
+
+    Args:
+        package_string: Package string that may contain version
+
+    Returns:
+        Valid version string or None if extraction/validation fails
+
+    """
+    extracted_version = extract_version_from_package_string(package_string)
+    if extracted_version and validate_version_string(extracted_version):
+        return extracted_version
+    return None
+
+
 def create_desktop_entry_name(app_name: str) -> str:
     """Create desktop entry name from app name.