Internet ranking and bms parsing extensions

ATTRIBUTIONS.md

@@ -55,7 +55,7 @@ https://github.com/souki202/my_beatoraja_skin
 
 #### SocialSkin dependencies:
 
-* Background image: (Originally: \*/background/\*.png; RhythmGame: bg.png, clear.png, failed.png):
+* Background image: (Originally: \*/background/\*.png; RhythmGame: bg.png, clear.png, failed.png, flower-back0716.png):
   Flower images from [百花繚乱](https://flowerillust.com/).
 * Font: Copyright © 2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/),
   with Reserved Font Name 'Source', Kozuka Gothic.
@@ -132,6 +132,13 @@ Copyright © The Qt Company Ltd.
 
 https://doc.qt.io/qt-6/lgpl.html
 
+### QtKeychain
+
+BSD 3-Clause "New" or "Revised" License (BSD 3-Clause)
+
+Copyright © 2011–2015 Frank Osterfeld
+Copyright © 2016 Mathias Hasselmann
+
 ### libxml2
 
 The MIT License (MIT)
@@ -827,3 +834,60 @@ BSD 2-Clause License (BSD-2-Clause)
 Copyright © 2001-2014 Peter Johnson and other Yasm developers
 
 https://github.com/yasm/yasm/blob/master/COPYING
