Support HOS16.0.0

.github/workflows/main.yml

@@ -0,0 +1,57 @@
+name: Release
+
+on:
+  issue_comment:
+    types: [ created ]
+
+jobs:
+  build_and_release:
+    name: Build and release
+    runs-on: ubuntu-latest
+    container: devkitpro/devkita64:latest
+    if: contains(github.event.comment.body, '/release-action')
+
+    steps:
+      - name: Update packages
+        run: |
+          sudo -n apt-get update
+          sudo -n apt-get upgrade -y git build-essential
+        shell: bash
+      - name: Update latest libnx
+        run: |
+          git config --global --add safe.directory "*"
+          git clone --recurse-submodules https://github.com/zdm65477730/libnx.git
+          cd libnx
+          make install -j$(nproc)
+        shell: bash
+      - name: Checkout latest code
+        uses: actions/[email protected]
+        with:
+          ref: master
+          clean: true
+          fetch-depth: 0
+          fetch-tags: true
+          submodules: recursive
+      - name: Setup ENV parameters
+        run: |
+          VER_FILE=Application/Makefile
+          VERSION=$(awk '/^VER_MAJOR/{print $3}' $VER_FILE).$(awk '/^VER_MINOR/{print $3}' $VER_FILE).$(awk '/^VER_MICRO/{print $3}' $VER_FILE)
+          echo "TAG=v${VERSION}" > "${GITHUB_ENV}"
+          echo "RELEASE_NAME=NX-Activity-Log v${VERSION}" >> "${GITHUB_ENV}"
+        shell: bash
+      - name: Build
+        run: |
+          export DEVKITPRO=/opt/devkitpro
+          make -j$(nproc)
+        shell: bash
+      - name: Upload Release Asset
+        uses: softprops/[email protected]
+        with:
+          name: ${{ env.RELEASE_NAME }}
+          tag_name: ${{ env.TAG }}
+          draft: false
+          prerelease: false
+          generate_release_notes: yes
+          make_latest: true
+          files: |
+            ./sdcard/switch/NX-Activity-Log/NX-Activity-Log.nro

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "Translations"]
 	path = Application/romfs/lang
-	url = https://github.com/tallbl0nde/NX-Activity-Log-Translations.git
-[submodule "libs/json"]
-	path = Application/libs/json
-	url = https://github.com/nlohmann/json.git
+	url = https://github.com/zdm65477730/NX-Activity-Log-Translations.git
 [submodule "Application/libs/SimpleIniParser"]
 	path = Application/libs/SimpleIniParser
-	url = https://git.nicholemattera.com/NicholeMattera/Simple-INI-Parser
+	url = https://github.com/zdm65477730/SimpleIniParser.git
+[submodule "Application/libs/json"]
+	path = Application/libs/json
+	url = https://github.com/nlohmann/json.git
 [submodule "Application/libs/Aether"]
 	path = Application/libs/Aether
-	url = https://github.com/tallbl0nde/Aether
+	url = https://github.com/zdm65477730/Aether

Application/Makefile

@@ -34,22 +34,22 @@ BUILD		:=	build
 INCLUDES	:=	include
 SOURCES		:=	source
 ROMFS		:=	romfs
-LIBS		:=	-lAether -lcurl -lnx `sdl2-config --libs` -lSDL2_ttf `freetype-config --libs` -lSDL2_gfx -lSDL2_image -lpng -ljpeg -lwebp -lSimpleIniParser
+LIBS		:=	-lAether -lcurl -lnx `sdl2-config --libs` -lSDL2_ttf `freetype-config --libs` -lSDL2_gfx -lSDL2_image -lpng -ljpeg -lwebp -lSimpleIniParser -lharfbuzz
 LIBDIRS		:=	$(PORTLIBS) $(LIBNX) $(CURDIR)/libs/Aether $(CURDIR)/libs/json $(CURDIR)/libs/SimpleIniParser
 FORWARDER	:=	$(ROMFS)/exefs.nsp
 
 #---------------------------------------------------------------------------------
 # Application version
 #---------------------------------------------------------------------------------
 VER_MAJOR	:= 1
