PR feedback

Author: noahsmartin

src/commands/mobile_app/upload.rs

@@ -208,7 +208,11 @@ fn validate_is_mobile_app(path: &Path, bytes: &[u8]) -> Result<()> {
 
     // Check if the file is a zip file (then AAB, APK, or IPA)
     if is_zip_file(bytes) {
+        #[cfg(target_os = "macos")]
         debug!("File is a zip, checking for AAB/APK/IPA format");
+        #[cfg(not(target_os = "macos"))]
+        debug!("File is a zip, checking for AAB/APK format");
+
         if is_aab_file(bytes)? {
             debug!("Detected AAB file");
             return Ok(());

src/utils/mobile_app/apple.rs

@@ -1,7 +1,10 @@
 use anyhow::{anyhow, Result};
 use log::debug;
 use regex::Regex;
-use std::path::{Path, PathBuf};
+use std::{
+    path::{Path, PathBuf},
+    sync::LazyLock,
+};
 
 use crate::utils::fs::TempDir;
 use apple_catalog_parsing;
@@ -83,7 +86,7 @@ pub fn ipa_to_xcarchive(ipa_path: &Path, ipa_bytes: &[u8], temp_dir: &TempDir) -
     let cursor = Cursor::new(ipa_bytes);
     let mut ipa_archive = ZipArchive::new(cursor)?;
 
-    let app_name = extract_app_name_from_ipa(&ipa_archive)?;
+    let app_name = extract_app_name_from_ipa(&ipa_archive)?.to_owned();
 
     // Extract all files from the archive
     for i in 0..ipa_archive.len() {
@@ -136,13 +139,15 @@ pub fn ipa_to_xcarchive(ipa_path: &Path, ipa_bytes: &[u8], temp_dir: &TempDir) -
     Ok(xcarchive_dir)
 }
 
+static PATTERN: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r"^Payload/([^/]+)\.app/Info\.plist$").expect("regex is valid"));
+
 fn extract_app_name_from_ipa<'a>(archive: &'a ZipArchive<Cursor<&[u8]>>) -> Result<&'a str> {
-    let pattern = Regex::new(r"^Payload/([^/]+)\.app/Info\.plist$")?;
     let matches = archive
         .file_names()
-        .filter_map(|name| pattern.captures(name))
+        .filter_map(|name| PATTERN.captures(name))
         .map(|c| c.get(1).expect("group 1 must be present").as_str())
-        .take(2)  // If there are ≥2 matches, we already know the IPA is invalid
+        .take(2) // If there are ≥2 matches, we already know the IPA is invalid
         .collect::<Vec<_>>();
 
     if let &[app_name] = matches.as_slice() {

src/utils/mobile_app/mod.rs

@@ -2,8 +2,6 @@
 
 #[cfg(target_os = "macos")]
 mod apple;
-#[cfg(target_os = "macos")]
-mod ipa;
 mod validation;
 
 #[cfg(target_os = "macos")]

tests/integration/_cases/mobile_app/mobile_app-upload-help.trycmd renamed to tests/integration/_cases/mobile_app/mobile_app-upload-help-macos.trycmd

@@ -7,7 +7,7 @@ use std::{fs, str};
 #[cfg(target_os = "macos")]
 #[test]
 fn command_mobile_app_upload_help() {
-    TestManager::new().register_trycmd_test("mobile_app/mobile_app-upload-help.trycmd");
+    TestManager::new().register_trycmd_test("mobile_app/mobile_app-upload-help-macos.trycmd");
 }
 
 #[cfg(not(target_os = "macos"))]