Merge pull request #181 from dfint/retry-fetch

Author: insolor

Cargo.lock

@@ -12,8 +12,13 @@ pub const ORIGINAL_FONT: &'static [u8; 1568] = include_bytes!("../assets/origina
 pub const PATH_CACHE_FILE: &'static str = "./dfint-installer.cache";
 pub const PATH_ERROR_FILE: &'static str = "./dfint-error.log";
 
-pub const URL_HOOK_MANIFEST: &'static str = "https://dfint.github.io/update-data/metadata/hook_v2.json";
-pub const URL_DICT_MANIFEST: &'static str = "https://dfint.github.io/update-data/metadata/dict.json";
+pub const BASE_URL: [&'static str; 2] = [
+  "https://dfint.github.io",
+  "https://gitverse.ru/api/repos/dfint/data-mirror/raw/branch/master",
+];
+
+pub const URL_HOOK_MANIFEST: &'static str = "/update-data/metadata/hook_v3.json";
+pub const URL_DICT_MANIFEST: &'static str = "/update-data/metadata/dict_v3.json";
 pub const URL_BUGS: &'static str = "https://github.com/dfint/installer/issues";
 pub const URL_TRANSIFEX: &'static str =
   "https://explore.transifex.com/dwarf-fortress-translation/dwarf-fortress-steam/";

src/constants.rs

@@ -1,5 +1,7 @@
 use anyhow::Result;
 
+use crate::fetch;
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Manifest {
   pub language: String,
@@ -31,7 +33,7 @@ pub struct DictMetadata {
 
 impl DictMetadata {
   pub async fn from_url(url: &str, pick_language: Option<String>) -> Result<Self> {
-    let manifests: Vec<Manifest> = ureq::get(url).call()?.into_json()?;
+    let manifests: Vec<Manifest> = fetch::fetch_json(url)?;
 
     let picked = match pick_language {
       Some(language) => {

src/dict_metadata.rs

@@ -0,0 +1,88 @@
+use anyhow::Result;
+use std::{
+  path::PathBuf,
+  sync::atomic::{AtomicUsize, Ordering},
+};
+
+use crate::{constants::BASE_URL, fetch};
+
+static BASE_URL_INDEX: AtomicUsize = AtomicUsize::new(0);
+
+pub fn get_base_url() -> &'static str {
+  let index = BASE_URL_INDEX.load(Ordering::Relaxed);
+  BASE_URL[index.min(BASE_URL.len() - 1)]
+}
+
+pub fn switch_to_next_base_url() {
+  BASE_URL_INDEX
+    .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |index| {
+      let max_index = BASE_URL.len() - 1;
+      if index < max_index { Some(index + 1) } else { None }
+    })
+    .ok();
+}
+
+pub fn fetch_json<T: for<'de> serde::Deserialize<'de>>(path: &str) -> Result<T> {
+  let base_url = get_base_url();
+  let url = format!("{}{}", base_url, path);
+
+  match ureq::get(&url).call() {
+    Ok(res) => Ok(res.into_json().unwrap()),
+    Err(e) => {
+      if get_base_url() == base_url {
+        switch_to_next_base_url();
+        if get_base_url() != base_url {
+          return fetch_json(path);
+        }
+      } else {
+        return fetch_json(path);
+      }
+
+      Err(anyhow::Error::from(e))
+    }
+  }
+}
+
+pub fn fetch_bytes(path: &str) -> Result<Vec<u8>> {
+  let base_url = get_base_url();
+  let url = format!("{}{}", base_url, path);
+
+  match ureq::get(&url).call() {
+    Ok(res) => {
+      let mut bytes = Vec::new();
+      res.into_reader().read_to_end(&mut bytes)?;
+      Ok(bytes)
+    }
+    Err(e) => {
+      if get_base_url() == base_url {
+        switch_to_next_base_url();
+        if get_base_url() != base_url {
+          return fetch_bytes(path);
+        }
+      } else {
+        return fetch_bytes(path);
+      }
+
+      Err(anyhow::Error::from(e))
+    }
+  }
+}
+
+pub async fn download_to_file(url: String, file: PathBuf) -> Result<()> {
+  let data: Vec<u8> = fetch::fetch_bytes(&url)?;
+  std::fs::write(file, &data)?;
+  Ok(())
+}
+
+pub async fn batch_download_to_file(items: Vec<(String, PathBuf)>) -> Result<()> {
+  let result = futures::future::join_all(
+    items
+      .iter()
+      .map(|item| download_to_file(item.0.clone(), item.1.clone())),
+  )
+  .await;
+  for item in result {
+    item?;
+  }
+  Ok(())
+}

src/fetch.rs

@@ -1,5 +1,7 @@
 use anyhow::Result;
 
+use crate::fetch;
+
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct Manifest {
   pub df: u32,
@@ -18,7 +20,7 @@ pub struct HookMetadata {
 
 impl HookMetadata {
   pub async fn from_url(url: &str, pick_df_checksum: Option<u32>) -> Result<Self> {
-    let manifests: Vec<Manifest> = ureq::get(url).call()?.into_json()?;
+    let manifests: Vec<Manifest> = fetch::fetch_json(url)?;
 
     let picked = match pick_df_checksum {
       Some(checksum) => {

src/hook_metadata.rs

@@ -8,6 +8,7 @@ use crate::{
   constants::*,
   df_binary::DfBinary,
   dict_metadata::DictMetadata,
+  fetch::batch_download_to_file,
   hook_metadata::HookMetadata,
   localization::{LOCALE, t},
   persistent::Store,

src/logic.rs

@@ -12,6 +12,7 @@ mod app;
 mod constants;
 mod df_binary;
 mod dict_metadata;
+mod fetch;
 mod hook_metadata;
 mod localization;
 mod logic;

src/main.rs

@@ -35,26 +35,3 @@ pub async fn is_df_running() -> bool {
     .contains(&val.name())
   })
 }
-
-pub async fn download_to_file(url: String, file: PathBuf) -> Result<()> {
-  let mut data: Vec<u8> = vec![];
-  ureq::get(&url)
-    .call()?
-    .into_reader()
-    .read_to_end(&mut data)?;
-  std::fs::write(file, &data)?;
-  Ok(())
-}
-
-pub async fn batch_download_to_file(items: Vec<(String, PathBuf)>) -> Result<()> {
-  let result = futures::future::join_all(
-    items
-      .iter()
-      .map(|item| download_to_file(item.0.clone(), item.1.clone())),
-  )
-  .await;
-  for item in result {
-    item?;
-  }
-  Ok(())
-}