Fix server to correctly resolve module script names

This commit is contained in:
Lucien Greathouse
2019-01-15 23:58:25 -08:00
parent a400abff4c
commit 99bbe58255

View File

@@ -255,16 +255,16 @@ fn snapshot_imfs_file<'source>(
fn snapshot_lua_file<'source>( fn snapshot_lua_file<'source>(
file: &'source ImfsFile, file: &'source ImfsFile,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
let file_name = file.path let file_stem = file.path
.file_name().expect("Could not extract file stem") .file_stem().expect("Could not extract file stem")
.to_str().expect("Could not convert path to UTF-8"); .to_str().expect("Could not convert path to UTF-8");
let (instance_name, class_name) = if let Some(name) = match_trailing(file_name, ".server.lua") { let (instance_name, class_name) = if let Some(name) = match_trailing(file_stem, ".server") {
(name, "Script") (name, "Script")
} else if let Some(name) = match_trailing(file_name, ".client.lua") { } else if let Some(name) = match_trailing(file_stem, ".client") {
(name, "LocalScript") (name, "LocalScript")
} else { } else {
(file_name, "ModuleScript") (file_stem, "ModuleScript")
}; };
let contents = str::from_utf8(&file.contents) let contents = str::from_utf8(&file.contents)