Revert "Support sqlite bundle system in windows (#879)"

This reverts commit 474dfce.
NamseEnt · Jun 29, 2024 · ca4de18 · ca4de18
1 parent 474dfce
commit ca4de18
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/namui/namui-cli/src/services/bundle/bundle_to_sqlite.rs b/namui/namui-cli/src/services/bundle/bundle_to_sqlite.rs
@@ -2,15 +2,17 @@ use super::*;
 use anyhow::Result;
 use rayon::prelude::*;
 use rusqlite::{Connection, DatabaseName, OptionalExtension};
-use std::{collections::HashSet, fs::create_dir_all, io, time::UNIX_EPOCH};
+use std::{
+    collections::HashSet,
+    io::{self},
+    time::UNIX_EPOCH,
+};
 
 pub fn bundle_to_sqlite(
     sqlite_path: impl AsRef<std::path::Path>,
     collect_operations: Vec<CollectOperation>,
 ) -> Result<()> {
     let sqlite_path = sqlite_path.as_ref().to_path_buf();
-    create_dir_all(sqlite_path.parent().unwrap())?;
-    println!("{sqlite_path:#?}");
     let create_conn = || Connection::open(&sqlite_path).unwrap();
     let conn = create_conn();
 

diff --git a/namui/namui-cli/src/services/resource_collect_service.rs b/namui/namui-cli/src/services/resource_collect_service.rs
@@ -17,10 +17,10 @@ pub fn collect_all(
     let mut ops: Vec<CollectOperation> = vec![];
     collect_runtime(&mut ops, additional_runtime_path, target)?;
     collect_rust_build(&mut ops, &project_path, target, release)?;
+    collect_bundle(&bundle_manifest, &dest_path)?;
     collect_deep_link_manifest(&mut ops, &project_path, target)?;
 
     collect_resources(&project_path, &dest_path, ops)?;
-    collect_bundle(&bundle_manifest, &dest_path)?;
 
     bundle_manifest.create_bundle_metadata_file(&dest_path)?;
     Ok(())

diff --git a/namui/namui/src/namui/system/file/bundle/mod.rs b/namui/namui/src/namui/system/file/bundle/mod.rs
@@ -27,7 +27,7 @@ fn bundle_sqlite_path() -> io::Result<PathBuf> {
         Ok(std::env::current_exe()?
             .parent()
             .ok_or_else(|| io::Error::new(ErrorKind::Other, anyhow!("No parent")))?
-            .join("bundle.sqlite"))
+            .join("bundle.sqlite?immutable=1"))
     }
 }
 

diff --git a/namui/namui/src/namui/system/typeface/load_sans_typeface_of_all_languages.rs b/namui/namui/src/namui/system/typeface/load_sans_typeface_of_all_languages.rs
@@ -5,40 +5,43 @@ pub async fn load_all_typefaces() -> Result<()> {
     let default_typefaces = [
         (
             "NotoSansKR-Bold",
-            "__system__/font/Ko/NotoSansKR-Bold.woff2",
+            crate::Url::parse("__system__/font/Ko/NotoSansKR-Bold.woff2").unwrap(),
         ),
         (
             "NotoSansKR-Light",
-            "__system__/font/Ko/NotoSansKR-Light.woff2",
+            crate::Url::parse("__system__/font/Ko/NotoSansKR-Light.woff2").unwrap(),
         ),
         (
             "NotoSansKR-Medium",
-            "__system__/font/Ko/NotoSansKR-Medium.woff2",
+            crate::Url::parse("__system__/font/Ko/NotoSansKR-Medium.woff2").unwrap(),
         ),
         (
             "NotoSansKR-Regular",
-            "__system__/font/Ko/NotoSansKR-Regular.woff2",
+            crate::Url::parse("__system__/font/Ko/NotoSansKR-Regular.woff2").unwrap(),
         ),
         (
             "NotoSansKR-Thin",
-            "__system__/font/Ko/NotoSansKR-Thin.woff2",
+            crate::Url::parse("__system__/font/Ko/NotoSansKR-Thin.woff2").unwrap(),
+        ),
+        (
+            "NotoColorEmoji",
+            crate::Url::parse("__system__/font/NotoColorEmoji.woff2").unwrap(),
         ),
-        ("NotoColorEmoji", "__system__/font/NotoColorEmoji.woff2"),
         (
             "NotoSansKR-Black",
-            "__system__/font/Ko/NotoSansKR-Black.woff2",
+            crate::Url::parse("__system__/font/Ko/NotoSansKR-Black.woff2").unwrap(),
         ),
     ];
 
     try_join_all(
         default_typefaces
             .into_iter()
-            .map(|(typeface_name, path)| async move {
-                let bytes = get_file_from_bundle_with_cached(&path)
+            .map(|(typeface_name, url)| async move {
+                let bytes = get_file_from_bundle_with_cached(&url)
                     .await
                     .map_err(|error| {
                         eprintln!("error: {:?}", error);
-                        anyhow!("Could not fetch {}: {}", path, error)
+                        anyhow!("Could not fetch {}: {}", url, error)
                     })?;
 
                 crate::system::typeface::register_typeface(typeface_name.to_string(), bytes)
@@ -52,7 +55,7 @@ pub async fn load_all_typefaces() -> Result<()> {
     Ok(())
 }
 
-async fn get_file_from_bundle_with_cached(url: &str) -> Result<Vec<u8>> {
-    let file = crate::file::bundle::read(url).await?;
+async fn get_file_from_bundle_with_cached(url: &crate::Url) -> Result<Vec<u8>> {
+    let file = crate::file::bundle::read(url.clone()).await?;
     Ok(file)
 }