updates

- implemented frontend
- namespaced Core
- imported qdevicewatcher
- fixed bug in logging (more like in misc)

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "cryptopp"]
 	path = externals/cryptopp/cryptopp
 	url = https://github.com/weidai11/cryptopp.git
+[submodule "qdevicewatcher"]
+	path = externals/qdevicewatcher/qdevicewatcher
+	url = https://github.com/wang-bin/qdevicewatcher.git

externals/CMakeLists.txt

@@ -1,2 +1,8 @@
+# Crypto++
 add_subdirectory(cryptopp)
+
+# fmt
 add_subdirectory(fmt)
+
+# QDeviceWatcher
+add_subdirectory(qdevicewatcher)

externals/qdevicewatcher/CMakeLists.txt

@@ -0,0 +1,26 @@
+set(CMAKE_AUTOMOC ON)
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+add_library(qdevicewatcher STATIC
+  qdevicewatcher/src/qdevicewatcher_p.h
+  qdevicewatcher/src/qdevicewatcher.cpp
+  qdevicewatcher/src/qdevicewatcher.h
+)
+
+target_link_libraries(qdevicewatcher PRIVATE Qt5::Core)
+target_include_directories(qdevicewatcher INTERFACE qdevicewatcher/src)
+
+if (WIN32)
+    target_sources(qdevicewatcher PRIVATE
+      qdevicewatcher/src/qdevicewatcher_win32.cpp
+    )
+elseif(APPLE)
+    target_sources(qdevicewatcher PRIVATE
+      qdevicewatcher/src/qdevicewatcher_mac.cpp
+    )
+elseif(UNIX)
+    target_sources(qdevicewatcher PRIVATE
+      qdevicewatcher/src/qdevicewatcher_linux.cpp
+    )
+endif()

src/common/logging/log.h

@@ -14,6 +14,8 @@
 #include <fmt/format.h>
 #include "common/string_util.h"
 
+#include <iostream>
+
 template <typename... Args>
 void PrintLog(std::FILE* f, const std::string& log_class, const std::string& level,
               const std::string& color, const std::string& file, int line, const std::string& func,
@@ -23,9 +25,13 @@ void PrintLog(std::FILE* f, const std::string& log_class, const std::string& lev
                        std::chrono::steady_clock::now() - time_origin)
                        .count();
     const auto real_class = Common::ReplaceAll(log_class, "_", ".");
+    try {
         fmt::print(f, "\x1b{}[{:12.6f}] {} <{}> {}:{}:{}: " + format + "\x1b[0m\n", color,
-               us / 1000000.0, log_class, level, file, line, func, args...);
+                   us / 1000000.0, real_class, level, file, line, func, args...);
         fflush(stderr);
+    } catch (...) {
+        std::cerr << "FMT failed with exception" << std::endl;
+    }
 }
 
 #ifdef _DEBUG

src/common/misc.cpp

@@ -3,11 +3,11 @@
 // Refer to the license.txt file included.
 
 #include <cstddef>
+#include <cstring>
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <cerrno>
-#include <cstring>
 #endif
 
 #include "common/common_funcs.h"
@@ -27,5 +27,5 @@ std::string GetLastErrorMsg() {
     strerror_r(errno, err_str, buff_size);
 #endif
 
-    return std::string(err_str, buff_size);
+    return std::string(err_str, strnlen(err_str, buff_size));
 }

src/core/data_container.cpp

@@ -6,6 +6,8 @@
 #include "common/assert.h"
 #include "core/data_container.h"
 
+namespace Core {
+
 constexpr u32 MakeMagic(char a, char b, char c, char d) {
     return a | b << 8 | c << 16 | d << 24;
 }
@@ -150,3 +152,5 @@ std::vector<std::vector<u8>> DataContainer::GetIVFCLevel4Data() const {
         return {GetPartitionData(0), GetPartitionData(1)};
     }
 }
+
+} // namespace Core

src/core/data_container.h

@@ -10,6 +10,8 @@
 #include "common/common_types.h"
 #include "common/swap.h"
 
