March Fixes (#273)

* String Parsing Fixes

- Prevent empty string on readTime
- Allow numbers starting with `.`
- Prevent NaN as a result.

* Clear artist on unload.

Leaving leftover data between audio loads.

* Make fallback noteskin work.

Fixes 2 issues when looking for a valid style noteskin:
- Only looks for the 5 priority noteskins.
- Default placeholder type is the same as the default noteskin type, so it will never load the fallback if no supported noteskins are found.

This changes the placeholder value to be different, and if no priority noteskins support the current style, search through all loaded noteskins before using the fallback.

* Fix FileDrop paths.

- Fixes utf8 paths from not working.
- Fixes directory drops not finding any valid files due to extension now including the dot.
- Use path util for extension and osu filename conversion.

* Update handleDialogOpening

Prevent a double open of a dialog due to requesting it open when already open and never clearing the flag.

Also prevent invalid DialogId values from crashing due to dlg being nullptr;

* Stop CustomSnap from grabbing focus.

It doesn't select the box and eats the inputs when initially open, including for shortcuts.

Author: Psycast

src/Core/StringUtils.cpp

@@ -116,6 +116,7 @@ bool Str::readBool(const std::string& s, bool alt) {
 }
 
 double Str::readTime(const std::string& s, double alt) {
+    if (s.empty()) return alt;
     auto time = Str::split(s, ":", false, false);
     double v = 0.0;
 
@@ -132,7 +133,7 @@ double Str::readTime(const std::string& s, double alt) {
             break;
     }
 
-    if (v == 0 && s.empty()) return alt;
+    if (v == 0) return alt;
     alt = v;
     return alt;
 }
@@ -670,7 +671,7 @@ static const uint8_t* ParseOperandWithSign(const uint8_t* p, double& out) {
     if (*p == '(') {
         p = ParseNestedExpression(SkipWs(++p), out);
         if (*p == ')') p = SkipWs(++p);
-    } else if (*p >= '0' && *p <= '9') {
+    } else if (*p == '.' || (*p >= '0' && *p <= '9')) {
         p = ParseNumber(p, out);
     }
     if (sign == '-') out = -out;
@@ -682,7 +683,7 @@ static const uint8_t* ParseMultiplicationOperand(const uint8_t* p,
     if (*p == '(') {
         p = ParseNestedExpression(SkipWs(++p), out);
         if (*p == ')') p = SkipWs(++p);
-    } else if (*p >= '0' && *p <= '9') {
+    } else if (*p == '.' || (*p >= '0' && *p <= '9')) {
         p = ParseNumber(p, out);
     } else if (*p == '+' || *p == '-') {
         p = ParseOperandWithSign(p, out);
@@ -722,6 +723,7 @@ bool Str::parse(const char* expr, double& out) {
     double tmp = 0.0;
     const uint8_t* begin = SkipWs(reinterpret_cast<const uint8_t*>(expr));
     const uint8_t* p = ParseNestedExpression(begin, tmp);
+    if (!isfinite(tmp)) tmp = 0.0;
     if (p > begin) out = tmp;
     return (p > begin);
 }

src/Dialogs/CustomSnap.cpp

@@ -24,7 +24,6 @@ void DialogCustomSnap::myCreateWidgets() {
     scol->onChange.bind(this, &DialogCustomSnap::onChange);
     scol->setRange(4.0, 192.0);
     scol->setPrecision(0, 0);
-    scol->startCapturingText();
 }
 
 void DialogCustomSnap::onChange() {

src/Editor/Editor.cpp

@@ -422,17 +422,16 @@ struct EditorImpl : public Editor, public InputHandler {
 
         // Make a list of loadable extensions, from high priority to low
         // priority.
-        static const char* extList[] = {"ssc", "sm",  "dwi", "osu",
-                                        "ogg", "mp3", "wav"};
+        static const char* extList[] = {".ssc", ".sm",  ".dwi", ".osu",
+                                        ".ogg", ".mp3", ".wav"};
         const char** extEnd = extList + (ignoreAudio ? 4 : 7);
 
         // Check if the path is a directory.
         if (fs::is_directory(path)) {
             // If so, look for loadable files in the given directory.
             auto curPriority = extEnd;
             for (auto& file : File::findFiles(path, false)) {
-                std::string ext(reinterpret_cast<const char*>(
-                    file.extension().u8string().c_str()));
+                std::string ext(pathToUtf8(file.extension()));
                 Str::toLower(ext);
                 auto priority = std::find(extList, extEnd, ext);
                 if (priority != extEnd && priority < curPriority) {
@@ -738,7 +737,10 @@ struct EditorImpl : public Editor, public InputHandler {
 
     void handleDialogOpening(DialogId id, recti rect) {
         auto& entry = myDialogs[id];
-        if (entry.ptr) return;
+        if (entry.ptr) {
+            entry.requestOpen = false;
+            return;
+        }
 
         EditorDialog* dlg = nullptr;
         switch (id) {
@@ -792,6 +794,8 @@ struct EditorImpl : public Editor, public InputHandler {
                 break;
         };
 
+        if (!dlg) return;
+
         dlg->setId(id);
 
         if (rect.w > 0 && rect.h > 0) {
@@ -827,7 +831,7 @@ struct EditorImpl : public Editor, public InputHandler {
 
     void onFileDrop(FileDrop& evt) override {
         if (evt.count >= 1) {
-            fs::path path(evt.files[0]);
+            fs::path path = utf8ToPath(evt.files[0]);
             if (!openSimfile(findSimfile(path, false))) {
                 if (canConvertAudio(pathToUtf8(path).c_str())) {
                     gMusic->startAudioConversion(path, true);

src/Editor/Music.cpp

@@ -150,6 +150,7 @@ struct MusicImpl : public Music, public MixSource {
 
         mySamples.clear();
         myTitle.clear();
+        myArtist.clear();
 
         myLoadState = LOADING_DONE;
     }

src/Managers/NoteskinMan.cpp

@@ -481,7 +481,7 @@ struct NoteskinManImpl : public NoteskinMan {
         if (myActiveStyle == style) return;
         myActiveStyle = style;
 
-        int type = -1;
+        int type = -2;
         NoteskinImpl* skin = nullptr;
 
         // Find the noteskin for the style.
@@ -503,6 +503,16 @@ struct NoteskinManImpl : public NoteskinMan {
                     break;
                 }
             }
+
+            // No priority skin found, find one that supports the style.
+            if (type < 0) {
+                for (auto i = 0; i < myTypes.size(); ++i) {
+                    if (Supports(myTypes[i], style)) {
+                        type = i;
+                        break;
+                    }
+                }
+            }
         }
 
         // Replace the active noteskin with the new skin.

src/Simfile/LoadOsu.cpp

@@ -512,8 +512,7 @@ static bool ParseDir(Vector<OsuFile*>& out, fs::path dir, std::string& err) {
 
         out.push_back(new OsuFile);
         ParseFile(*out.back(), str);
-        out.back()->filename = std::string(
-            reinterpret_cast<const char*>(file.filename().u8string().c_str()));
+        out.back()->filename = pathToUtf8(file.filename());
     }
     return true;
 }

src/System/System.cpp

@@ -781,7 +781,7 @@ struct SystemImpl : public System {
                         std::wstring wstr(pathLen, 0);
                         DragQueryFileW(reinterpret_cast<HDROP>(wp), i,
                                        wstr.data(), pathLen + 1);
-                        files[i] = Narrow(wstr);
+                        files[i] = pathToUtf8(fs::path(wstr));
                     }
 
                     DragFinish(reinterpret_cast<HDROP>(wp));