+
+### libdbus-1 headers
+
+Academic Free License v2.1 (AFL-2.1)
+
+Copyright © 2002, 2003 CodeFactory AB
+Copyright © 2004, 2005 Red Hat, Inc.
+
+### libsecret
+
+GNU Lesser General Public License v2.1 or later (LGPL-2.1-or-later)
+
+### libgcrypt
+
+GNU Lesser General Public License v2.1 or later (LGPL-2.1-or-later)
+
+#### BSD 3-Clause License (BSD-3-Clause):
+
+cipher/sha256-avx-amd64.S
+cipher/sha256-avx2-bmi2-amd64.S
+cipher/sha256-ssse3-amd64.S
+cipher/sha512-avx-amd64.S
+cipher/sha512-avx2-bmi2-amd64.S
+cipher/sha512-ssse3-amd64.S
+cipher/sha512-ssse3-i386.c
+cipher/sha512-avx512-amd64.S
+
+Copyright © 2012, Intel Corporation
+
+cipher/poly1305-amd64-avx512.S
+
+Copyright © 2021–2022, Intel Corporation
+
+random/jitterentropy-base.c
+random/jitterentropy-gcd.c
+random/jitterentropy-gcd.h
+random/jitterentropy-health.c
+random/jitterentropy-health.h
+random/jitterentropy-noise.c
+random/jitterentropy-noise.h
+random/jitterentropy-sha3.c
+random/jitterentropy-sha3.h
+random/jitterentropy-timer.c
+random/jitterentropy-timer.h
+random/jitterentropy.h
+random/rndjent.c (plus common Libgcrypt copyright holders)
+
+Copyright © 2017–2021, Stephan Mueller <smueller@chronox.de>
+
+cipher/cipher-gcm-ppc.c
+cipher/keccak-amd64-avx512.S
+
+Copyright © 2006, CRYPTOGAMS by <appro@openssl.org> All rights reserved.
+
+### libgpg-error
+
+GNU Lesser General Public License v2.1 or later (LGPL-2.1-or-later)

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.21)
 include(cmake/prelude.cmake)
 project(
         RhythmGame
-        VERSION 1.2.8
+        VERSION 1.3.0
         DESCRIPTION "A customizable BMS player for Windows and Linux. "
         HOMEPAGE_URL "https://github.com/Bobini1/RhythmGame"
         LANGUAGES C CXX
@@ -20,8 +20,6 @@ if (supported)
     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif ()
 
-option(PORTABLE_BUILD "Deploy the entire game to a portable folder, without using system dirs" ON)
-
 # <---- mimalloc (faster memory allocation) ---->
 
 find_package(mimalloc CONFIG REQUIRED)
@@ -61,6 +59,9 @@ message(STATUS "miniaudio include dirs: ${MINIAUDIO_INCLUDE_DIRS}")
 find_package(Qt6 COMPONENTS ShaderTools Quick Concurrent Multimedia Svg InterfaceFramework LinguistTools QuickControls2 REQUIRED)
 qt_standard_project_setup(I18N_TRANSLATED_LANGUAGES pl jp)
 
+# <------------ QtKeychain (storing login data) --------------->
+find_package(Qt6Keychain CONFIG REQUIRED)
+
 # <------------ zstd (compression) --------------->
 
 find_package(zstd REQUIRED)
@@ -181,6 +182,12 @@ qt_add_library(RhythmGame_lib OBJECT
         src/qml_components/PreviewFilePathFetcher.h
         src/qml_components/ScoreDb.cpp
         src/qml_components/ScoreDb.h
+        src/qml_components/ScoreSyncOperation.cpp
+        src/qml_components/ScoreSyncOperation.h
+        src/qml_components/OnlineScores.cpp
+        src/qml_components/OnlineScores.h
+        src/qml_components/OnlineRankingModel.cpp
+        src/qml_components/OnlineRankingModel.h
         src/qml_components/FileQuery.cpp
         src/qml_components/FileQuery.h
         src/qml_components/Bga.cpp
@@ -243,6 +250,12 @@ qt_add_library(RhythmGame_lib OBJECT
         src/sounds/NormalSoundBuffer.h
         src/sounds/NormalSound.cpp
         src/sounds/NormalSound.h
+        src/qml_components/OnlineProfileInfo.cpp
+        src/qml_components/OnlineProfileInfo.h
+        src/charts/Base62.cpp
+        src/charts/Base62.h
+        src/support/ConvertTachiClearType.cpp
+        src/support/ConvertTachiClearType.h
 )
 
 if (WIN32)
@@ -261,7 +274,7 @@ target_link_libraries(RhythmGame_lib PUBLIC $<IF:$<TARGET_EXISTS:mimalloc-static
 
 # <------------ SndFile (audio file reading) --------------->
 
-find_package(SndFile)
+find_package(SndFile QUIET)
 if (NOT SndFile_FOUND)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(SndFile REQUIRED IMPORTED_TARGET sndfile)
@@ -270,7 +283,7 @@ else ()
     target_link_libraries(RhythmGame_lib PUBLIC SndFile::sndfile)
 endif ()
 
-find_package(Stb)
+find_package(Stb QUIET)
 if (NOT Stb_FOUND)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(stb REQUIRED IMPORTED_TARGET stb)
@@ -279,7 +292,7 @@ if (NOT Stb_FOUND)
 else ()
     target_link_libraries(RhythmGame_lib PUBLIC ${Stb_LIBRARIES})
 endif ()
-target_link_libraries(RhythmGame_lib PUBLIC SDL2::SDL2 Qt6::Quick Qt6::QuickControls2 Qt6::OpenGL Qt6::Concurrent Qt6::Multimedia Qt6::InterfaceFramework Threads::Threads Boost::headers SQLiteCpp spdlog::spdlog foonathan::lexy magic_enum::magic_enum $<IF:$<TARGET_EXISTS:zstd::libzstd_static>,zstd::libzstd_static,zstd::libzstd> LibXml2::LibXml2)
+target_link_libraries(RhythmGame_lib PUBLIC SDL2::SDL2 Qt6::Quick Qt6::QuickControls2 Qt6::OpenGL Qt6::Concurrent Qt6::Multimedia Qt6::InterfaceFramework Qt6Keychain::Qt6Keychain Threads::Threads Boost::headers SQLiteCpp spdlog::spdlog foonathan::lexy magic_enum::magic_enum $<IF:$<TARGET_EXISTS:zstd::libzstd_static>,zstd::libzstd_static,zstd::libzstd> LibXml2::LibXml2)
 target_include_directories(RhythmGame_lib PUBLIC ${MINIAUDIO_INCLUDE_DIRS})
 
 if (WIN32)

DEV_THEME.md

@@ -17,9 +17,9 @@ Here is an example of a minimal `theme.json` file:
 
 ```json
 {
-    "scripts": {
-        "result": "result.qml"
-    }
+  "scripts": {
+    "result": "result.qml"
+  }
 }
 ```
 
@@ -33,12 +33,12 @@ you can define a `settings` field in `theme.json`.
 
 ```json
 {
-    "scripts": {
-        "result": "result.qml"
-    },
-    "settings": {
-        "result": "result.json"
-    }
+  "scripts": {
+    "result": "result.qml"
+  },
+  "settings": {
+    "result": "result.json"
+  }
 }
 ```
 
@@ -98,15 +98,15 @@ You can override the auto-generated settings page for a screen by providing a QM
 
 ```json
 {
-    "scripts": {
-        "result": "result.qml"
-    },
-    "settings": {
-        "result": "result.json"
-    },
-    "settingsScripts": {
-        "result": "resultSettings.qml"
-    }
+  "scripts": {
+    "result": "result.qml"
+  },
+  "settings": {
+    "result": "result.json"
+  },
+  "settingsScripts": {
+    "result": "resultSettings.qml"
+  }
 }
 ```
 
@@ -118,19 +118,19 @@ Translations are described in [DEV_LANG.md](DEV_LANG.md).
 
 ```json
 {
-    "scripts": {
-        "result": "result.qml"
-    },
-    "settings": {
-        "result": "result.json"
-    },
-    "settingsScripts": {
-        "result": "resultSettings.qml"
-    },
-    "translations": {
-        "en": "en.qm",
-        "pl": "pl.qm"
-    }
+  "scripts": {
+    "result": "result.qml"
+  },
+  "settings": {
+    "result": "result.json"
+  },
+  "settingsScripts": {
+    "result": "resultSettings.qml"
+  },
+  "translations": {
+    "en": "en.qm",
+    "pl": "pl.qm"
+  }
 }
 ```
 
@@ -169,8 +169,8 @@ Do not remove screens from under yourself. It's messy and unnecessary.
 `sceneStack` contains a few helper methods:
 
 ```qml
-function openChart(path, profile1, autoplay1, score1, profile2, autoplay2, score2)
-function openCourse(course, profile1, autoplay1, score1, profile2, autoplay2, score2)
+function openChart(path, profile1, autoplay1, replay1, score1, profile2, autoplay2, replay2, score2)
+function openCourse(course, profile1, autoplay1, replay1, score1, profile2, autoplay2, replay2, score2)
 function openResult(scores, profiles, chartData)
 function openCourseResult(scores, profiles, chartDatas, course)
 ```

README.md

@@ -29,6 +29,18 @@ You can use the [default theme](https://github.com/Bobini1/RhythmGame/tree/maste
 reference.
 See the [DEV_THEME.md](DEV_THEME.md) document for more information.
 
+### Internet Ranking with Bokutachi and LR2IR support
+
+Compete with players around the world! RhythmGame supports has its own native IR server at https://rhythmgame.eu,
+but you can also submit your scores to [Bokutachi](https://boku.tachi.ac/) and see the scores from
+the [Lunatic Rave 2 Internet Ranking](http://www.dream-pro.info/~lavalse/LR2IR/search.cgi).
+
+[![Internet ranking](docs/images/ranking.png)](https://rhythmgame.eu)
+
+|                      Ranking                       |                      Online Stats                       |
+|:--------------------------------------------------:|:-------------------------------------------------------:|
+| ![In-game ranking](docs/images/ranking-ingame.png) | ![In-game ranking stats](docs/images/ranking-stats.png) |
+
 ### Rules based on Lunatic Rave 2
 
 The timing windows and gauges match Lunatic Rave 2/Lr2oraja

RhythmGameQml/ContentFrame.qml

@@ -17,22 +17,31 @@ ApplicationWindow {
         property alias width: contentContainer.width
         property int visibility
     }
+    property bool settingsRestored: false
     Component.onCompleted: {
         if (settings.visibility) {
             contentContainer.visibility = settings.visibility;
         }
     }
+    onActiveChanged: {
+        if (active && !settingsRestored) {
+            settingsRestored = true;
+        }
+    }
+    onVisibilityChanged: {
+        if (settingsRestored && (contentContainer.visibility === Window.Windowed || contentContainer.visibility === Window.FullScreen)) {
+            settings.visibility = contentContainer.visibility;
+        }
+    }
     Shortcut {
         autoRepeat: false
         sequence: "F11"
 
         onActivated: {
             if (contentContainer.visibility === Window.FullScreen) {
                 contentContainer.visibility = Window.Windowed;
-                settings.visibility = Window.Windowed;
             } else {
                 contentContainer.visibility = Window.FullScreen;
-                settings.visibility = Window.FullScreen;
             }
         }
     }
@@ -44,14 +53,17 @@ ApplicationWindow {
         readonly property Component k7Component: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.k7].screens.k7.script)
         readonly property Component k7battleComponent: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.k7battle].screens.k7battle.script)
         readonly property Component k14Component: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.k14].screens.k14.script)
+        readonly property Component k5Component: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.k5].screens.k5.script)
+        readonly property Component k5battleComponent: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.k5battle].screens.k5battle.script)
+        readonly property Component k10Component: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.k10].screens.k10.script)
         readonly property Component mainComponent: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.main].screens.main.script)
         readonly property Component resultComponent: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.result].screens.result.script)
         readonly property Component settingsComponent: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.settings].screens.settings.script)
         readonly property Component selectComponent: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.select].screens.select.script)
         readonly property Component decideComponent: Qt.createComponent(Rg.themes.availableThemeFamilies[mainProfile.themeConfig.decide].screens.decide.script)
 
