yeah

Author: abb2k

changelog.md

@@ -7,6 +7,8 @@
 - Small changes to default graph and label layout
 - Made backup creating and reverting safer
 - Added a counter showing the amount of hidden runs according to your settings
+- Made graph data appear lower down on mobile devices se it is seen
+- Fixed some people having the old Seconds session method
 
 ## v3.0.5
 - Fixed crash to do with unicode paths

mod.json

@@ -8,7 +8,7 @@
     },
 	"id": "elohmrow.death_tracker",
 	"name": "Death Tracker",
-	"version": "v3.0.5",
+	"version": "v3.0.6",
 	"developer": "abb2k",
 	"description": "Tracks your deaths at every percentage",
 	"links": {

src/managers/StatsManager.cpp

@@ -213,6 +213,16 @@ Result<BackupLevelData> StatsManager::getBackupData(const std::string& levelKey,
     if (!std::filesystem::exists(levelSaveFilePath))
         return Err("1 (no stats exist for backup!)");
 
+    if (std::filesystem::exists(levelSaveFilePath / StatsManager::METADATA_FILE_NAME)){
+        auto levelStatsJsonRes = file::readJson(levelSaveFilePath / StatsManager::METADATA_FILE_NAME);
+        if (levelStatsJsonRes.isErr()) return Err("Failed to get backup level stats!");
+        auto levelStatsJson = levelStatsJsonRes.unwrap();
+        
+        auto metaJsonObjRes = levelStatsJson.as<LevelMetadeta>();
+        if (metaJsonObjRes.isErr()) return Err("Failed to get backup metadata!");
+        data.meta = metaJsonObjRes.unwrap();
+    }
+
     if (std::filesystem::exists(levelSaveFilePath / StatsManager::FROM0_FILE_NAME)){
         auto levelStatsJsonRes = file::readJson(levelSaveFilePath / StatsManager::FROM0_FILE_NAME);
         if (levelStatsJsonRes.isErr()) return Err("Failed to get backup level stats!");
@@ -364,6 +374,9 @@ Result<> StatsManager::addBackup(const std::string& levelKey, bool saveLevelStat
         }
     }
 
+    std::filesystem::copy_file(getSavesFolderPath() / levelKey / StatsManager::METADATA_FILE_NAME, levelBackupsFilePath / StatsManager::METADATA_FILE_NAME, std::filesystem::copy_options::overwrite_existing, ec);
+    if (ec) return Err("Failed to backup level metadata: {}", ec.message());
+
     if (sessionsToSave == std::nullopt) return Ok();
 
     if (sessionsToSave.value() >= -1){

src/nodes/layers/DTLayer.cpp

@@ -3108,7 +3108,7 @@ UpdateFuture DTLayer::onSectionKey(){
         validSections.push_back(section);
     }
 
-    if (validSections.size() <= 1) co_return Err("Not enough sections!");
+    if (validSections.size() <= 1) co_return Err(UpdateFutureError("Not enough sections!", false));
 
     GEODE_CO_UNWRAP_INTO(auto deaths, co_await getTFor<Deaths>([](GeneralData const& data){
         auto runs = data.runs;

src/nodes/optionNodes/SaveOptions.cpp

@@ -291,22 +291,25 @@ void SaveOptions::createChoiceAlert(const std::string& title, const std::string&
 }
 
 void SaveOptions::onBackupRevert(BackupCell* cell){
-    if (DTLayer::get()->m_MyLevelStats.isErr()) return;
-
     if (cell->getBackupData() == nullptr) return;
 
     createChoiceAlert("WARNING!", "Reverting to this backup will overwrite your current death tracker save for this level.\nAre you sure you want to do this?", "No", "Yes", [&, cell](bool btn2){
         if (btn2){
+            Result<> metaRes = Ok();
             Result<> generalRes = Ok();
             Result<> sessionsRes = Ok();
 
+            if (cell->getBackupData()->meta.has_value())
+                metaRes = StatsManager::setMetadata(cell->getBackupData()->meta.value(), cell->getLevelKey());
             if (cell->getBackupData()->from0.has_value())
                 generalRes = StatsManager::setGeneral(cell->getBackupData()->from0.value(), cell->getLevelKey());
             if (cell->getBackupData()->sessionNames.has_value()){
                 sessionsRes = StatsManager::reveretBackupSessions(cell->getLevelKey(), cell->getBackupTime());
             }
 
-            if (generalRes.isErr() || sessionsRes.isErr()){
+            if (generalRes.isErr() || sessionsRes.isErr() || metaRes.isErr()){
+                if (metaRes.isErr())
+                    log::error("{}", metaRes.unwrapErr());
                 if (generalRes.isErr())
                     log::error("{}", generalRes.unwrapErr());
                 if (sessionsRes.isErr())
@@ -322,8 +325,6 @@ void SaveOptions::onBackupRevert(BackupCell* cell){
     });
 }
 void SaveOptions::onBackupDelete(BackupCell* cell){
-    if (DTLayer::get()->m_MyLevelStats.isErr()) return;
-
     createChoiceAlert("WARNING!", "Deleting this backup is irreversible.\nAre you sure you want to do this?", "No", "Yes", [&, cell](bool btn2){
         if (btn2){
             auto deleteBackupRes = StatsManager::deleteBackup(cell->getLevelKey(), cell->getBackupTime());
@@ -340,13 +341,13 @@ void SaveOptions::onBackupDelete(BackupCell* cell){
 void SaveOptions::updateBackupsList(){
     backupsScrollLayer->m_contentLayer->removeAllChildren();
 
-    if (DTLayer::get()->m_MyLevelStats.isOk()){
-        auto& stats = DTLayer::get()->m_MyLevelStats.unwrap();
+    auto lvlKey = StatsManager::getLevelKey(DTLayer::get()->m_Level);
 
-        auto backupsList = StatsManager::getBackupsCount(stats.levelKey);
+    if (lvlKey.isOk()){
+        auto backupsList = StatsManager::getBackupsCount(lvlKey.unwrap());
         int z = 0;
         for (const auto& backupTime : backupsList){
-            auto cell = BackupCell::create(backupsScrollLayer->getContentWidth() - 5, stats.levelKey, backupTime);
+            auto cell = BackupCell::create(backupsScrollLayer->getContentWidth() - 5, lvlKey.unwrap(), backupTime);
             cell->onRevertCallback = std::bind(&SaveOptions::onBackupRevert, this, std::placeholders::_1);
             cell->onDeleteCallback = std::bind(&SaveOptions::onBackupDelete, this, std::placeholders::_1);
             backupsScrollLayer->m_contentLayer->addChild(cell);
@@ -358,6 +359,7 @@ void SaveOptions::updateBackupsList(){
             cell->setZOrder(z++);
         }
     }
+    
 
     backupsScrollLayer->m_contentLayer->updateLayout();
     backupsScrollLayer->moveToTop();

src/types/DTTypes.hpp

@@ -426,6 +426,7 @@ struct LevelData {
 };
 
 struct BackupLevelData {
+    std::optional<LevelMetadeta> meta;
     std::optional<GeneralData> from0 = std::nullopt;
     std::optional<std::set<long long>> sessionNames = std::nullopt;
     long long backupDate;