trying to avoid raw url in pe binary sequence

dfint · Mar 9, 2024 · 4a9bc1c · 4a9bc1c
1 parent 70ff94a
commit 4a9bc1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/constants.rs b/src/constants.rs
@@ -7,10 +7,18 @@ pub const ORIGINAL_FONT: &'static [u8; 1568] = include_bytes!("../assets/origina
 
 pub const PATH_CACHE_FILE: &'static str = "./dfint-installer.cache";
 
-pub const URL_HOOK_MANIFEST: &'static str =
-  "https://raw.githubusercontent.com/dfint/update-data/main/metadata/hook.json";
-pub const URL_DICT_MANIFEST: &'static str =
-  "https://raw.githubusercontent.com/dfint/update-data/main/metadata/dict.json";
+#[static_init::dynamic]
+pub static URL_HOOK_MANIFEST: String = format!(
+  "https://{}.{}.com/dfint/update-data/main/metadata/hook.json",
+  "raw", "githubusercontent"
+);
+
+#[static_init::dynamic]
+pub static URL_DICT_MANIFEST: String = format!(
+  "https://{}.{}.com/dfint/update-data/main/metadata/dict.json",
+  "raw", "githubusercontent"
+);
+
 pub const URL_BUGS: &'static str = "https://github.com/dfint/installer/issues";
 
 pub const PATH_DATA: &'static str = "dfint-data";

diff --git a/src/logic.rs b/src/logic.rs
@@ -75,7 +75,7 @@ impl App {
       self.hook_checksum = self.local_hook_checksum().unwrap_or(0);
 
       spawn!({
-        match fetch_manifest::<HookManifest>(URL_HOOK_MANIFEST) {
+        match fetch_manifest::<HookManifest>(&URL_HOOK_MANIFEST) {
           Ok(manifests) => {
             write!(vec_hook_manifests, manifests.clone());
             if let Some(manifest) = get_manifest_by_df(df_checksum, manifests) {
@@ -96,7 +96,7 @@ impl App {
       self.dict_checksum = self.local_dict_checksum().unwrap_or(0);
 
       spawn!({
-        match fetch_manifest::<DictManifest>(URL_DICT_MANIFEST) {
+        match fetch_manifest::<DictManifest>(&URL_DICT_MANIFEST) {
           Ok(manifests) => {
             write!(vec_dict_manifests, manifests.clone());
             if let Some(manifest) = get_manifest_by_language(selected_language, manifests) {