+namespace Core {
+
 #pragma pack(push, 1)
 struct DataDescriptor {
     u64_le offset;
@@ -127,3 +129,5 @@ private:
     std::vector<DataDescriptor> partition_descriptors;
     std::vector<DataDescriptor> partitions;
 };
+
+} // namespace Core

src/core/decryptor.cpp

@@ -15,6 +15,8 @@
 #include "core/decryptor.h"
 #include "core/key/key.h"
 
+namespace Core {
+
 SDMCDecryptor::SDMCDecryptor(const std::string& root_folder_) : root_folder(root_folder_) {
     ASSERT_MSG(Key::IsNormalKeyAvailable(Key::SDKey),
                "SD Key must be available in order to decrypt");
@@ -89,3 +91,5 @@ std::vector<u8> SDMCDecryptor::DecryptFile(const std::string& source) const {
     aes.ProcessData(data.data(), encrypted_data.data(), encrypted_data.size());
     return data;
 }
+
+} // namespace Core

src/core/decryptor.h

@@ -8,6 +8,8 @@
 #include <vector>
 #include "common/common_types.h"
 
+namespace Core {
+
 class SDMCDecryptor {
 public:
     /**
@@ -35,3 +37,5 @@ public:
 private:
     std::string root_folder;
 };
+
+} // namespace Core

src/core/importer.cpp

@@ -11,6 +11,8 @@
 #include "core/inner_fat.h"
 #include "core/key/key.h"
 
+namespace Core {
+
 SDMCImporter::SDMCImporter(const Config& config_) : config(config_) {
     is_good = Init();
 }
@@ -305,7 +307,7 @@ std::vector<Config> LoadPresetConfig(std::string mount_point) {
         nullptr, mount_point + "Nintendo 3DS/",
         [&id_regex, &ProcessDirectory](u64* /*num_entries_out*/, const std::string& directory,
                                        const std::string& virtual_name) {
-            if (!FileUtil::IsDirectory(directory + virtual_name)) {
+            if (!FileUtil::IsDirectory(directory + virtual_name + "/")) {
                 return true;
             }
 
@@ -313,8 +315,10 @@ std::vector<Config> LoadPresetConfig(std::string mount_point) {
                 return true;
             }
 
-            return ProcessDirectory(directory + virtual_name);
+            return ProcessDirectory(directory + virtual_name + "/");
         });
 
     return out;
 }
+
+} // namespace Core

src/core/importer.h

@@ -9,6 +9,8 @@
 #include <vector>
 #include "common/common_types.h"
 
+namespace Core {
+
 class SDMCDecryptor;
 
 /**
@@ -99,3 +101,5 @@ private:
  * @return a list of preset config available. can be empty
  */
 std::vector<Config> LoadPresetConfig(std::string mount_point);
+
+} // namespace Core

src/core/inner_fat.cpp

@@ -9,6 +9,8 @@
 #include "core/decryptor.h"
 #include "core/inner_fat.h"
 
+namespace Core {
+
 constexpr u32 MakeMagic(char a, char b, char c, char d) {
     return a | b << 8 | c << 16 | d << 24;
 }
@@ -334,3 +336,5 @@ ArchiveFormatInfo SDExtdata::GetFormatInfo() const {
 
     return format_info;
 }
+
+} // namespace Core

src/core/inner_fat.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+namespace Core {
+
 #include <array>
 #include <type_traits>
 #include <vector>
@@ -194,3 +196,5 @@ private:
     std::string data_path;
     const SDMCDecryptor& decryptor;
 };
+
+} // namespace Core

src/core/key/arithmetic128.cpp

@@ -6,7 +6,7 @@
 #include <functional>
 #include "core/key/arithmetic128.h"
 
