feat: use Strings in ModpkgLicense

Author: alanpq

crates/league-modpkg/src/license.rs

@@ -1,16 +1,31 @@
 use binrw::{binrw, NullString};
+use binrw::binrw;
+
+use crate::utils::{nullstr_read, nullstr_write};
 
 #[binrw]
 #[brw(little)]
 #[derive(Debug, PartialEq, Default)]
+#[cfg_attr(test, derive(proptest_derive::Arbitrary))]
 pub enum ModpkgLicense {
     #[default]
     #[brw(magic = 0u8)]
     None,
     #[brw(magic = 1u8)]
-    Spdx { spdx_id: NullString },
+    Spdx {
+        #[bw(map = nullstr_write)]
+        #[br(try_map = nullstr_read)]
+        spdx_id: String,
+    },
     #[brw(magic = 2u8)]
-    Custom { name: NullString, url: NullString },
+    Custom {
+        #[bw(map = nullstr_write)]
+        #[br(try_map = nullstr_read)]
+        name: String,
+        #[bw(map = nullstr_write)]
+        #[br(try_map = nullstr_read)]
+        url: String,
+    },
 }
 
 impl ModpkgLicense {

crates/league-modpkg/src/utils.rs

@@ -1,3 +1,5 @@
+use binrw::NullString;
+
 pub fn optional_string_len<'a>(string: impl Into<Option<&'a String>>) -> usize {
     string.into().as_ref().map(|n| n.len()).unwrap_or_default()
 }
@@ -8,3 +10,11 @@ pub fn optional_string_write(s: &Option<String>) -> Option<Vec<u8>> {
 pub fn optional_string_read(s: Vec<u8>) -> Result<Option<String>, std::string::FromUtf8Error> {
     String::from_utf8(s).map(Some)
 }
+
+pub fn nullstr_read(s: NullString) -> Result<String, std::string::FromUtf8Error> {
+    String::from_utf8(s.into())
+}
+
+pub fn nullstr_write<'a>(s: impl Into<&'a String>) -> NullString {
+    NullString::from(s.into().as_str())
+}