-VER_MINOR	:= 4
-VER_MICRO	:= 0
+VER_MINOR	:= 5
+VER_MICRO	:= 4
 
 #---------------------------------------------------------------------------------
 # Options for .nacp information
 #---------------------------------------------------------------------------------
 APP_TITLE   := 	NX Activity Log
-APP_AUTHOR	:= 	tallbl0nde
+APP_AUTHOR	:= 	tallbl0nde&zdm65477730
 APP_VERSION	:=	$(VER_MAJOR).$(VER_MINOR).$(VER_MICRO)
 ICON 		:= 	icon.jpg
 
@@ -72,7 +72,7 @@ OUTPUT		:=	$(CURDIR)/$(TARGET)
 #---------------------------------------------------------------------------------
 DEFINES		:=	-D__SWITCH__ -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) -DVER_MICRO=$(VER_MICRO) -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_MICRO)\"
 CFLAGS		:=	-g -Wall -O2 -ffunction-sections $(ARCH) $(DEFINES) $(INCLUDE) `freetype-config --cflags` `sdl2-config --cflags`
-CXXFLAGS	:=	$(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++2a
+CXXFLAGS	:=	$(CFLAGS) -fno-rtti -fno-exceptions -std=c++23
 
 #----------------------------------------------------------------------------------------------------------------------
 # Definition of variables which store file locations

Application/include/Types.hpp

@@ -19,6 +19,7 @@ enum Language {
     ChineseTraditional,
     Chinese,
     Korean,
+    Japanese,
     TotalLanguages  // Total number of languages (only used for iterating)
 };
 // Return string matching language

Application/include/nx/PlayData.hpp

@@ -24,37 +24,37 @@ namespace NX {
 
     // PlayEvents are parsed PdmPlayEvents containing only necessary information
     struct PlayEvent {
-        PlayEventType type;     // Type of PlayEvent
-        AccountUid userID;      // UserID
-        TitleID titleID;        // TitleID
-        EventType eventType;    // See EventType enum
-        u64 clockTimestamp;     // Time of event
-        u64 steadyTimestamp;    // Steady timestamp (used for calculating duration)
+        PlayEventType type;        // Type of PlayEvent
+        AccountUid userID;         // UserID
+        TitleID titleID;           // TitleID
+        EventType eventType;       // See EventType enum
+        u64 clockTimestamp;        // Time of event
+        u64 steadyTimestamp;       // Steady timestamp (used for calculating duration)
     };
 
     // A PlaySession represents a session of play for a game. It contains the start
     // and end timestamps and playtime for convenience. Note that (end-start) != playtime
     // due to time when the game may not have been focussed.
     struct PlaySession {
-        u32 playtime;           // Total playtime in seconds
+        u64 playtime;           // Total playtime in seconds
         u64 startTimestamp;     // Time of launch
         u64 endTimestamp;       // Time of exit
     };
 
     // PdmPlayStatistics but only the necessary things
     struct PlayStatistics {
         TitleID titleID;        // TitleID of these stats
-        u32 firstPlayed;        // Timestamp of first launch
-        u32 lastPlayed;         // Timestamp of last play (exit)
-        u32 playtime;           // Total playtime in seconds
+        u64 firstPlayed;        // Timestamp of first launch
+        u64 lastPlayed;         // Timestamp of last play (exit)
+        u64 playtime;           // Total playtime in seconds
         u32 launches;           // Total launches
     };
 
     // RecentPlayStatistics struct is similar to PdmPlayStatistics but
     // only contains recent values
     struct RecentPlayStatistics {
         TitleID titleID;        // TitleID of these statistics
-        u32 playtime;           // Total playtime in seconds
+        u64 playtime;           // Total playtime in seconds
         u32 launches;           // Total launches
     };
 
@@ -118,10 +118,10 @@ namespace NX {
             // Returns all play sessions for the given title ID and user ID
             std::vector<PlaySession> getPlaySessionsForUser(TitleID, AccountUid);
 
-            // Returns a RecentPlayStatistics for the given time range for all users
+            // Returns a RecentPlayStatistics for the given time range and user ID for all Title IDs
             RecentPlayStatistics * getRecentStatisticsForUser(u64, u64, AccountUid);
 
-            // Returns a RecentPlayStatistics for the given time range and user ID
+            // Returns a RecentPlayStatistics for the given time range, user ID and title ID
             RecentPlayStatistics * getRecentStatisticsForTitleAndUser(TitleID, u64, u64, AccountUid);
 
             // Returns a PlayStatistics for the given titleID and userID

Application/include/ui/element/SortedList.hpp

@@ -8,11 +8,11 @@
 // Struct storing information about entry used for sorting
 struct SortInfo {
     std::string name;                // Name of title
-    unsigned long long int titleID;  // Title's ID
-    unsigned int firstPlayed;        // Timestamp of first launch
-    unsigned int lastPlayed;         // Timestamp of last play
-    unsigned int playtime;           // Total playtime in seconds
-    unsigned int launches;           // Total launches
+    u64 titleID;  // Title's ID
+    u64 firstPlayed;        // Timestamp of first launch
+    u64 lastPlayed;         // Timestamp of last play
+    u64 playtime;           // Total playtime in seconds
+    u32 launches;           // Total launches
 };
 
 namespace CustomElm {

Application/include/ui/screen/Details.hpp

@@ -18,10 +18,6 @@ namespace Screen {
             // Used to udpate prev. screen
             bool popped;
 
-            // Updates graph if data matching current time range
-            void updateGraph();
-            // Updates the list of play sessions matching current time range
-            void updateSessions();
             // Element which marks top of sessions
             Aether::Element * topElm;
 

Application/include/ui/screen/RecentActivity.hpp

@@ -17,10 +17,6 @@ namespace Screen {
 
             // Updates the "recent activity" part of the screen
             void updateActivity();
-            // Updates graph if data matching current time range
-            void updateGraph();
-            // Updates the list of games played underneath
-            void updateTitles();
 
             // Element which marks top of sessions
             Aether::Element * topElm;

Application/include/utils/Debug.hpp

@@ -0,0 +1,17 @@
+#pragma once
+#ifndef DEBUG_HPP
+#define DEBUG_HPP
+
+#include <string>
+#include <cstdio>
+#include <mutex>
+
+//#define ENABLE_DEBUG
+#define MAX_LOG_LEN 512
+
+namespace Utils {
+    extern std::mutex mutex;
+    void write_log(const char *pszFmt, ...);
+};
+
+#endif

Application/include/utils/Utils.hpp

@@ -27,20 +27,20 @@ namespace Utils {
     std::string insertVersionInString(std::string, std::string);
 
     // Format the given timestamp as 'last played' string
-    std::string lastPlayedToString(unsigned int);
+    std::string lastPlayedToString(uint64_t);
 
     // Format the given number of launches into a string
     std::string launchesToString(unsigned int);
     std::string launchesToPlayedString(unsigned int);
 
     // Format the given playtime (in seconds) into hours and minutes
-    std::string playtimeToString(unsigned int);
+    std::string playtimeToString(uint64_t);
 
     // Format the given playtime (in seconds) into 'played for' string
-    std::string playtimeToPlayedForString(unsigned int);
+    std::string playtimeToPlayedForString(uint64_t);
 
     // Format the given playtime (in seconds) into 'total playtime' string
-    std::string playtimeToTotalPlaytimeString(unsigned int);
+    std::string playtimeToTotalPlaytimeString(uint64_t);
 
     // Merges two vectors into one (for sorting)
     // Vector to merge into, two vectors to merge

Application/source/Application.ExportJob.cpp

@@ -38,7 +38,6 @@ namespace Main {
                 // Check if played, and if not move onto next
                 NX::RecentPlayStatistics * stats = this->app->playdata_->getRecentStatisticsForTitleAndUser(title->titleID(), std::numeric_limits<u64>::min(), std::numeric_limits<u64>::max(), user->ID());
                 bool recentLaunched = (stats->launches != 0);
-                delete stats;
 
                 // Add title metadata
                 tJson["name"] = title->name();
@@ -92,10 +91,11 @@ namespace Main {
                 // Get all summary stats
                 NX::PlayStatistics * stats2 = this->app->playdata_->getStatisticsForUser(title->titleID(), user->ID());
                 bool allLaunched = (stats2->launches != 0);
-                tJson["summary"]["firstPlayed"] = pdmPlayTimestampToPosix(stats2->firstPlayed);
-                tJson["summary"]["lastPlayed"] = pdmPlayTimestampToPosix(stats2->lastPlayed);
-                tJson["summary"]["playtime"] = stats2->playtime;
-                tJson["summary"]["launches"] = stats2->launches;
+                tJson["summary"]["firstPlayed"] = stats2->firstPlayed;
+                tJson["summary"]["lastPlayed"] = stats2->lastPlayed;
+                tJson["summary"]["playtime"] = stats->playtime;
+                tJson["summary"]["launches"] = stats->launches;
+                delete stats;
                 delete stats2;
 
                 // Append title if played at least once

Application/source/Application.ImportJob.cpp

@@ -132,8 +132,8 @@ namespace Main {
                     nlohmann::json s = title["summary"];
                     if (s["firstPlayed"] != nullptr && s["lastPlayed"] != nullptr && s["playtime"] != nullptr && s["launches"] != nullptr) {
                         tJson["summary"] = nlohmann::json();
-                        tJson["summary"]["firstPlayed"] = Utils::Time::posixTimestampToPdm(s["firstPlayed"].get<uint64_t>());
-                        tJson["summary"]["lastPlayed"] = Utils::Time::posixTimestampToPdm(s["lastPlayed"].get<uint64_t>());
+                        tJson["summary"]["firstPlayed"] = s["firstPlayed"].get<uint64_t>();
+                        tJson["summary"]["lastPlayed"] = s["lastPlayed"].get<uint64_t>();
                         tJson["summary"]["playtime"] = s["playtime"];
                         tJson["summary"]["launches"] = s["launches"];
                     }

Application/source/Config.cpp

@@ -46,6 +46,8 @@ namespace Main {
             this->gLang_ = Chinese;
         } else if (option->value == "Korean") {
             this->gLang_ = Korean;
+        } else if (option->value == "Japanese") {
+            this->gLang_ = Japanese;
         } else {
             this->gLang_ = Default;
         }
@@ -125,7 +127,10 @@ namespace Main {
         std::ifstream file("/config/NX-Activity-Log/hidden.conf");
         std::string line;
         while (file >> line) {
-            this->hidden.push_back(Utils::stringToU64(line));
+            uint64_t hiddenTitle = Utils::stringToU64(line);
+            if (hiddenTitle != 0) {
+                this->hidden.push_back(hiddenTitle);
+            }
         }
 
         // Read in adjustment values
@@ -186,6 +191,8 @@ namespace Main {
             option->value = "Chinese";
         } else if (this->gLang_ == Korean) {
             option->value = "Korean";
+        } else if (this->gLang_ == Japanese) {
+            option->value = "Japanese";
         }
 
         option = ini->findSection("general")->findFirstOption("showGraphValues");

Application/source/Types.cpp

@@ -52,6 +52,10 @@ std::string toString(Language l) {
         case Language::Korean:
             str = "한국어";
             break;
+
+        case Language::Japanese:
+            str = "日本語";
+            break;
 
         default:
             break;