From 033a130be457f65174ac71ba0ef2932fb2fd730d Mon Sep 17 00:00:00 2001 From: Aaron <1858430+suddjian@users.noreply.github.com> Date: Sun, 24 Mar 2024 18:38:55 -0700 Subject: [PATCH 1/3] Avoid colons in filenames --- src/harmony/app/canvas.cpy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/harmony/app/canvas.cpy b/src/harmony/app/canvas.cpy index d27aa27..bd4ace4 100644 --- a/src/harmony/app/canvas.cpy +++ b/src/harmony/app/canvas.cpy @@ -117,7 +117,7 @@ namespace app_ui: void sanitize_filename(string &name): for i := 0; i < name.length(); i++: - if name[i] == '/': + if name[i] == '/' or name[i] == ':': name[i] = '_' auto get_stroke_width(): @@ -363,7 +363,7 @@ namespace app_ui: self.mark_redraw() - // we tack on ".hrm" to the filename + // we tack on ".[timestamp].hrm" to the filename void save_project(bool overwrite=false): sanitize_filename(self.project_name) debug "SAVING PROJECT", self.project_name @@ -387,6 +387,7 @@ namespace app_ui: run_command("tar", tar_args) datestr := self.vfb->get_date() + sanitize_filename(datestr) datecstr := datestr.c_str() char filename[PATH_MAX] sprintf(filename, "../%s.%s.hrm", self.project_name.c_str(), datecstr) From e457fff960c656f5239fdb16153daf2097177986 Mon Sep 17 00:00:00 2001 From: suddjian <1858430+suddjian@users.noreply.github.com> Date: Sat, 11 May 2024 14:04:14 -0700 Subject: [PATCH 2/3] change how all dates are formatted --- src/harmony/app/canvas.cpy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/harmony/app/canvas.cpy b/src/harmony/app/canvas.cpy index bd4ace4..a421b2f 100644 --- a/src/harmony/app/canvas.cpy +++ b/src/harmony/app/canvas.cpy @@ -234,6 +234,7 @@ namespace app_ui: sanitize_filename(self.project_name) char filename[PATH_MAX] datestr := self.vfb->get_date() + sanitize_filename(datestr) datecstr := datestr.c_str() sprintf(filename, "%s/%s-%s%s", SAVE_DIR, self.project_name.c_str(), datecstr, ".png") @@ -265,6 +266,7 @@ namespace app_ui: sanitize_filename(layer.name) char filename[PATH_MAX] datestr := self.vfb->get_date() + sanitize_filename(datestr) datecstr := datestr.c_str() sprintf(filename, "%s/%s-%s%s", SAVE_DIR, layer.name.c_str(), datecstr, ".png") From 270e9fda189ea0abeaa3f06df746ab8fd1cf754b Mon Sep 17 00:00:00 2001 From: suddjian <1858430+suddjian@users.noreply.github.com> Date: Sat, 11 May 2024 14:30:40 -0700 Subject: [PATCH 3/3] Something went backwards with git. This should fix it. --- src/harmony/app/canvas.cpy | 3 --- src/rmkit/fb/fb.cpy | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/harmony/app/canvas.cpy b/src/harmony/app/canvas.cpy index a421b2f..93f0e12 100644 --- a/src/harmony/app/canvas.cpy +++ b/src/harmony/app/canvas.cpy @@ -234,7 +234,6 @@ namespace app_ui: sanitize_filename(self.project_name) char filename[PATH_MAX] datestr := self.vfb->get_date() - sanitize_filename(datestr) datecstr := datestr.c_str() sprintf(filename, "%s/%s-%s%s", SAVE_DIR, self.project_name.c_str(), datecstr, ".png") @@ -266,7 +265,6 @@ namespace app_ui: sanitize_filename(layer.name) char filename[PATH_MAX] datestr := self.vfb->get_date() - sanitize_filename(datestr) datecstr := datestr.c_str() sprintf(filename, "%s/%s-%s%s", SAVE_DIR, layer.name.c_str(), datecstr, ".png") @@ -389,7 +387,6 @@ namespace app_ui: run_command("tar", tar_args) datestr := self.vfb->get_date() - sanitize_filename(datestr) datecstr := datestr.c_str() char filename[PATH_MAX] sprintf(filename, "../%s.%s.hrm", self.project_name.c_str(), datecstr) diff --git a/src/rmkit/fb/fb.cpy b/src/rmkit/fb/fb.cpy index e7a28b9..e148f6a 100644 --- a/src/rmkit/fb/fb.cpy +++ b/src/rmkit/fb/fb.cpy @@ -418,7 +418,7 @@ namespace framebuffer: time (&rawtime); timeinfo = localtime(&rawtime); - strftime(buffer,sizeof(buffer),"%Y-%m-%d-%H:%M:%S",timeinfo); + strftime(buffer,sizeof(buffer),"%Y-%m-%d-%H_%M_%S",timeinfo); std::string str(buffer); return str