From b3df5c6f8cc59e099a2f1db3df8089af4abca02e Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Tue, 5 Jul 2022 20:34:20 +0200
Subject: migrate code_bundles to bot_versions

---
 planetwars-server/src/modules/bots.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'planetwars-server/src/modules/bots.rs')

diff --git a/planetwars-server/src/modules/bots.rs b/planetwars-server/src/modules/bots.rs
index 843e48d..ddc1589 100644
--- a/planetwars-server/src/modules/bots.rs
+++ b/planetwars-server/src/modules/bots.rs
@@ -17,7 +17,7 @@ pub fn save_code_bundle(
 
     let new_code_bundle = db::bots::NewCodeBundle {
         bot_id,
-        path: &bundle_name,
+        code_bundle_path: &bundle_name,
     };
     db::bots::create_code_bundle(&new_code_bundle, conn)
 }
-- 
cgit v1.2.3


From d7b7585dd70f9d41184cf88c2ecbd88341898c38 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Wed, 6 Jul 2022 22:41:27 +0200
Subject: rename code_bundle to bot_version

---
 planetwars-server/src/modules/bots.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'planetwars-server/src/modules/bots.rs')

diff --git a/planetwars-server/src/modules/bots.rs b/planetwars-server/src/modules/bots.rs
index ddc1589..cd26ee0 100644
--- a/planetwars-server/src/modules/bots.rs
+++ b/planetwars-server/src/modules/bots.rs
@@ -8,7 +8,7 @@ pub fn save_code_bundle(
     bot_code: &str,
     bot_id: Option<i32>,
     conn: &PgConnection,
-) -> QueryResult<db::bots::CodeBundle> {
+) -> QueryResult<db::bots::BotVersion> {
     let bundle_name = gen_alphanumeric(16);
 
     let code_bundle_dir = PathBuf::from(BOTS_DIR).join(&bundle_name);
-- 
cgit v1.2.3


From 6ec792e3bd633a0b3971e401d29b2f8671f38b14 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Thu, 7 Jul 2022 18:57:46 +0200
Subject: NewBotVersion

---
 planetwars-server/src/modules/bots.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'planetwars-server/src/modules/bots.rs')

diff --git a/planetwars-server/src/modules/bots.rs b/planetwars-server/src/modules/bots.rs
index cd26ee0..629ecf6 100644
--- a/planetwars-server/src/modules/bots.rs
+++ b/planetwars-server/src/modules/bots.rs
@@ -15,9 +15,10 @@ pub fn save_code_bundle(
     std::fs::create_dir(&code_bundle_dir).unwrap();
     std::fs::write(code_bundle_dir.join("bot.py"), bot_code).unwrap();
 
-    let new_code_bundle = db::bots::NewCodeBundle {
+    let new_code_bundle = db::bots::NewBotVersion {
         bot_id,
-        code_bundle_path: &bundle_name,
+        code_bundle_path: Some(&bundle_name),
+        container_digest: None,
     };
-    db::bots::create_code_bundle(&new_code_bundle, conn)
+    db::bots::create_bot_version(&new_code_bundle, conn)
 }
-- 
cgit v1.2.3


From 0f14dee499f48b11fc329164c30cd475400a9f4d Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Thu, 7 Jul 2022 19:13:55 +0200
Subject: refactor: rename save_code_bundle to save_code_string

---
 planetwars-server/src/modules/bots.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'planetwars-server/src/modules/bots.rs')

diff --git a/planetwars-server/src/modules/bots.rs b/planetwars-server/src/modules/bots.rs
index 629ecf6..b82ad41 100644
--- a/planetwars-server/src/modules/bots.rs
+++ b/planetwars-server/src/modules/bots.rs
@@ -4,7 +4,8 @@ use diesel::{PgConnection, QueryResult};
 
 use crate::{db, util::gen_alphanumeric, BOTS_DIR};
 
-pub fn save_code_bundle(
+/// Save a string containing bot code as a code bundle.
+pub fn save_code_string(
     bot_code: &str,
     bot_id: Option<i32>,
     conn: &PgConnection,
-- 
cgit v1.2.3


From d13d131130ab53fb8ee7d49d2b40718622a4ab11 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Sat, 16 Jul 2022 21:22:03 +0200
Subject: move storage paths to GlobalConfig

---
 planetwars-server/src/modules/bots.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'planetwars-server/src/modules/bots.rs')

diff --git a/planetwars-server/src/modules/bots.rs b/planetwars-server/src/modules/bots.rs
index b82ad41..5513539 100644
--- a/planetwars-server/src/modules/bots.rs
+++ b/planetwars-server/src/modules/bots.rs
@@ -2,17 +2,18 @@ use std::path::PathBuf;
 
 use diesel::{PgConnection, QueryResult};
 
-use crate::{db, util::gen_alphanumeric, BOTS_DIR};
+use crate::{db, util::gen_alphanumeric, GlobalConfig};
 
 /// Save a string containing bot code as a code bundle.
 pub fn save_code_string(
     bot_code: &str,
     bot_id: Option<i32>,
     conn: &PgConnection,
+    config: &GlobalConfig,
 ) -> QueryResult<db::bots::BotVersion> {
     let bundle_name = gen_alphanumeric(16);
 
-    let code_bundle_dir = PathBuf::from(BOTS_DIR).join(&bundle_name);
+    let code_bundle_dir = PathBuf::from(&config.bots_directory).join(&bundle_name);
     std::fs::create_dir(&code_bundle_dir).unwrap();
     std::fs::write(code_bundle_dir.join("bot.py"), bot_code).unwrap();
 
-- 
cgit v1.2.3