remove exceptions from remaining int conversions

Cvolton · Jan 26, 2024 · fceb9b9 · fceb9b9
1 parent f140cb2
commit fceb9b9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/managers/BetterInfoStats.cpp b/src/managers/BetterInfoStats.cpp
@@ -136,11 +136,8 @@ time_t BetterInfoStats::getCompletion(GJGameLevel* level, bool practice) {
 
     auto ret = dict->valueForKey(keyForLevel(level));
     if(std::string_view(ret->getCString()).empty()) return 0;
-    try {
-        return std::strtol(ret->getCString(), nullptr, 10);
-    } catch(...) {
-        return 0;
-    }
+
+    return BetterInfo::strtol(ret->getCString());
 }
 
 void BetterInfoStats::logPlay(GJGameLevel* level) {
@@ -161,11 +158,8 @@ time_t BetterInfoStats::getPlay(GJGameLevel* level, bool last) {
 
     auto ret = dict->valueForKey(keyForLevel(level));
     if(std::string_view(ret->getCString()).empty()) return 0;
-    try {
-        return std::strtol(ret->getCString(), nullptr, 10);
-    } catch(...) {
-        return 0;
-    }
+
+    return BetterInfo::strtol(ret->getCString());
 }
 
 std::string BetterInfoStats::keyForLevel(GJGameLevel* level) {
@@ -185,9 +179,6 @@ int BetterInfoStats::getAttempts(GJGameLevel* level, bool practice) {
 
     auto ret = dict->valueForKey(keyForLevel(level));
     if(std::string_view(ret->getCString()).empty()) return 0;
-    try {
-        return std::strtol(ret->getCString(), nullptr, 10);
-    } catch(...) {
-        return 0;
-    }
+
+    return BetterInfo::stoi(ret->getCString());
 }
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -709,4 +709,10 @@ int BetterInfo::stoi(std::string_view str) {
     int result = 0;
     std::from_chars(str.data(), str.data() + str.size(), result);
     return result;
+}
+
+long long BetterInfo::strtol(std::string_view str) {
+    long long result = 0;
+    std::from_chars(str.data(), str.data() + str.size(), result);
+    return result;
 }
diff --git a/src/utils.hpp b/src/utils.hpp
@@ -67,4 +67,5 @@ namespace BetterInfo {
     AxisLayoutOptions* copyLayoutOptions(AxisLayoutOptions* a);
 
     int stoi(std::string_view str);
+    long long strtol(std::string_view str);
 }
diff --git a/src/utils/LevelProgressDialog.cpp b/src/utils/LevelProgressDialog.cpp
@@ -3,17 +3,15 @@
 
 #include "../managers/BetterInfoStats.h"
 #include "../layers/PaginatedFLAlert.h"
+#include "../utils.hpp"
 
 std::string LevelProgressDialog::printableProgress(std::string personalBests, int percentage){
 
     std::stringstream bestsStream(personalBests);
     std::string currentBest;
     std::deque<int> progresses;
     while(getline(bestsStream, currentBest, ',')){
-        try {
-            progresses.push_front(std::stoi(currentBest));
-            //contentStream << percentage << "% ";
-        }catch(...){}
+        progresses.push_front(BetterInfo::stoi(currentBest));
     }
     std::string printable;
     //std::reverse(std::begin(progresses), std::end(progresses));