-namespace Key {
+namespace Core::Key {
 
 AESKey Lrot128(const AESKey& in, u32 rot) {
     AESKey out;
@@ -56,4 +56,4 @@ AESKey Xor128(const AESKey& a, const AESKey& b) {
     return out;
 }
 
-} // namespace Key
+} // namespace Core::Key

src/core/key/arithmetic128.h

@@ -7,11 +7,11 @@
 #include "common/common_types.h"
 #include "core/key/key.h"
 
-namespace Key {
+namespace Core::Key {
 
 AESKey Lrot128(const AESKey& in, u32 rot);
 AESKey Add128(const AESKey& a, const AESKey& b);
 AESKey Add128(const AESKey& a, u64 b);
 AESKey Xor128(const AESKey& a, const AESKey& b);
 
-} // namespace Key
+} // namespace Core::Key

src/core/key/key.cpp

@@ -11,7 +11,7 @@
 #include "core/key/arithmetic128.h"
 #include "core/key/key.h"
 
-namespace Key {
+namespace Core::Key {
 
 namespace {
 
@@ -216,4 +216,4 @@ void SelectCommonKeyIndex(u8 index) {
     key_slots[KeySlotID::TicketCommonKey].SetKeyY(common_key_y_slots.at(index));
 }
 
-} // namespace Key
+} // namespace Core::Key

src/core/key/key.h

@@ -9,7 +9,7 @@
 #include <string>
 #include "common/common_types.h"
 
-namespace Key {
+namespace Core::Key {
 
 enum KeySlotID : std::size_t {
 
@@ -69,4 +69,4 @@ AESKey GetNormalKey(std::size_t slot_id);
 
 void SelectCommonKeyIndex(u8 index);
 
-} // namespace Key
+} // namespace Core::Key

src/frontend/CMakeLists.txt

@@ -14,6 +14,7 @@ add_executable(threeSD
 
 target_link_libraries(threeSD PRIVATE common core)
 target_link_libraries(threeSD PRIVATE Qt5::Widgets)
+target_link_libraries(threeSD PRIVATE qdevicewatcher)
 target_link_libraries(threeSD PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
 if (APPLE)

src/frontend/main.cpp

@@ -2,23 +2,128 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <string>
 #include <QApplication>
+#include <QStorageInfo>
+#include <qdevicewatcher.h>
+#include "common/file_util.h"
 #include "frontend/main.h"
 #include "ui_main.h"
 
 #ifdef __APPLE__
-#include <string>
 #include <unistd.h>
 #include "common/common_paths.h"
-#include "common/file_util.h"
 #endif
 
 MainDialog::MainDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique<Ui::MainDialog>()) {
     ui->setupUi(this);
+
+    setFixedWidth(width());
+    ui->buttonBox->button(QDialogButtonBox::StandardButton::Reset)->setText(tr("Refresh"));
+
+    LoadPresetConfig();
+
+    connect(ui->advancedButton, &QPushButton::clicked, [this] {
+        if (ui->customGroupBox->isVisible()) {
+            HideAdvanced();
+        } else {
+            ShowAdvanced();
+        }
+    });
+
+    connect(ui->buttonBox, &QDialogButtonBox::clicked, [this](QAbstractButton* button) {
+        if (button == ui->buttonBox->button(QDialogButtonBox::StandardButton::Reset)) {
+            LoadPresetConfig();
+        }
+    });
+
+    // Set up device watcher
+    auto* device_watcher = new QDeviceWatcher(this);
+    device_watcher->start();
+    connect(device_watcher, &QDeviceWatcher::deviceAdded, this, &MainDialog::LoadPresetConfig);
+    connect(device_watcher, &QDeviceWatcher::deviceChanged, this, &MainDialog::LoadPresetConfig);
+    connect(device_watcher, &QDeviceWatcher::deviceRemoved, this, &MainDialog::LoadPresetConfig);
 }
 
 MainDialog::~MainDialog() = default;
 
+void MainDialog::LoadPresetConfig() {
+    ui->configSelect->clear();
+    preset_config_list.clear();
+
+    for (const auto& storage : QStorageInfo::mountedVolumes()) {
+        if (!storage.isValid() || !storage.isReady()) {
+            continue;
+        }
+
+        auto list = Core::LoadPresetConfig(storage.rootPath().toStdString());
+        for (std::size_t i = 0; i < list.size(); ++i) {
+            preset_config_list.emplace_back(list[i]);
+            ui->configSelect->addItem(QString::fromStdString(list[i].sdmc_path));
+        }
+    }
+
+    if (preset_config_list.empty()) {
+        // Clear the text
+        ui->sdmcPath->setText(QString{});
+        ui->userPath->setText(
+            QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::UserDir)));
+        ui->movableSedPath->setText(QString{});
+        ui->bootrom9Path->setText(QString{});
+        ui->safeModeFirmPath->setText(QString{});
+        ui->seeddbPath->setText(QString{});
+        ui->secretSectorPath->setText(QString{});
+
+        ui->advancedButton->setVisible(false);
+        ShowAdvanced();
+        ui->configSelect->addItem(tr("None"));
+        ui->configSelect->setCurrentText(tr("None"));
+    } else {
+        ui->advancedButton->setVisible(true);
+        if (ui->customGroupBox->isVisible()) {
+            HideAdvanced();
+        }
+    }
+}
+
+void MainDialog::ShowAdvanced() {
+    ui->configSelect->setEnabled(false);
+    ui->advancedButton->setText(tr("Hide Custom Config"));
+    ui->customGroupBox->setVisible(true);
+
+    setMaximumHeight(1000000);
+    adjustSize();
+
+    const int index = ui->configSelect->currentIndex();
+    ui->configSelect->addItem(tr("Custom"));
+    ui->configSelect->setCurrentText(tr("Custom"));
+
+    if (index == -1) {
+        return;
+    }
+
+    // Load preset data
+    const auto config = preset_config_list[static_cast<u32>(index)];
+    ui->sdmcPath->setText(QString::fromStdString(config.sdmc_path));
+    ui->userPath->setText(QString::fromStdString(config.user_path));
+    ui->movableSedPath->setText(QString::fromStdString(config.movable_sed_path));
+    ui->bootrom9Path->setText(QString::fromStdString(config.bootrom_path));
+    ui->safeModeFirmPath->setText(QString::fromStdString(config.safe_mode_firm_path));
+    ui->seeddbPath->setText(QString::fromStdString(config.seed_db_path));
+    ui->secretSectorPath->setText(QString::fromStdString(config.secret_sector_path));
+}
+
+void MainDialog::HideAdvanced() {
+    ui->configSelect->setEnabled(true);
+    ui->advancedButton->setText(tr("Customize..."));
+    ui->customGroupBox->setVisible(false);
+
+    LoadPresetConfig();
+
+    setMaximumHeight(130);
+    adjustSize();
+}
+
 int main(int argc, char* argv[]) {
     // Init settings params
     QCoreApplication::setOrganizationName("zhaowenlan1779");

src/frontend/main.h

@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <QDialog>
+#include "core/importer.h"
 
 namespace Ui {
 class MainDialog;
@@ -19,5 +20,10 @@ public:
     ~MainDialog() override;
 
 private:
+    void LoadPresetConfig();
+    void ShowAdvanced();
+    void HideAdvanced();
+
+    std::vector<Core::Config> preset_config_list;
     std::unique_ptr<Ui::MainDialog> ui;
 };

src/frontend/main.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>450</height>
+    <height>130</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -40,7 +40,7 @@
      <item>
       <widget class="QPushButton" name="advancedButton">
        <property name="text">
-        <string>Advanced...</string>
+        <string>Customize...</string>
        </property>
       </widget>
      </item>
@@ -54,162 +54,161 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox">
+    <widget class="QGroupBox" name="customGroupBox">
      <property name="title">
       <string>Custom</string>
      </property>
      <property name="visible">
       <bool>false</bool>
      </property>
-     <layout class="QVBoxLayout">
-      <item>
-       <layout class="QHBoxLayout">
-        <item>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
         <widget class="QLabel">
          <property name="text">
-           <string>SDMC:</string>
+          <string>SDMC (Required)</string>
+         </property>
+         <property name="toolTip">
+          <string>Path to the Nintendo 3DS/&lt;ID0>/&lt;ID1> folder.</string>
          </property>
         </widget>
       </item>
-        <item>
-         <widget class="QLineEdit" name="sdmcPath"/>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="sdmcPath">
+        <property name="toolTip">
+          <string>Path to the Nintendo 3DS/&lt;ID0>/&lt;ID1> folder.</string>
+         </property>
+       </widget>
       </item>
-        <item>
-         <widget class="QPushButton" name="sdmcPathExplore">
+      <item row="0" column="2">
+       <widget class="QToolButton" name="sdmcPathExplore">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout">
-        <item>
+      <item row="1" column="0">
        <widget class="QLabel">
         <property name="text">
-           <string>User Directory:</string>
+         <string>Citra User Directory (Required)</string>
+        </property>
+        <property name="toolTip">
+         <string>Path to the User Directory of Citra to put imported content into.</string>
         </property>
        </widget>
       </item>
-        <item>
-         <widget class="QLineEdit" name="userPath"/>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="userPath">
+        <property name="toolTip">
+         <string>Path to the User Directory of Citra to put imported content into.</string>
+        </property>
+       </widget>
       </item>
-        <item>
-         <widget class="QPushButton" name="userPathExplore">
+      <item row="1" column="2">
+       <widget class="QToolButton" name="userPathExplore">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout">
-        <item>
+      <item row="2" column="0">
        <widget class="QLabel">
         <property name="text">
-           <string>movable.sed:</string>
+         <string>movable.sed (Required)</string>
         </property>
        </widget>
       </item>
-        <item>
+      <item row="2" column="1">
        <widget class="QLineEdit" name="movableSedPath"/>
       </item>
-        <item>
-         <widget class="QPushButton" name="movableSedExplore">
+      <item row="2" column="2">
+       <widget class="QToolButton" name="movableSedExplore">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout">
-        <item>
+      <item row="3" column="0">
        <widget class="QLabel">
         <property name="text">
-           <string>boot9.bin:</string>
+         <string>boot9.bin (Required)</string>
         </property>
        </widget>
       </item>
-        <item>
+      <item row="3" column="1">
        <widget class="QLineEdit" name="bootrom9Path"/>
       </item>
-        <item>
-         <widget class="QPushButton" name="bootrom9Explore">
+      <item row="3" column="2">
+       <widget class="QToolButton" name="bootrom9Explore">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout">
-        <item>
+      <item row="4" column="0">
        <widget class="QLabel">
         <property name="text">
-           <string>Safe mode firm Path:</string>
+         <string>Safe mode firm</string>
+        </property>
+        <property name="toolTip">
+         <string>Path to the safe mode firm.&lt;br>This is a folder, and needs to contain another folder named 'new' or 'old' corresponding to the system's type.&lt;br>The 'new' or 'old' folder should hold files from the 'content' folder of the firm title in NAND. (i.e. tmd and app)</string>
         </property>
        </widget>
       </item>
-        <item>
-         <widget class="QLineEdit" name="safeModeFirmPath"/>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="safeModeFirmPath">
+        <property name="toolTip">
+         <string>Path to the safe mode firm.&lt;br>This is a folder, and needs to contain another folder named 'new' or 'old' corresponding to the system's type.&lt;br>The 'new' or 'old' folder should hold files from the 'content' folder of the firm title in NAND. (i.e. tmd and app)</string>
+        </property>
+       </widget>
       </item>
-        <item>
-         <widget class="QPushButton" name="safeModeFirmExplore">
+      <item row="4" column="2">
+       <widget class="QToolButton" name="safeModeFirmExplore">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout">
-        <item>
+      <item row="5" column="0">
        <widget class="QLabel">
         <property name="text">
-           <string>seeddb.bin:</string>
+         <string>seeddb.bin</string>
         </property>
        </widget>
       </item>
-        <item>
+      <item row="5" column="1">
        <widget class="QLineEdit" name="seeddbPath"/>
       </item>
-        <item>
-         <widget class="QPushButton" name="seeddbExplore">
+      <item row="5" column="2">
+       <widget class="QToolButton" name="seeddbExplore">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout">
-        <item>
+      <item row="6" column="0">
        <widget class="QLabel">
         <property name="text">
-           <string>sector0x96.bin:</string>
+         <string>sector0x96.bin</string>
         </property>
        </widget>
       </item>
-        <item>
+      <item row="6" column="1">
        <widget class="QLineEdit" name="secretSectorPath"/>
       </item>
-        <item>
-         <widget class="QPushButton" name="secretSectorExplore">
+      <item row="6" column="2">
+       <widget class="QToolButton" name="secretSectorExplore">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
      </layout>
-      </item>
-     </layout>
     </widget>
    </item>
    <item>