language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Let TGM writer take &mut impl Write (#378)

Browse source 
Also `dmm_tools::dmm::Map::to_writer()`, so it can be used to save to a 
string and not just a file, for use in external tooling that depends on 
this, and may want to, for example, pass the string back to byond from 
rust-g.

`dmm_tools::dmm::Map::to_file()` is kept for convenience (and 
backwards compatibility I guess to not break code), but it just uses 
the `::to_writer()` function.
This commit is contained in:
DreamySkrell 2023-11-17 05:38:22 +01:00 • committed by GitHub
parent 356eeacab0
commit 5311ff5f02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/dmm-tools/src/dmm.rs
View file

@ -181,9 +181,12 @@ impl Map {
Ok(map)
}
pub fn to_writer(&self, writer: &mut impl std::io::Write) -> io::Result<()> {
save_tgm::save_tgm(self, writer)
}
pub fn to_file(&self, path: &Path) -> io::Result<()> {
// DMM saver later
save_tgm::save_tgm(self, File::create(path)?)
self.to_writer(&mut File::create(path)?)
}
pub fn key_length(&self) -> u8 {

5
crates/dmm-tools/src/dmm/save_tgm.rs
View file

@ -1,5 +1,4 @@
//! TGM map writer.
use std::fs::File;
use std::io::{self, Write, BufWriter};
use ndarray::Axis;
@ -10,8 +9,8 @@ const TGM_HEADER: &str = "//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREV
// Note: writeln! currently (2022-04-30) writes the \n character alone on all platforms
// If that changes, this will break.
pub fn save_tgm(map: &Map, f: File) -> io::Result<()> {
let mut f = BufWriter::new(f);
pub fn save_tgm(map: &Map, w: &mut impl Write) -> io::Result<()> {
let mut f = BufWriter::new(w);
writeln!(f, "{}", TGM_HEADER)?;
// dictionary