Add route /importEnglish

Author: dima74

DEVELOPMENT.md

@@ -4,6 +4,7 @@
 * `/triggerUpdate?secret=X` - Update all repositories
 * `/triggerUpdate?secret=X&repo=REPO` - Update specific repository
 * `/importRepository?secret=X&repo=REPO` - Readd repository to Crowdin (both english files and translations)
+* `/importEnglish?secret=X&repo=REPO` - Overwrites english files on Crowdin based on GitHub
 
 
 ## Heroku configuration

src/server/debug_routes.rs

@@ -1,9 +1,7 @@
 use rocket::get;
 
-use crate::{github, webhooks};
-use crate::github::extract_mods_from_repository;
-use crate::github_mod_name::GithubModName;
-use crate::server::trigger_update::get_trigger_update_mutex;
+use crate::server::trigger_update::{get_installation_id_and_mods, get_trigger_update_mutex};
+use crate::webhooks;
 
 /// For cases when repository was not imported correctly for some reason and manual intervention is needed
 #[get("/importRepository?<repo>&<subpath>&<secret>")]
@@ -15,22 +13,30 @@ pub async fn import_repository(
     if secret != Some(dotenv::var("WEBSERVER_SECRET").unwrap()) {
         return "Missing secret";
     }
-
     let _lock = get_trigger_update_mutex().await;
-    let installation_id = match github::get_installation_id_for_repo(&repo).await {
-        Some(id) => id,
-        None => return "Can't find installation for repository",
+    let (installation_id, mods) = match get_installation_id_and_mods(&repo, subpath).await {
+        Ok(value) => value,
+        Err(value) => return value,
     };
+    webhooks::on_repository_added(&repo, mods, installation_id).await;
+    "Ok."
+}
 
-    let mods = if subpath.is_some() {
-        vec![GithubModName::new(&repo, subpath)]
-    } else {
-        let api = github::as_installation(installation_id);
-        extract_mods_from_repository(&api, &repo).await
-    };
-    if mods.is_empty() {
-        return "No mods.";
+/// Overwrites all english file on crowdin based on github
+#[get("/importEnglish?<repo>&<subpath>&<secret>")]
+pub async fn import_english(
+    repo: String,
+    subpath: Option<String>,
+    secret: Option<String>,
+) -> &'static str {
+    if secret != Some(dotenv::var("WEBSERVER_SECRET").unwrap()) {
+        return "Missing secret";
     }
-    webhooks::on_repository_added(&repo, mods, installation_id).await;
+    let _lock = get_trigger_update_mutex().await;
+    let (installation_id, mods) = match get_installation_id_and_mods(&repo, subpath).await {
+        Ok(value) => value,
+        Err(value) => return value,
+    };
+    webhooks::import_english(&repo, mods, installation_id).await;
     "Ok."
 }

src/server/mod.rs

@@ -35,6 +35,7 @@ pub async fn main() {
         trigger_update::trigger_update,
         version,
         debug_routes::import_repository,
+        debug_routes::import_english,
         example_error_routes::error1,
         example_error_routes::error2,
     ];

src/server/trigger_update.rs

@@ -11,7 +11,7 @@ use tokio::time::sleep;
 
 use crate::{crowdin, git_util, github, util};
 use crate::crowdin::{get_crowdin_directory_name, normalize_language_code, replace_ini_to_cfg};
-use crate::github::as_personal_account;
+use crate::github::{as_personal_account, extract_mods_from_repository};
 use crate::github_mod_name::GithubModName;
 use crate::mod_directory::ModDirectory;
 
@@ -26,8 +26,7 @@ pub async fn trigger_update(
     }
     match repo {
         Some(repo) => {
-            let github_name = GithubModName::new(&repo, subpath);
-            trigger_update_single_repository(&repo, github_name).await
+            trigger_update_single_repository(&repo, subpath).await
         }
         None => {
             let task = trigger_update_all_repositories();
@@ -46,13 +45,14 @@ pub async fn get_trigger_update_mutex() -> impl Drop {
     MUTEX.lock().await
 }
 
-async fn trigger_update_single_repository(full_name: &str, github_name: GithubModName) -> &'static str {
+async fn trigger_update_single_repository(full_name: &str, subpath: Option<String>) -> &'static str {
     let _lock = get_trigger_update_mutex().await;
     info!("\n[update-github-from-crowdin] [{}] starting...", full_name);
-    let Some(installation_id) = github::get_installation_id_for_repo(full_name).await else {
-        return "Can't find github installation";
+    let (installation_id, mods) = match get_installation_id_and_mods(&full_name, subpath).await {
+        Ok(value) => value,
+        Err(message) => return message,
     };
-    let repositories = vec![(full_name.to_owned(), vec![github_name], installation_id)];
+    let repositories = vec![(full_name.to_owned(), mods, installation_id)];
     let success = push_crowdin_changes_to_repositories(repositories).await;
     if !success {
         return "Can't find mod directory on crowdin";
@@ -61,6 +61,27 @@ async fn trigger_update_single_repository(full_name: &str, github_name: GithubMo
     "Ok"
 }
 
+pub async fn get_installation_id_and_mods(
+    repo: &str,
+    subpath: Option<String>,
+) -> Result<(InstallationId, Vec<GithubModName>), &'static str> {
+    let installation_id = match github::get_installation_id_for_repo(&repo).await {
+        Some(id) => id,
+        None => return Err("Can't find installation for repository"),
+    };
+
+    let mods = if subpath.is_some() {
+        vec![GithubModName::new(&repo, subpath)]
+    } else {
+        let api = github::as_installation(installation_id);
+        extract_mods_from_repository(&api, &repo).await
+    };
+    if mods.is_empty() {
+        return Err("No mods.");
+    }
+    Ok((installation_id, mods))
+}
+
 async fn trigger_update_all_repositories() {
     let _lock = get_trigger_update_mutex().await;
     info!("\n[update-github-from-crowdin] [*] starting...");

src/webhooks.rs

@@ -93,11 +93,21 @@ pub async fn on_repository_added(full_name: &str, mods: Vec<GithubModName>, inst
         let (crowdin_directory, _) = CrowdinDirectory::get_or_create(mod_directory).await;
         crowdin_directory.add_english_and_localization_files().await;
     }
-    // explicit drop to ensure that cloned directory is deleted only here
-    drop(repository_directory);
     info!("[add-repository] [{}] success", full_name);
 }
 
+pub async fn import_english(full_name: &str, mods: Vec<GithubModName>, installation_id: InstallationId) {
+    let repository_directory = github::clone_repository(&full_name, installation_id).await;
+    for mod_ in mods {
+        let mod_directory = ModDirectory::new(&repository_directory, mod_);
+        if !mod_directory.check_for_locale_folder() { continue; }
+
+        if !CrowdinDirectory::has_existing(&mod_directory).await { continue; }
+        let (crowdin_directory, _) = CrowdinDirectory::get_or_create(mod_directory).await;
+        crowdin_directory.add_english_files().await;
+    }
+}
+
 pub async fn on_push_event(
     event: &PushWebhookEventPayload,
     installation_id: InstallationId,