don't use exceptions for getting text node content

Cvolton · Jan 19, 2024 · 7e4e060 · 7e4e060
1 parent ba6d4f7
commit 7e4e060
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 26 deletions.
diff --git a/src/layers/JumpToPageLayer.cpp b/src/layers/JumpToPageLayer.cpp
@@ -1,5 +1,7 @@
 #include "JumpToPageLayer.h"
 
+#include "../utils.hpp"
+
 JumpToPageLayer* JumpToPageLayer::create(InfoLayer* infoLayer){
     auto ret = new JumpToPageLayer();
     if (ret && ret->init(infoLayer)) {
@@ -64,11 +66,7 @@ void JumpToPageLayer::onReset(cocos2d::CCObject* sender)
 }
 
 int JumpToPageLayer::pageNumber(){
-    int pageNumber = 1;
-    try{
-        pageNumber = std::stoi(m_textNode->getString());
-    }catch(...){}
-    return pageNumber;
+    return BetterInfo::stoi(m_textNode->getString());
 }
 
 void JumpToPageLayer::onOK(cocos2d::CCObject* sender){

diff --git a/src/layers/LevelFiltering/IDRangePopup.cpp b/src/layers/LevelFiltering/IDRangePopup.cpp
@@ -1,5 +1,7 @@
 #include "IDRangePopup.h"
 
+#include "../../utils.hpp"
+
 IDRangePopup* IDRangePopup::create(IDRangeDelegate* delegate, int min, int max, const char* text, int additional){
     auto ret = new IDRangePopup();
     if (ret && ret->init(delegate, min, max, text, additional)) {
@@ -71,17 +73,9 @@ bool IDRangePopup::init(IDRangeDelegate* delegate, int min, int max, const char*
 }
 
 int IDRangePopup::minID(){
-    int ret = 0;
-    try{
-        ret = std::stoi(m_minNode->getString());
-    }catch(...){}
-    return ret;
+    return BetterInfo::stoi(m_minNode->getString());
 }
 
 int IDRangePopup::maxID(){
-    int ret = 0;
-    try{
-        ret = std::stoi(m_maxNode->getString());
-    }catch(...){}
-    return ret;
+    return BetterInfo::stoi(m_maxNode->getString());
 }
diff --git a/src/layers/LevelFiltering/ProfileSearchOptionsSongSelect.cpp b/src/layers/LevelFiltering/ProfileSearchOptionsSongSelect.cpp
@@ -74,11 +74,7 @@ void ProfileSearchOptionsSongSelect::drawToggles(){
 }
 
 int ProfileSearchOptionsSongSelect::songID(){
-    int songID = 0;
-    try{
-        songID = std::stoi(m_textNode->getString());
-    }catch(...){}
-    return songID;
+    return BetterInfo::stoi(m_textNode->getString());
 }
 
 void ProfileSearchOptionsSongSelect::onSaved(CCObject* sender){

diff --git a/src/layers/LevelIDLayer.cpp b/src/layers/LevelIDLayer.cpp
@@ -1,5 +1,7 @@
 #include "LevelIDLayer.h"
 
+#include "../utils.hpp"
+
 LevelIDLayer* LevelIDLayer::create(){
     auto ret = new LevelIDLayer();
     if (ret && ret->init()) {
@@ -14,11 +16,7 @@ LevelIDLayer* LevelIDLayer::create(){
 }
 
 int LevelIDLayer::getNumber(){
-    int pageNumber = 1;
-    try{
-        pageNumber = std::stoi(m_textNode->getString());
-    }catch(...){}
-    return pageNumber;
+    return BetterInfo::stoi(m_textNode->getString());
 }
 
 void LevelIDLayer::onLevelComments(cocos2d::CCObject* sender){
@@ -43,7 +41,7 @@ bool LevelIDLayer::init(){
 
     m_textNode = CCTextInputNode::create(150, 30, "ID", "bigFont.fnt");
     m_textNode->setLabelPlaceholderColor({0x75, 0xAA, 0xF0});
-    m_textNode->setAllowedChars("0123456789");
+    m_textNode->setAllowedChars("-0123456789");
     m_textNode->setMaxLabelScale(0.7f);
     m_textNode->setMaxLabelWidth(140);
     m_textNode->setPosition({0,6});

diff --git a/src/layers/_bases/CvoltonOptionsLayer.h b/src/layers/_bases/CvoltonOptionsLayer.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "CvoltonAlertLayerStub.h"
 
+#include "../../utils.hpp"
+
 class CvoltonOptionsLayer : public CvoltonAlertLayerStub {
 protected:
     int m_toggleCount = 0;

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -704,4 +704,10 @@ AxisLayoutOptions* BetterInfo::copyLayoutOptions(AxisLayoutOptions* a) {
         ->setBreakLine(a->getBreakLine())
         ->setSameLine(a->getSameLine())
         ->setScalePriority(a->getScalePriority());
+}
+
+int BetterInfo::stoi(std::string_view str) {
+    int result = 0;
+    std::from_chars(str.data(), str.data() + str.size(), result);
+    return result;
 }
diff --git a/src/utils.hpp b/src/utils.hpp
@@ -65,4 +65,6 @@ namespace BetterInfo {
 
     AxisLayoutOptions* copyLayoutOptions(CCNode* a);
     AxisLayoutOptions* copyLayoutOptions(AxisLayoutOptions* a);
+
+    int stoi(std::string_view str);
 }