feat: replace rust_g_ss220 to rust_utils

ss220club · May 14, 2024 · 5b7c203 · 5b7c203
1 parent f154de7
commit 5b7c203
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 163 deletions.
diff --git a/librust_utils.dll b/librust_utils.dll
diff --git a/modular_ss220/_rust_utils/_rust_utils.dm b/modular_ss220/_rust_utils/_rust_utils.dm
@@ -0,0 +1,4 @@
+/datum/modpack/rust_utils
+	name = "Rust Utils"
+	desc = "Набор утилит на rust"
+	author = "furior, gaxeer"
diff --git a/modular_ss220/_rust_utils/_rust_utils.dme b/modular_ss220/_rust_utils/_rust_utils.dme
@@ -0,0 +1,3 @@
+#include "_rust_utils.dm"
+
+#include "code/rust_utils.dm"
diff --git a/modular_ss220/_rust_utils/code/rust_utils.dm b/modular_ss220/_rust_utils/code/rust_utils.dm
@@ -0,0 +1,28 @@
+#ifndef RUST_UTILS
+
+/* This comment bypasses grep checks */ /var/__rust_utils
+
+/proc/__detect_rust_utils()
+	if (world.system_type == UNIX)
+		if (fexists("./librust_utils.so"))
+			// No need for LD_LIBRARY_PATH badness.
+			return __rust_utils = "./librust_utils.so"
+		else
+			// It's not in the current directory, so try others
+			return __rust_utils = "librust_utils.so"
+	else
+		return __rust_utils = "librust_utils"
+
+#define RUST_UTILS (__rust_utils || __detect_rust_utils())
+#endif
+
+/// Gets the version of rust_utils
+/proc/rust_utils_get_version() return RUSTG_CALL(RUST_UTILS, "get_version")()
+
+#define rustutils_file_write_b64decode(text, fname) RUSTG_CALL(RUST_UTILS, "file_write")(text, fname, "true")
+
+#define rustutils_regex_replace(text, re, re_params, replacement) RUSTG_CALL(RUST_UTILS, "regex_replace")(text, re, re_params, replacement)
+
+#define rustutils_cyrillic_to_latin(text) RUSTG_CALL(RUST_UTILS, "cyrillic_to_latin")("[text]")
+#define rustutils_latin_to_cyrillic(text) RUSTG_CALL(RUST_UTILS, "latin_to_cyrillic")("[text]")
+
diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme
@@ -4,6 +4,7 @@
 // #include "example/_example.dme"
 
 // --- MAINTENANCE --- //
+#include "_rust_utils/_rust_utils.dme"
 #include "_components/_components.dme"
 #include "_defines220/_defines220.dme"
 #include "_signals220/_signals220.dme"

diff --git a/modular_ss220/speech_filter/_speech_filter.dme b/modular_ss220/speech_filter/_speech_filter.dme
@@ -2,5 +2,4 @@
 
 #include "code/configuration.dm"
 #include "code/mob.dm"
-#include "code/rust_utils.dm"
 #include "code/speech_filter.dm"
diff --git a/modular_ss220/speech_filter/code/rust_utils.dm b/modular_ss220/speech_filter/code/rust_utils.dm
diff --git a/modular_ss220/speech_filter/code/speech_filter.dm b/modular_ss220/speech_filter/code/speech_filter.dm
@@ -42,7 +42,7 @@
 	if(!brainrot_regex)
 		return
 
-	message = rust_utils_regex_replace(message, brainrot_regex, "igu", "")
+	message = rustutils_regex_replace(message, brainrot_regex, "i", "")
 	if(original_message_length == length(message))
 		return
 

diff --git a/modular_ss220/text_to_speech/_tts.dme b/modular_ss220/text_to_speech/_tts.dme
@@ -5,7 +5,6 @@
 #include "code/hear.dm"
 #include "code/numbers.dm"
 #include "code/providers/silero.dm"
-#include "code/rust_g_ss220.dm"
 #include "code/seeds/base.dm"
 #include "code/seeds/silero.dm"
 #include "code/sound.dm"

diff --git a/modular_ss220/text_to_speech/code/rust_g_ss220.dm b/modular_ss220/text_to_speech/code/rust_g_ss220.dm
diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm
@@ -410,7 +410,7 @@ SUBSYSTEM_DEF(tts220)
 	if(!voice)
 		return
 
-	rustg_ss220_file_write_b64decode(voice, "[filename].ogg")
+	rustutils_file_write_b64decode(voice, "[filename].ogg")
 
 	if(!GLOB.configuration.tts.tts_cache_enabled)
 		addtimer(CALLBACK(src, PROC_REF(cleanup_tts_file), "[filename].ogg"), 30 SECONDS)
@@ -557,7 +557,7 @@ SUBSYSTEM_DEF(tts220)
 	. = replacetext_char(., acronyms, /proc/tts_acronym_replacer)
 	for(var/job in tts_job_replacements)
 		. = replacetext_char(., job, tts_job_replacements[job])
-	. = rustg_ss220_latin_to_cyrillic(.)
+	. = rustutils_latin_to_cyrillic(.)
 
 	var/static/regex/decimals = new(@"-?\d+\.\d+", "g")
 	. = replacetext_char(., decimals, /proc/dec_in_words)

diff --git a/modular_ss220/text_to_speech/code/~undefs/~undefs.dm b/modular_ss220/text_to_speech/code/~undefs/~undefs.dm
@@ -11,12 +11,6 @@
 #undef TTS_TRAIT_RATE_FASTER
 #undef TTS_TRAIT_RATE_MEDIUM
 
-#undef rustg_ss220_file_write_b64decode
-
-// Text Operations //
-#undef rustg_ss220_cyrillic_to_latin
-#undef rustg_ss220_latin_to_cyrillic
-
 #undef TTS_CATEGORY_OTHER
 #undef TTS_CATEGORY_WARCRAFT3
 #undef TTS_CATEGORY_HALFLIFE2

diff --git a/rust_g_ss220.dll b/rust_g_ss220.dll
diff --git a/rust_utils.dll b/rust_utils.dll
diff --git a/tools/tgs_scripts/PreCompile.sh b/tools/tgs_scripts/PreCompile.sh
@@ -57,9 +57,8 @@ else
 	~/.cargo/bin/rustup target add i686-unknown-linux-gnu
 fi
 
-echo "Deploying rust-g ss220..."
+echo "Deploying rustutils..."
 RUSTFLAGS="-C target-cpu=native"
-env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --features all --target=i686-unknown-linux-gnu
-rm -f "$original_dir/../GameStaticFiles/librust_g_ss220.so"
-mv target/i686-unknown-linux-gnu/release/librust_g.so "$original_dir/../GameStaticFiles/librust_g_ss220.so"
+env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --all-features --target=i686-unknown-linux-gnu
+mv target/i686-unknown-linux-gnu/release/librust_utils.so "$1/librust_utils.so"
 cd ../../
diff --git a/tools/tgs_scripts/PreCompileSS220.sh b/tools/tgs_scripts/PreCompileSS220.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "_rust_utils.dm"

		#include "code/rust_utils.dm"