-        function openChart(path, profile1, autoplay1, score1, profile2, autoplay2, score2) {
-            let chart = Rg.chartLoader.loadChart(path, profile1, autoplay1, score1, profile2, autoplay2, score2);
+        function openChart(path, profile1, autoplay1, replay1, score1, profile2, autoplay2, replay2, score2) {
+            let chart = Rg.chartLoader.loadChart(path, profile1, autoplay1, replay1, score1, profile2, autoplay2, replay2, score2);
             if (!chart) {
                 console.error("Failed to load chart");
                 return;
@@ -61,8 +73,8 @@ ApplicationWindow {
             });
         }
 
-        function openCourse(course, profile1, autoplay1, score1, profile2, autoplay2, score2) {
-            let runner = Rg.chartLoader.loadCourse(course, profile1, autoplay1, score1, profile2, autoplay2, score2);
+        function openCourse(course, profile1, autoplay1, replay1, score1, profile2, autoplay2, replay2, score2) {
+            let runner = Rg.chartLoader.loadCourse(course, profile1, autoplay1, replay1, score1, profile2, autoplay2, replay2, score2);
             if (!runner) {
                 console.error("Failed to load course");
                 return;

RhythmGameQml/Rg.cpp

@@ -17,6 +17,7 @@ Rg::Rg(qml_components::ProgramSettings* programSettings,
        resource_managers::Tables* tables,
        resource_managers::Languages* languages,
        sounds::AudioEngine* audioEngine,
+       qml_components::OnlineScores* onlineScores,
        QObject* parent)
   : QObject(parent)
   , programSettings(programSettings)
@@ -32,6 +33,7 @@ Rg::Rg(qml_components::ProgramSettings* programSettings,
   , tables(tables)
   , languages(languages)
   , audioEngine(audioEngine)
+  , onlineScores(onlineScores)
 {
 }
 Rg*