diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9852a09..8124e2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,8 @@ find_package(PkgConfig REQUIRED)
find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia MultimediaWidgets Network QuickControls2 SerialPort Positioning Location QuickWidgets)
# DBUS
if (UNIX AND NOT APPLE)
- find_package(Qt6 REQUIRED COMPONENTS DBus)
+ find_package(Qt6 REQUIRED COMPONENTS DBus)
+ pkg_check_modules(DBUS REQUIRED IMPORTED_TARGET dbus-1)
endif()
find_package(SQLite3 REQUIRED)
# Add QTermWidget
@@ -135,7 +136,7 @@ cxx_qt_import_crate(
MANIFEST_PATH src/rust/Cargo.toml
CRATES idescriptor_rust_codebase
# LOCKED
- QT_MODULES Qt::Core Qt::Gui Qt::Qml Qt::QuickControls2
+ QT_MODULES Qt::Core Qt::Gui Qt::Qml Qt::QuickControls2 Qt::Widgets
)
#--------------------------------------------------------------------------------
@@ -186,10 +187,11 @@ endif()
file(GLOB PROJECT_SOURCES
# src/*.h
# src/*.cpp
-# src/core/helpers/*.cpp
-# src/core/services/*.cpp
+src/core/helpers/*.cpp
+src/core/services/*.cpp
# src/base/*.cpp
# src/base/*.h
+src/networkdeviceprovider.h
src/main.cpp
src/constants.h
# src/thumbnailmodel.h
@@ -306,7 +308,7 @@ target_link_libraries(iDescriptor PRIVATE
)
if (UNIX AND NOT APPLE)
- target_link_libraries(iDescriptor PRIVATE Qt6::DBus)
+ target_link_libraries(iDescriptor PRIVATE Qt6::DBus PkgConfig::DBUS)
endif()
if(ENABLE_RECOVERY_DEVICE_SUPPORT)
diff --git a/resources.ui.qrc b/resources.ui.qrc
index 6a015df..834b0ef 100644
--- a/resources.ui.qrc
+++ b/resources.ui.qrc
@@ -13,5 +13,8 @@
src/qml/DeviceGallery.qml
src/qml/AlbumContents.qml
src/qml/PreviewWindow.qml
+ src/qml/SidebarTabButton.qml
+ src/qml/AppsTab.qml
+ src/qml/LoginDialog.qml
\ No newline at end of file
diff --git a/src/iDescriptor.h b/src/iDescriptor.h
index 391f323..ba6c427 100644
--- a/src/iDescriptor.h
+++ b/src/iDescriptor.h
@@ -400,121 +400,4 @@ inline QJsonObject getVersionedConfig(const QJsonObject &rootObj)
}
}
return QJsonObject();
-}
-
-struct XmlPlistDict {
- pugi::xml_node current_node;
-
- XmlPlistDict() = default;
- explicit XmlPlistDict(pugi::xml_node n) : current_node(n) {}
-
- bool valid() const { return current_node; }
-
- bool isDict() const
- {
- return current_node && std::strcmp(current_node.name(), "dict") == 0;
- }
-
- bool isArray() const
- {
- return current_node && std::strcmp(current_node.name(), "array") == 0;
- }
-
-private:
- // helper: for dict lookups
- pugi::xml_node findValueNode(const char *key) const
- {
- if (!isDict())
- return {};
-
- for (pugi::xml_node child = current_node.first_child(); child;
- child = child.next_sibling()) {
- if (std::strcmp(child.name(), "key") == 0 &&
- std::strcmp(child.text().as_string(), key) == 0) {
- return child.next_sibling(); // the value node
- }
- }
- return {};
- }
-
-public:
- // dict key access
- XmlPlistDict operator[](const char *key) const
- {
- return XmlPlistDict(findValueNode(key));
- }
-
- XmlPlistDict operator[](const std::string &key) const
- {
- return (*this)[key.c_str()];
- }
-
- XmlPlistDict operator[](const QString &key) const
- {
- return (*this)[key.toUtf8().constData()];
- }
-
- // array index access
- XmlPlistDict operator[](int index) const
- {
- if (!isArray() || index < 0)
- return XmlPlistDict();
-
- int i = 0;
- for (pugi::xml_node child = current_node.first_child(); child;
- child = child.next_sibling()) {
- if (!child.name() || !*child.name())
- continue; // skip text/whitespace
- if (i == index)
- return XmlPlistDict(child);
- ++i;
- }
- return XmlPlistDict();
- }
-
- // getters on current node (like PlistNavigator)
- bool getBool(bool def = false) const
- {
- if (!current_node)
- return def;
-
- const char *name = current_node.name();
- if (!std::strcmp(name, "true"))
- return true;
- if (!std::strcmp(name, "false"))
- return false;
-
- std::string s = current_node.text().as_string();
- if (s == "true" || s == "1")
- return true;
- if (s == "false" || s == "0")
- return false;
- return def;
- }
-
- uint64_t getUInt(uint64_t def = 0) const
- {
- if (!current_node)
- return def;
- std::string s = current_node.text().as_string();
- if (s.empty())
- return def;
- try {
- return std::stoull(s);
- } catch (...) {
- return def;
- }
- }
-
- std::string getString(const std::string &def = std::string()) const
- {
- if (!current_node)
- return def;
- return current_node.text().as_string();
- }
-
- pugi::xml_node getNode() const { return current_node; }
-};
-
-void parseOldDeviceBattery(XmlPlistDict &ioreg, DeviceInfo &d);
-void parseDeviceBattery(XmlPlistDict &ioreg, DeviceInfo &d);
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index c5cd090..9ad8567 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,6 +31,7 @@
#ifdef WIN32
#include "platform/windows/win_common.h"
#endif
+#include "networkdeviceprovider.h"
// #include "thumbnailmodel.h"
#include "thumbnailprovider.h"
#include
@@ -138,6 +139,8 @@ int main(int argc, char *argv[])
engine.addImageProvider("thumb", ThumbnailProvider::sharedInstance());
engine.rootContext()->setContextProperty(
"ThumbnailProvider", ThumbnailProvider::sharedInstance());
+ engine.rootContext()->setContextProperty(
+ "NetworkDeviceProvider", NetworkDeviceProvider::sharedInstance());
engine.load(url);
return a.exec();
diff --git a/src/qml/AppsTab.qml b/src/qml/AppsTab.qml
new file mode 100644
index 0000000..bf03068
--- /dev/null
+++ b/src/qml/AppsTab.qml
@@ -0,0 +1,297 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import com.kdab.cxx_qt.demo 1.0
+
+Item {
+ id: root
+ anchors.fill: parent
+
+ readonly property Apps apps: Apps {}
+ readonly property string sponsorsUrl: "https://raw.githubusercontent.com/iDescriptor/iDescriptor/refs/heads/main/sponsors.json"
+
+ property bool loading: true
+ property string error: ""
+ property string email: ""
+ property bool isLoggedIn: email.length > 0
+
+ ListModel { id: appModel }
+
+ function clearApps() { appModel.clear(); }
+
+ function addApp(obj) { appModel.append(obj); }
+
+ function pickLastVersionKey(obj) {
+ var keys = Object.keys(obj || {});
+ if (!keys.length) return "";
+ keys.sort();
+ // FIXME: use semantic version matching instead of last key.
+ return keys[keys.length - 1];
+ }
+
+ function addSponsors(tierObj, label, color) {
+ if (!tierObj || !tierObj.members) return;
+ for (var i = 0; i < tierObj.members.length; ++i) {
+ var m = tierObj.members[i];
+ addApp({
+ name: m.name || "",
+ bundleId: m.bundleId || "",
+ description: m.description || "",
+ logoUrl: m.logo || "",
+ websiteUrl: m.url || "",
+ useBundleIdForIcon: m.useBundleIdForIcon !== false,
+ sponsorLabel: label,
+ sponsorColor: color
+ });
+ }
+ }
+
+ function addDefaultApps() {
+ addApp({ name: "Instagram", bundleId: "com.burbn.instagram", description: "Photo & Video sharing social network", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ addApp({ name: "Spotify", bundleId: "com.spotify.client", description: "Music streaming and podcast platform", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ addApp({ name: "YouTube", bundleId: "com.google.ios.youtube", description: "Video sharing and streaming platform", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ addApp({ name: "X", bundleId: "com.atebits.Tweetie2", description: "Social media and microblogging", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ addApp({ name: "TikTok", bundleId: "com.zhiliaoapp.musically", description: "Short-form video hosting service", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ addApp({ name: "Twitch", bundleId: "tv.twitch", description: "Live streaming platform", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ addApp({ name: "Telegram", bundleId: "ph.telegra.Telegraph", description: "Cloud-based instant messaging", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ addApp({ name: "Reddit", bundleId: "com.reddit.Reddit", description: "Social news aggregation platform", logoUrl: "", websiteUrl: "", useBundleIdForIcon: true, sponsorLabel: "", sponsorColor: "" });
+ }
+
+ function fetchSponsors() {
+ loading = true;
+ error = "";
+ clearApps();
+
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", sponsorsUrl);
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState !== XMLHttpRequest.DONE) return;
+
+ if (xhr.status === 200) {
+ try {
+ var rootObj = JSON.parse(xhr.responseText);
+ var key = pickLastVersionKey(rootObj);
+ var versioned = key ? rootObj[key] : null;
+ var sponsors = versioned && versioned.sponsors ? versioned.sponsors : null;
+
+ if (sponsors) {
+ addSponsors(sponsors.platinum, "Platinum", "#E5E4E2");
+ addSponsors(sponsors.gold, "Gold", "#D4AF37");
+ addSponsors(sponsors.silver, "Silver", "#C0C0C0");
+ addSponsors(sponsors.bronze, "Bronze", "#CD7F32");
+ }
+ } catch (e) {
+ error = "Failed to parse sponsors JSON.";
+ }
+ } else {
+ error = "Failed to fetch sponsors.";
+ }
+
+ addDefaultApps();
+ loading = false;
+ };
+ xhr.send();
+ }
+
+ function fetchAppIconFromApple(bundleId, cb) {
+ if (!bundleId) { cb(""); return; }
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", "https://itunes.apple.com/lookup?bundleId=" + encodeURIComponent(bundleId));
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState !== XMLHttpRequest.DONE) return;
+ if (xhr.status !== 200) { cb(""); return; }
+ try {
+ var obj = JSON.parse(xhr.responseText);
+ var results = obj && obj.results ? obj.results : [];
+ var iconUrl = results.length ? (results[0].artworkUrl100 || "") : "";
+ cb(iconUrl);
+ } catch (e) {
+ cb("");
+ }
+ };
+ xhr.send();
+ }
+
+ Component.onCompleted: {
+ // FIXME: show keychain/cred dialog if required.
+ apps.init();
+ }
+
+ Connections {
+ target: apps
+ function onStateChanged() {
+ var s = apps.state;
+ if (!s) return;
+ if (s.error) error = s.error;
+ email = s.email || "";
+ if (s.init) fetchSponsors();
+ }
+ }
+
+ ColumnLayout {
+ anchors.fill: parent
+ spacing: 12
+
+ RowLayout {
+ Layout.fillWidth: true
+ Layout.margins: 16
+ spacing: 12
+
+ TextField {
+ Layout.preferredWidth: 240
+ enabled: false
+ placeholderText: isLoggedIn ? "Search for apps..." : "Sign in to search"
+ }
+
+ Item { Layout.fillWidth: true }
+
+ Label {
+ text: isLoggedIn ? ("Signed in as " + email) : "Not signed in"
+ color: "#666"
+ }
+
+ Button {
+ text: isLoggedIn ? "Sign Out" : "Sign In"
+ // enabled:
+ onClicked : {
+ const comp = Qt.createComponent("qrc:/src/qml/LoginDialog.qml")
+
+ // if (comp.status === Component.ready) {
+ const win = comp.createObject(root,{
+ apps: root.apps
+ })
+ win.open()
+ // } else {
+ // console.error("Component failed to load:", comp.errorString())
+ // }
+ }
+ }
+ }
+
+ Rectangle {
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ color: "transparent"
+
+ ScrollView {
+ anchors.fill: parent
+ clip: true
+
+ GridView {
+ id: grid
+ width: parent.width
+ height: parent.height
+ cellWidth: Math.max(320, parent.width / 3)
+ cellHeight: 140
+ model: appModel
+ interactive: true
+
+ delegate: Rectangle {
+ width: grid.cellWidth - 20
+ height: grid.cellHeight - 20
+ radius: 8
+ border.color: "#ddd"
+ color: "transparent"
+
+ property string iconSource: ""
+
+ Component.onCompleted: {
+ if (model.logoUrl && !model.useBundleIdForIcon) {
+ iconSource = model.logoUrl;
+ } else if (model.bundleId) {
+ fetchAppIconFromApple(model.bundleId, function(url) { iconSource = url; });
+ }
+ }
+
+ RowLayout {
+ anchors.fill: parent
+ anchors.margins: 12
+ spacing: 10
+
+ Image {
+ width: 48
+ height: 48
+ source: iconSource
+ fillMode: Image.PreserveAspectFit
+ }
+
+ ColumnLayout {
+ Layout.fillWidth: true
+ spacing: 6
+
+ RowLayout {
+ Layout.fillWidth: true
+ spacing: 8
+
+ Label {
+ text: model.name
+ font.pixelSize: 16
+ wrapMode: Text.WordWrap
+ }
+
+ Rectangle {
+ visible: model.sponsorLabel && model.sponsorLabel.length > 0
+ color: model.sponsorColor
+ radius: 4
+ height: 16
+
+ Label {
+ anchors.centerIn: parent
+ text: model.sponsorLabel
+ font.pixelSize: 10
+ color: "#333"
+ padding: 4
+ }
+ }
+
+ Item { Layout.fillWidth: true }
+ }
+
+ Label {
+ text: model.description
+ color: "#666"
+ font.pixelSize: 12
+ wrapMode: Text.WordWrap
+ }
+ }
+
+ ColumnLayout {
+ spacing: 6
+
+ Label {
+ text: "Install"
+ color: "#007AFF"
+ font.pixelSize: 12
+ font.bold: true
+ }
+
+ Label {
+ text: (model.websiteUrl && model.websiteUrl.length) ? "Website" : "Download IPA"
+ font.pixelSize: 12
+ font.bold: true
+ }
+ }
+ }
+
+ // FIXME: wire click handling and install flow later.
+ }
+ }
+ }
+
+ BusyIndicator {
+ anchors.centerIn: parent
+ running: loading
+ visible: loading
+ }
+
+ Label {
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 12
+ text: error
+ color: "#c00"
+ visible: error.length > 0 && !loading
+ }
+ }
+ }
+}
diff --git a/src/qml/Device.qml b/src/qml/Device.qml
index 8682fa1..b002f3a 100644
--- a/src/qml/Device.qml
+++ b/src/qml/Device.qml
@@ -6,17 +6,19 @@ Item {
id: root
property var info: ({})
property var udid: ""
+ required property int currentSection
+
+
+ DeviceInfo {
+ anchors.fill: parent
+ visible : currentSection == 0
+ info: root.info
+ }
+
DeviceGallery {
- visible : true
+ visible : currentSection == 1
anchors.fill: parent
udid: root.udid
// info: root.info
}
-
- DeviceInfo {
- anchors.fill: parent
- visible : false
- info: root.info
- }
-
}
\ No newline at end of file
diff --git a/src/qml/DeviceGallery.qml b/src/qml/DeviceGallery.qml
index b910d6b..0b64a0f 100644
--- a/src/qml/DeviceGallery.qml
+++ b/src/qml/DeviceGallery.qml
@@ -7,6 +7,7 @@ import com.kdab.cxx_qt.demo 1.0
Item {
id: root
+
readonly property Query query : Query {}
property bool loading: true
required property var udid
@@ -56,6 +57,7 @@ Item {
}
function onAlbumsChanged() {
+ console.log(JSON.stringify(query.albums))
albumModel.clear()
const keys = Object.keys(query.albums)
@@ -81,8 +83,6 @@ Item {
target : ThumbnailProvider
function onThumbnailReady(path, data, rowHint) {
- console.log(path, rowHint, "!!!!!!!!! thumb ready")
-
const item = albumModel.get(rowHint)
if (item && item.filePath == path) {
albumModel.setProperty(rowHint, "thumbVersion", item.thumbVersion + 1)
@@ -111,12 +111,12 @@ Item {
GridView {
id: gallery
- // anchors.fill: parent // Remove this line
Layout.fillWidth: true
Layout.fillHeight: true
visible: albumId ? false : query.albums
- interactive: false
-
+ interactive: true
+ // FIXME: only available in Qt 6.9
+ acceptedButtons : Qt.NoButton
cellWidth: 250
cellHeight: 250
model: albumModel
@@ -226,7 +226,7 @@ Item {
query : root.query
udid : root.udid
albumId: root.albumId
- Layout.fillWidth: true // Add this line
+ Layout.fillWidth: true
Layout.fillHeight: true
}
}
diff --git a/src/qml/DeviceInfo.qml b/src/qml/DeviceInfo.qml
index 793e228..58d5d9d 100644
--- a/src/qml/DeviceInfo.qml
+++ b/src/qml/DeviceInfo.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
Item {
- property var info: ({})
+ required property var info
// property string udid: ""
function v(key, fallback) {
diff --git a/src/qml/DeviceTab.qml b/src/qml/DeviceTab.qml
index cd9eb2d..81bf6e5 100644
--- a/src/qml/DeviceTab.qml
+++ b/src/qml/DeviceTab.qml
@@ -6,6 +6,9 @@ import com.kdab.cxx_qt.demo 1.0
Item {
id: root
property ListModel devices: ListModel {}
+ property string currentDeviceUdid : ""
+ // default info section
+ property int currentSection : 0
property bool showWelcomePage : true
readonly property Core core: Core {}
@@ -20,18 +23,65 @@ Item {
function onDevice_event(eventType, udid, info) {
console.log("Device event:", eventType, udid, JSON.stringify(info))
if (eventType === 1) {
- root.showWelcomePage = false;
devices.append({ udid: udid, info: info })
+ root.showWelcomePage = false
+ root.currentDeviceUdid = udid
}
}
}
- Repeater {
- model: devices
- delegate: Device {
- udid: model.udid
- anchors.fill: parent
- info: model.info
+ // Connections {
+ // target : NetworkDeviceProvider
+
+ RowLayout {
+ anchors.fill: parent
+ spacing: 10
+ // Layout.fillWidth : true
+ // Layout.fillHeight : true
+
+ ColumnLayout {
+ Layout.fillWidth : true
+ Layout.fillHeight : true
+ Layout.preferredWidth: 220
+ Repeater {
+ model: devices
+ delegate: Item {
+ SidebarTabButton {
+ Layout.fillWidth: true
+ Layout.preferredWidth: 220
+ Layout.preferredHeight: 40
+ // udid: model.udid
+
+ // anchors.fill: parent
+ // info: model.info
+ onSectionChanged: {
+ console.log("sectionIndex", sectionIndex)
+ // if (root.currentDeviceUdid !== udid)
+ // root.currentDeviceUdid = udid
+ if (root.currentSection !== sectionIndex)
+ root.currentSection = sectionIndex
+ }
+ }
+ }
+ }
+
+ }
+
+
+
+ Repeater {
+ model: devices
+ delegate:Item {
+ Layout.fillWidth : true
+ Layout.fillHeight : true
+ visible : model.udid === root.currentDeviceUdid
+ Device {
+ udid: model.udid
+ anchors.fill: parent
+ info: model.info
+ currentSection: root.currentSection
+ }
+ }
}
}
diff --git a/src/qml/LoginDialog.qml b/src/qml/LoginDialog.qml
new file mode 100644
index 0000000..05c5b4a
--- /dev/null
+++ b/src/qml/LoginDialog.qml
@@ -0,0 +1,94 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import com.kdab.cxx_qt.demo 1.0
+
+Dialog {
+ id: dialog
+ readonly property Apps apps: Apps {}
+ title: "Login to App Store - iDescriptor"
+ modal: true
+ standardButtons: Dialog.NoButton
+ anchors.centerIn: parent
+
+ Connections {
+ target : apps
+ function onStateChanged() {
+
+ }
+ }
+
+ property bool loading: false
+ property string errorText: ""
+
+ contentItem: ColumnLayout {
+ spacing: 12
+ // padding: 16
+
+ Label { text: "Email:"; font.pixelSize: 14 }
+ TextField {
+ id: emailField
+ placeholderText: "Enter your email"
+ enabled: !dialog.loading
+ Layout.fillWidth: true
+ }
+
+ Label { text: "Password:"; font.pixelSize: 14 }
+ TextField {
+ id: passwordField
+ placeholderText: "Enter your password"
+ echoMode: TextInput.Password
+ enabled: !dialog.loading
+ Layout.fillWidth: true
+ }
+
+ Label {
+ text: "You shouldn't be using your main account here and don't worry, your credentials won't be stored or shared anywhere. This App is open-source."
+ font.pixelSize: 10
+ wrapMode: Text.WordWrap
+ Layout.fillWidth: true
+ }
+
+ BusyIndicator {
+ running: dialog.loading
+ visible: dialog.loading
+ Layout.alignment: Qt.AlignHCenter
+ }
+
+ Label {
+ text: dialog.errorText
+ color: "#c00"
+ visible: dialog.errorText.length > 0
+ Layout.fillWidth: true
+ }
+
+ RowLayout {
+ Layout.alignment: Qt.AlignRight
+ spacing: 8
+
+ Button {
+ text: "Cancel"
+ enabled: !dialog.loading
+ onClicked: dialog.reject()
+ }
+
+ Button {
+ text: "Sign In"
+ enabled: !dialog.loading
+ onClicked: {
+ if (!emailField.text || !passwordField.text) {
+ dialog.errorText = "Email and password cannot be empty."
+ return
+ }
+ dialog.loading = true
+ dialog.errorText = ""
+ apps.login
+ // FIXME: implement
+ apps.login(emailField.text, passwordField.text);
+
+ dialog.loading = false
+ }
+ }
+ }
+ }
+}
diff --git a/src/qml/SidebarTabButton.qml b/src/qml/SidebarTabButton.qml
new file mode 100644
index 0000000..d1dcfec
--- /dev/null
+++ b/src/qml/SidebarTabButton.qml
@@ -0,0 +1,71 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import com.kdab.cxx_qt.demo 1.0
+
+ColumnLayout {
+ id:root
+ signal sectionChanged(int sectionIndex)
+
+ Button {
+ Layout.preferredWidth: 220
+ Layout.fillHeight: true
+ contentItem : Text {
+ text: "Info"
+ color: "Red"
+ }
+ background : Rectangle {
+ color : "transparent"
+ }
+ onClicked: {
+ root.sectionChanged(0)
+ }
+ }
+
+ Button {
+ Layout.preferredWidth: 220
+ Layout.fillHeight: true
+ contentItem : Text {
+ text: "Gallery"
+ color: "Red"
+ }
+ background : Rectangle {
+ color : "transparent"
+ }
+ onClicked: {
+ root.sectionChanged(1)
+ }
+ }
+
+ Button {
+ Layout.preferredWidth: 220
+ Layout.fillHeight: true
+ contentItem : Text {
+ text: "Apps"
+ color: "Red"
+ }
+ background : Rectangle {
+ color : "transparent"
+ }
+ onClicked: {
+ root.sectionChanged(2)
+ }
+ }
+
+
+ Button {
+ Layout.preferredWidth: 220
+ Layout.fillHeight: true
+ contentItem : Text {
+ text: "Files"
+ color: "Red"
+ }
+ background : Rectangle {
+ color : "transparent"
+ }
+ onClicked: {
+ root.sectionChanged(3)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/qml/Tabs.qml b/src/qml/Tabs.qml
index 09552fa..0dd15d9 100644
--- a/src/qml/Tabs.qml
+++ b/src/qml/Tabs.qml
@@ -24,4 +24,9 @@ Item {
}
}
+ AppsTab {
+ anchors.fill: parent
+ visible : currentIndex == 1
+ }
+
}
diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
index 316fdc3..adbc4c0 100644
--- a/src/rust/Cargo.lock
+++ b/src/rust/Cargo.lock
@@ -47,12 +47,56 @@ dependencies = [
"libc",
]
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
[[package]]
name = "anstyle"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
+[[package]]
+name = "anstyle-parse"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "anyhow"
version = "1.0.102"
@@ -60,10 +104,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
[[package]]
-name = "async-compression"
-version = "0.4.41"
+name = "arbitrary"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+dependencies = [
+ "derive_arbitrary",
+]
+
+[[package]]
+name = "async-compression"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac"
dependencies = [
"compression-codecs",
"compression-core",
@@ -122,9 +175,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "aws-lc-rs"
-version = "1.16.2"
+version = "1.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc"
+checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
dependencies = [
"aws-lc-sys",
"zeroize",
@@ -132,9 +185,9 @@ dependencies = [
[[package]]
name = "aws-lc-sys"
-version = "0.39.0"
+version = "0.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa7e52a4c5c547c741610a2c6f123f3881e409b714cd27e6798ef020c514f0a"
+checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
dependencies = [
"cc",
"cmake",
@@ -162,9 +215,9 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
[[package]]
name = "bitflags"
-version = "2.11.0"
+version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
[[package]]
name = "block-buffer"
@@ -213,9 +266,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.57"
+version = "1.2.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -229,6 +282,12 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
[[package]]
name = "chacha20"
version = "0.9.1"
@@ -248,7 +307,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
dependencies = [
"cfg-if",
"cpufeatures 0.3.0",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
]
[[package]]
@@ -300,11 +359,12 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.6.0"
+version = "4.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
dependencies = [
"clap_builder",
+ "clap_derive",
]
[[package]]
@@ -313,11 +373,24 @@ version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
dependencies = [
+ "anstream",
"anstyle",
"clap_lex",
"strsim",
]
+[[package]]
+name = "clap_derive"
+version = "4.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "clap_lex"
version = "1.1.0"
@@ -326,9 +399,9 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
[[package]]
name = "cmake"
-version = "0.1.57"
+version = "0.1.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
dependencies = [
"cc",
]
@@ -355,10 +428,26 @@ dependencies = [
]
[[package]]
-name = "compression-codecs"
-version = "0.4.37"
+name = "colorchoice"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "compression-codecs"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf"
dependencies = [
"compression-core",
"flate2",
@@ -366,9 +455,21 @@ dependencies = [
[[package]]
name = "compression-core"
-version = "0.4.31"
+version = "0.4.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
+checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789"
+
+[[package]]
+name = "console"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "unicode-width 0.2.2",
+ "windows-sys 0.61.2",
+]
[[package]]
name = "const-oid"
@@ -385,6 +486,55 @@ dependencies = [
"unicode-segmentation",
]
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206"
+dependencies = [
+ "cookie",
+ "document-features",
+ "idna",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time",
+ "url",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
@@ -629,6 +779,27 @@ dependencies = [
"syn",
]
+[[package]]
+name = "dbus"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b942602992bb7acfd1f51c49811c58a610ef9181b6e66f3e519d79b540a3bf73"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "dbus-secret-service"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "708b509edf7889e53d7efb0ffadd994cc6c2345ccb62f55cfd6b0682165e4fa6"
+dependencies = [
+ "dbus",
+ "zeroize",
+]
+
[[package]]
name = "der"
version = "0.7.10"
@@ -662,6 +833,17 @@ dependencies = [
"powerfmt",
]
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "digest"
version = "0.10.7"
@@ -674,6 +856,27 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "displaydoc"
version = "0.2.5"
@@ -685,6 +888,15 @@ dependencies = [
"syn",
]
+[[package]]
+name = "document-features"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+dependencies = [
+ "litrs",
+]
+
[[package]]
name = "dunce"
version = "1.0.5"
@@ -716,6 +928,21 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
[[package]]
name = "enum_dispatch"
version = "0.3.13"
@@ -728,6 +955,29 @@ dependencies = [
"syn",
]
+[[package]]
+name = "env_filter"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
[[package]]
name = "equivalent"
version = "1.0.2"
@@ -758,9 +1008,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]]
name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
[[package]]
name = "fiat-crypto"
@@ -801,6 +1051,12 @@ dependencies = [
"miniz_oxide",
]
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
[[package]]
name = "foldhash"
version = "0.1.5"
@@ -946,8 +1202,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"wasi",
+ "wasm-bindgen",
]
[[package]]
@@ -957,9 +1215,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"r-efi 5.3.0",
"wasip2",
+ "wasm-bindgen",
]
[[package]]
@@ -971,11 +1231,30 @@ dependencies = [
"cfg-if",
"libc",
"r-efi 6.0.0",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
"wasip2",
"wasip3",
]
+[[package]]
+name = "h2"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
[[package]]
name = "hashbrown"
version = "0.15.5"
@@ -994,6 +1273,12 @@ dependencies = [
"foldhash 0.2.0",
]
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
[[package]]
name = "hashlink"
version = "0.11.0"
@@ -1068,25 +1353,40 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
[[package]]
name = "hyper"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
+checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
dependencies = [
"atomic-waker",
"bytes",
"futures-channel",
"futures-core",
+ "h2",
"http",
"http-body",
"httparse",
"itoa",
"pin-project-lite",
- "pin-utils",
"smallvec",
"tokio",
"want",
]
+[[package]]
+name = "hyper-rustls"
+version = "0.27.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
[[package]]
name = "hyper-util"
version = "0.1.20"
@@ -1105,9 +1405,11 @@ dependencies = [
"percent-encoding",
"pin-project-lite",
"socket2",
+ "system-configuration",
"tokio",
"tower-service",
"tracing",
+ "windows-registry",
]
[[package]]
@@ -1136,12 +1438,13 @@ dependencies = [
[[package]]
name = "icu_collections"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
dependencies = [
"displaydoc",
"potential_utf",
+ "utf8_iter",
"yoke",
"zerofrom",
"zerovec",
@@ -1149,9 +1452,9 @@ dependencies = [
[[package]]
name = "icu_locale_core"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
dependencies = [
"displaydoc",
"litemap",
@@ -1162,9 +1465,9 @@ dependencies = [
[[package]]
name = "icu_normalizer"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
dependencies = [
"icu_collections",
"icu_normalizer_data",
@@ -1176,15 +1479,15 @@ dependencies = [
[[package]]
name = "icu_normalizer_data"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
[[package]]
name = "icu_properties"
-version = "2.1.2"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
dependencies = [
"icu_collections",
"icu_locale_core",
@@ -1196,15 +1499,15 @@ dependencies = [
[[package]]
name = "icu_properties_data"
-version = "2.1.2"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
[[package]]
name = "icu_provider"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
dependencies = [
"displaydoc",
"icu_locale_core",
@@ -1225,6 +1528,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
name = "idescriptor_rust_codebase"
version = "0.1.0"
dependencies = [
+ "anyhow",
"cxx",
"cxx-qt",
"cxx-qt-build",
@@ -1232,6 +1536,7 @@ dependencies = [
"filetime",
"futures",
"idevice",
+ "ipatool",
"once_cell",
"plist",
"plist-macro",
@@ -1270,7 +1575,7 @@ dependencies = [
"ns-keyed-archive",
"plist",
"plist-macro",
- "rand 0.10.0",
+ "rand 0.10.1",
"reqwest",
"rsa",
"rustls",
@@ -1314,9 +1619,9 @@ dependencies = [
[[package]]
name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
dependencies = [
"icu_normalizer",
"icu_properties",
@@ -1324,16 +1629,29 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.13.0"
+version = "2.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
dependencies = [
"equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
"serde",
"serde_core",
]
+[[package]]
+name = "indicatif"
+version = "0.18.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb"
+dependencies = [
+ "console",
+ "portable-atomic",
+ "unicode-width 0.2.2",
+ "unit-prefix",
+ "web-time",
+]
+
[[package]]
name = "indoc"
version = "2.0.7"
@@ -1353,6 +1671,33 @@ dependencies = [
"generic-array",
]
+[[package]]
+name = "ipatool"
+version = "0.1.0"
+dependencies = [
+ "bytes",
+ "clap",
+ "cookie_store",
+ "dirs",
+ "env_logger",
+ "futures-util",
+ "indicatif",
+ "keyring",
+ "log",
+ "mac_address",
+ "owo-colors",
+ "plist",
+ "regex",
+ "reqwest",
+ "reqwest_cookie_store",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.18",
+ "tokio",
+ "url",
+ "zip",
+]
+
[[package]]
name = "ipnet"
version = "2.12.0"
@@ -1361,14 +1706,20 @@ checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
[[package]]
name = "iri-string"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e7418f59cc01c88316161279a7f665217ae316b388e58a0d10e29f54f1e5eb"
+checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20"
dependencies = [
"memchr",
"serde",
]
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
[[package]]
name = "itoa"
version = "1.0.18"
@@ -1376,18 +1727,91 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
[[package]]
-name = "jktcp"
-version = "0.1.1"
+name = "jiff"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5e6f49d25ffd9617fde3b1f01b6bc349497affef78d5fc67f5b0f0b4b3924c"
+checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jktcp"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65b9d88c89c8fe802c7e7c2bf32b0fb85ef53187c30a8f130d41578b4362baa7"
dependencies = [
"crossfire",
"futures",
- "rand 0.9.2",
+ "rand 0.9.4",
"tokio",
"tracing",
]
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
+
[[package]]
name = "jobserver"
version = "0.1.34"
@@ -1400,10 +1824,12 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.91"
+version = "0.3.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
dependencies = [
+ "cfg-if",
+ "futures-util",
"once_cell",
"wasm-bindgen",
]
@@ -1414,6 +1840,21 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
+[[package]]
+name = "keyring"
+version = "3.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
+dependencies = [
+ "byteorder",
+ "dbus-secret-service",
+ "log",
+ "security-framework 2.11.1",
+ "security-framework 3.7.0",
+ "windows-sys 0.60.2",
+ "zeroize",
+]
+
[[package]]
name = "lazy_static"
version = "1.5.0"
@@ -1431,9 +1872,18 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
[[package]]
name = "libc"
-version = "0.2.183"
+version = "0.2.186"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
[[package]]
name = "libm"
@@ -1443,14 +1893,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
[[package]]
name = "libredox"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
dependencies = [
"bitflags",
"libc",
"plain",
- "redox_syscall 0.7.3",
+ "redox_syscall 0.7.4",
]
[[package]]
@@ -1475,9 +1925,15 @@ dependencies = [
[[package]]
name = "litemap"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
[[package]]
name = "lock_api"
@@ -1494,6 +1950,22 @@ version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
+[[package]]
+name = "mac_address"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303"
+dependencies = [
+ "nix",
+ "winapi",
+]
+
[[package]]
name = "md-5"
version = "0.10.6"
@@ -1510,6 +1982,21 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
[[package]]
name = "miniz_oxide"
version = "0.8.9"
@@ -1522,15 +2009,28 @@ dependencies = [
[[package]]
name = "mio"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
dependencies = [
"libc",
"wasi",
"windows-sys 0.61.2",
]
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
[[package]]
name = "ns-keyed-archive"
version = "0.1.5"
@@ -1572,7 +2072,7 @@ dependencies = [
"num-integer",
"num-iter",
"num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
"smallvec",
"zeroize",
]
@@ -1619,12 +2119,36 @@ version = "1.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
[[package]]
name = "opaque-debug"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "owo-colors"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d"
+
[[package]]
name = "parking"
version = "2.2.1"
@@ -1695,12 +2219,6 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
[[package]]
name = "pkcs1"
version = "0.7.5"
@@ -1724,9 +2242,9 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
[[package]]
name = "plain"
@@ -1736,9 +2254,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
[[package]]
name = "plist"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
+checksum = "092791278e026273c1b65bbdcfbba3a300f2994c896bd01ab01da613c29c46f1"
dependencies = [
"base64 0.22.1",
"indexmap",
@@ -1768,10 +2286,25 @@ dependencies = [
]
[[package]]
-name = "potential_utf"
-version = "0.1.4"
+name = "portable-atomic"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
dependencies = [
"zerovec",
]
@@ -1821,6 +2354,22 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "psl-types"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
+
+[[package]]
+name = "publicsuffix"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf"
+dependencies = [
+ "idna",
+ "psl-types",
+]
+
[[package]]
name = "qt-build-utils"
version = "0.8.1"
@@ -1836,13 +2385,69 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.38.4"
+version = "0.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
dependencies = [
"memchr",
]
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+dependencies = [
+ "aws-lc-rs",
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.4",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.60.2",
+]
+
[[package]]
name = "quote"
version = "1.0.45"
@@ -1866,9 +2471,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "rand"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
dependencies = [
"rand_chacha 0.3.1",
"rand_core 0.6.4",
@@ -1876,9 +2481,9 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.9.2"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.5",
@@ -1886,13 +2491,13 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
dependencies = [
"chacha20 0.10.0",
"getrandom 0.4.2",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
]
[[package]]
@@ -1935,9 +2540,9 @@ dependencies = [
[[package]]
name = "rand_core"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
[[package]]
name = "redox_syscall"
@@ -1950,13 +2555,24 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
+checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
dependencies = [
"bitflags",
]
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom 0.2.17",
+ "libredox",
+ "thiserror 1.0.69",
+]
+
[[package]]
name = "regex"
version = "1.12.3"
@@ -1988,35 +2604,62 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
[[package]]
name = "reqwest"
-version = "0.13.2"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
+checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0"
dependencies = [
"base64 0.22.1",
"bytes",
+ "cookie",
+ "cookie_store",
+ "encoding_rs",
"futures-core",
+ "futures-util",
+ "h2",
"http",
"http-body",
"http-body-util",
"hyper",
+ "hyper-rustls",
"hyper-util",
"js-sys",
"log",
+ "mime",
"percent-encoding",
"pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
"serde",
"serde_json",
+ "serde_urlencoded",
"sync_wrapper",
"tokio",
+ "tokio-rustls",
+ "tokio-util",
"tower",
"tower-http",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
+ "wasm-streams",
"web-sys",
]
+[[package]]
+name = "reqwest_cookie_store"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beb98c4d52ae6ceed18a0dff0564717623dd75fae08619ae0927332f0a81abbc"
+dependencies = [
+ "bytes",
+ "cookie_store",
+ "reqwest",
+ "url",
+]
+
[[package]]
name = "ring"
version = "0.17.14"
@@ -2077,6 +2720,12 @@ dependencies = [
"sqlite-wasm-rs",
]
+[[package]]
+name = "rustc-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+
[[package]]
name = "rustc_version"
version = "0.4.1"
@@ -2088,9 +2737,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.37"
+version = "0.23.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
+checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
dependencies = [
"aws-lc-rs",
"once_cell",
@@ -2101,19 +2750,59 @@ dependencies = [
]
[[package]]
-name = "rustls-pki-types"
-version = "1.14.0"
+name = "rustls-native-certs"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.7.0",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+dependencies = [
+ "web-time",
"zeroize",
]
[[package]]
-name = "rustls-webpki"
-version = "0.103.10"
+name = "rustls-platform-verifier"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
+checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework 3.7.0",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
dependencies = [
"aws-lc-rs",
"ring",
@@ -2127,6 +2816,30 @@ version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+[[package]]
+name = "ryu"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "scopeguard"
version = "1.2.0"
@@ -2140,10 +2853,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2"
[[package]]
-name = "semver"
-version = "1.0.27"
+name = "security-framework"
+version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
[[package]]
name = "serde"
@@ -2188,6 +2937,18 @@ dependencies = [
"zmij",
]
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
[[package]]
name = "sha1"
version = "0.10.6"
@@ -2238,9 +2999,25 @@ dependencies = [
[[package]]
name = "simd-adler32"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "slab"
@@ -2282,9 +3059,9 @@ dependencies = [
[[package]]
name = "sqlite-wasm-rs"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4206ed3a67690b9c29b77d728f6acc3ce78f16bf846d83c94f76400320181b"
+checksum = "1b2c760607300407ddeaee518acf28c795661b7108c75421303dbefb237d3a36"
dependencies = [
"cc",
"js-sys",
@@ -2347,6 +3124,27 @@ dependencies = [
"syn",
]
+[[package]]
+name = "system-configuration"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.4",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "termcolor"
version = "1.4.1"
@@ -2429,14 +3227,29 @@ dependencies = [
[[package]]
name = "tinystr"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
dependencies = [
"displaydoc",
"zerovec",
]
+[[package]]
+name = "tinyvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
[[package]]
name = "tls_codec"
version = "0.4.2"
@@ -2460,9 +3273,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.50.0"
+version = "1.52.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
dependencies = [
"bytes",
"libc",
@@ -2477,9 +3290,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.6.1"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
dependencies = [
"proc-macro2",
"quote",
@@ -2594,9 +3407,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "typenum"
-version = "1.19.0"
+version = "1.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
[[package]]
name = "unicode-ident"
@@ -2606,9 +3419,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
[[package]]
name = "unicode-segmentation"
-version = "1.13.1"
+version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da36089a805484bcccfffe0739803392c8298778a2d2f09febf76fac5ad9025b"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
[[package]]
name = "unicode-width"
@@ -2628,6 +3441,12 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+[[package]]
+name = "unit-prefix"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
+
[[package]]
name = "universal-hash"
version = "0.5.1"
@@ -2669,10 +3488,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]]
-name = "uuid"
-version = "1.22.0"
+name = "utf8parse"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
dependencies = [
"getrandom 0.4.2",
"js-sys",
@@ -2693,6 +3518,16 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
[[package]]
name = "want"
version = "0.3.1"
@@ -2710,11 +3545,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
]
[[package]]
@@ -2723,14 +3558,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
]
[[package]]
name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.120"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
dependencies = [
"cfg-if",
"once_cell",
@@ -2741,23 +3576,19 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084"
dependencies = [
- "cfg-if",
- "futures-util",
"js-sys",
- "once_cell",
"wasm-bindgen",
- "web-sys",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.120"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2765,9 +3596,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.120"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
dependencies = [
"bumpalo",
"proc-macro2",
@@ -2778,9 +3609,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.120"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
dependencies = [
"unicode-ident",
]
@@ -2807,6 +3638,19 @@ dependencies = [
"wasmparser",
]
+[[package]]
+name = "wasm-streams"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
[[package]]
name = "wasmparser"
version = "0.244.0"
@@ -2821,14 +3665,49 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.91"
+version = "0.3.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602"
dependencies = [
"js-sys",
"wasm-bindgen",
]
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
[[package]]
name = "winapi-util"
version = "0.1.11"
@@ -2838,6 +3717,12 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
[[package]]
name = "windows-core"
version = "0.62.2"
@@ -2879,6 +3764,17 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
[[package]]
name = "windows-result"
version = "0.4.1"
@@ -2897,13 +3793,31 @@ dependencies = [
"windows-link",
]
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
]
[[package]]
@@ -2915,70 +3829,192 @@ dependencies = [
"windows-link",
]
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
[[package]]
name = "wit-bindgen"
version = "0.51.0"
@@ -2988,6 +4024,12 @@ dependencies = [
"wit-bindgen-rust-macro",
]
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
[[package]]
name = "wit-bindgen-core"
version = "0.51.0"
@@ -3069,9 +4111,9 @@ dependencies = [
[[package]]
name = "writeable"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
[[package]]
name = "x25519-dalek"
@@ -3101,9 +4143,9 @@ dependencies = [
[[package]]
name = "yoke"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
dependencies = [
"stable_deref_trait",
"yoke-derive",
@@ -3112,9 +4154,9 @@ dependencies = [
[[package]]
name = "yoke-derive"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
dependencies = [
"proc-macro2",
"quote",
@@ -3124,18 +4166,18 @@ dependencies = [
[[package]]
name = "zerocopy"
-version = "0.8.47"
+version = "0.8.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.8.47"
+version = "0.8.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
dependencies = [
"proc-macro2",
"quote",
@@ -3144,18 +4186,18 @@ dependencies = [
[[package]]
name = "zerofrom"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
dependencies = [
"zerofrom-derive",
]
[[package]]
name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
dependencies = [
"proc-macro2",
"quote",
@@ -3185,9 +4227,9 @@ dependencies = [
[[package]]
name = "zerotrie"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
dependencies = [
"displaydoc",
"yoke",
@@ -3196,9 +4238,9 @@ dependencies = [
[[package]]
name = "zerovec"
-version = "0.11.5"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
dependencies = [
"yoke",
"zerofrom",
@@ -3207,17 +4249,46 @@ dependencies = [
[[package]]
name = "zerovec-derive"
-version = "0.11.2"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
+[[package]]
+name = "zip"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "crossbeam-utils",
+ "displaydoc",
+ "flate2",
+ "indexmap",
+ "memchr",
+ "thiserror 2.0.18",
+ "zopfli",
+]
+
[[package]]
name = "zmij"
version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+
+[[package]]
+name = "zopfli"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "simd-adler32",
+]
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
index e34f049..8ab17de 100644
--- a/src/rust/Cargo.toml
+++ b/src/rust/Cargo.toml
@@ -25,6 +25,8 @@ serde_json = "1.0.149"
rusqlite = { version = "0.39.0", features = ["bundled"] }
filetime = "0.2.27"
priority-queue = "2.7.0"
+anyhow = "1.0.102"
+ipatool = { path = "/home/uncore/Desktop/proj/ipatool-rs", default-features = false }
[build-dependencies]
diff --git a/src/rust/build.rs b/src/rust/build.rs
index 036ecef..efe7d3c 100644
--- a/src/rust/build.rs
+++ b/src/rust/build.rs
@@ -16,12 +16,15 @@ fn main() {
"src/query_sqlite.rs",
"src/image_loader.rs",
"src/bridge.rs",
+ "src/apps.rs",
])
.include_dir("include");
let builder = unsafe {
builder.cc_builder(|cc| {
cc.file("src/thumbnail.cc");
+ cc.file("src/heic_to_image.cc");
+ cc.file("src/qinput_get_text.cc");
})
};
builder.build();
diff --git a/src/rust/include/thumbnail.h b/src/rust/include/bridge.h
similarity index 58%
rename from src/rust/include/thumbnail.h
rename to src/rust/include/bridge.h
index 7a3efb4..074e9f2 100644
--- a/src/rust/include/thumbnail.h
+++ b/src/rust/include/bridge.h
@@ -2,8 +2,12 @@
#include "rust/cxx.h"
#include
+QImage heic_to_image(rust::Slice buf);
+
class AfcReader;
QImage generate_thumbnail_with_reader(const AfcReader &reader,
int32_t file_size, int32_t requested_w,
- int32_t requested_h);
\ No newline at end of file
+ int32_t requested_h);
+
+QString qinput_get_text(bool ok);
\ No newline at end of file
diff --git a/src/rust/include/heic.h b/src/rust/include/heic.h
deleted file mode 100644
index 429bafa..0000000
--- a/src/rust/include/heic.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-#include "rust/cxx.h"
-#include
-
-QImage load_heic(rust::Vec data);
\ No newline at end of file
diff --git a/src/rust/src/apps.rs b/src/rust/src/apps.rs
new file mode 100644
index 0000000..c79c32b
--- /dev/null
+++ b/src/rust/src/apps.rs
@@ -0,0 +1,107 @@
+use crate::RUNTIME;
+
+use crate::qmap_insert;
+use cxx_qt::Threading;
+use cxx_qt_lib::{QMap, QMapPair_QString_QVariant, QString, QVariant};
+use ipatool::Account;
+use ipatool::IpaTool;
+use std::pin::Pin;
+
+#[cxx_qt::bridge]
+mod qobject {
+ unsafe extern "C++" {
+ include!("cxx-qt-lib/qlist.h");
+ include!("cxx-qt-lib/qmap.h");
+ include!("cxx-qt-lib/qstring.h");
+
+ type QString = cxx_qt_lib::QString;
+ type QMap_QString_QVariant = cxx_qt_lib::QMap;
+ }
+
+ extern "RustQt" {
+ #[qobject]
+ #[qml_element]
+ #[qproperty(QMap_QString_QVariant, state)]
+ type Apps = super::RApps;
+
+ #[qinvokable]
+ fn init(self: Pin<&mut Apps>);
+
+ #[qinvokable]
+ fn sign_in(self: Pin<&mut Apps>, email: &QString, password: &QString);
+ }
+ impl cxx_qt::Threading for Apps {}
+}
+pub struct RApps {
+ state: QMap,
+}
+
+impl Default for RApps {
+ fn default() -> Self {
+ let mut state = QMap::::default();
+ qmap_insert!(state, "init", false);
+ qmap_insert!(state, "error", QString::default());
+ qmap_insert!(state, "email", QString::default());
+ Self { state }
+ }
+}
+
+impl qobject::Apps {
+ fn init(self: Pin<&mut Self>) {
+ let q_thread = self.qt_thread();
+ RUNTIME.spawn(async move {
+ let res: anyhow::Result> = async {
+ let tool = IpaTool::new_default().await?;
+ Ok(tool.account_info().await?)
+ }
+ .await;
+
+ match res {
+ Ok(maybe_acc) => {
+ let acc = maybe_acc.unwrap_or_default();
+ println!("email :{}", acc.email);
+
+ let mut state = QMap::::default();
+ qmap_insert!(state, "init", true);
+ qmap_insert!(state, "error", QString::default());
+ qmap_insert!(state, "email", QString::from(acc.email));
+
+ q_thread.queue(|t| t.set_state(state)).ok();
+ }
+ Err(err) => {
+ let mut state = QMap::::default();
+ qmap_insert!(state, "init", true);
+ qmap_insert!(state, "error", QString::from(format!("{}", err)));
+ qmap_insert!(state, "email", QString::default());
+
+ q_thread.queue(|t| t.set_state(state)).ok();
+ }
+ }
+ });
+ }
+
+ fn sign_in(self: Pin<&mut Self>, email: &QString, password: &QString) {
+ // FIXME: implement
+ // RUNTIME.spawn(async move {
+ // let res: anyhow::Result<()> = async {
+ // let tool = IpaTool::new_default().await?;
+
+ // let auth_code_cb: Box ipatool::Result + Send + Sync> =
+ // Box::new(|| {
+ // });
+ // tool.login(
+ // &email.to_string(),
+ // &password.to_string(),
+ // Some(auth_code_cb),
+ // None,
+ // )
+ // .await;
+
+ // Ok(())
+ // }
+ // .await;
+
+ // Ok(())
+ // });
+ }
+}
diff --git a/src/rust/src/bridge.rs b/src/rust/src/bridge.rs
index 593fd57..fea5eaf 100644
--- a/src/rust/src/bridge.rs
+++ b/src/rust/src/bridge.rs
@@ -68,6 +68,7 @@ impl AfcReader {
#[cxx_qt::bridge]
pub mod bridge {
+
extern "Rust" {
type AfcReader;
@@ -75,14 +76,16 @@ pub mod bridge {
}
unsafe extern "C++" {
- include!("thumbnail.h");
+ include!("bridge.h");
+
include!("cxx-qt-lib/qimage.h");
include!("cxx-qt-lib/qbytearray.h");
// include!("cxx-qt-lib/qmap.h");
- // include!("cxx-qt-lib/qstring.h");
+ include!("cxx-qt-lib/qstring.h");
type QImage = cxx_qt_lib::QImage;
type QByteArray = cxx_qt_lib::QByteArray;
+ type QString = cxx_qt_lib::QString;
fn generate_thumbnail_with_reader(
reader: &AfcReader,
@@ -90,5 +93,9 @@ pub mod bridge {
requested_w: i32,
requested_h: i32,
) -> QImage;
+
+ fn heic_to_image(data: &[u8]) -> QImage;
+
+ fn qinput_get_text(ok: bool) -> QString;
}
}
diff --git a/src/rust/src/load_heic.cc b/src/rust/src/heic_to_image.cc
similarity index 95%
rename from src/rust/src/load_heic.cc
rename to src/rust/src/heic_to_image.cc
index f543a64..65b0117 100644
--- a/src/rust/src/load_heic.cc
+++ b/src/rust/src/heic_to_image.cc
@@ -22,7 +22,7 @@
#include
#include
-QImage load_heic(rust::Vec &data)
+QImage heic_to_image(rust::Slice buf)
{
heif_context *ctx = heif_context_alloc();
if (!ctx) {
@@ -31,7 +31,7 @@ QImage load_heic(rust::Vec &data)
}
heif_error err =
- heif_context_read_from_memory(ctx, data.data(), data.size(), nullptr);
+ heif_context_read_from_memory(ctx, buf.data(), buf.size(), nullptr);
if (err.code != heif_error_Ok) {
// qWarning() << "Failed to read HEIC from memory:" << err.message;
heif_context_free(ctx);
diff --git a/src/rust/src/image_loader.rs b/src/rust/src/image_loader.rs
index 088fcf1..8eaff52 100644
--- a/src/rust/src/image_loader.rs
+++ b/src/rust/src/image_loader.rs
@@ -139,70 +139,81 @@ fn ensure_worker_started() {
RUNTIME.spawn(async move {
let _permit = permit;
- let afc_arc = {
- let maybe_device = APP_DEVICE_STATE
- .lock()
- .await
- .get(key.udid.as_str())
- .cloned();
+ let res: anyhow::Result<()> = async {
+ let afc_arc = {
+ let maybe_device = APP_DEVICE_STATE
+ .lock()
+ .await
+ .get(key.udid.as_str())
+ .cloned();
- let device = match maybe_device {
- Some(d) => d,
- None => {
- // eprintln!(
- // "image_loader::read_file_via_afc: device {udid} not found"
- // );
- return;
- }
+ let device = match maybe_device {
+ Some(d) => d,
+ None => {
+ // eprintln!(
+ // "image_loader::read_file_via_afc: device {udid} not found"
+ // );
+ anyhow::bail!("No device");
+ }
+ };
+
+ device.afc.clone()
};
- device.afc.clone()
- };
-
- let mut afc = afc_arc.lock().await;
-
- let info = afc.get_file_info(&key.path).await;
-
- let size = match info {
- Ok(i) => i.size,
- Err(_) => return,
- };
-
- drop(afc);
-
- let mut img = QImage::default();
- if is_video_file(&key.path) {
- // FIXME: can we do something better here ?
- let reader =
- crate::bridge::AfcReader::new(key.udid.clone(), key.path.clone());
-
- let reader_for_block = reader;
- let size_for_block = size as i32;
- img = tokio::task::spawn_blocking(move || {
- crate::bridge::bridge::generate_thumbnail_with_reader(
- &reader_for_block,
- size_for_block,
- // FIXME: sizes aren't respected
- 320,
- 240,
- )
- })
- .await
- .unwrap_or_default();
- } else {
let mut afc = afc_arc.lock().await;
- img = file_to_image(&mut afc, key.path).await;
- }
- let row = payload.row;
- let path_for_qt = payload.path_for_qt;
- let qt_thread = payload.qt_thread;
+ let info = afc.get_file_info(&key.path).await;
- if let Err(e) = qt_thread.queue(move |mut backend_qobj| {
- backend_qobj.thumbnail_ready(path_for_qt, img, row);
- }) {
- eprintln!("image_loader: failed to queue thumbnail_ready: {e}");
+ let size = match info {
+ Ok(i) => i.size,
+ Err(_) => anyhow::bail!("File has no size ?"),
+ };
+
+ drop(afc);
+
+ let mut img = QImage::default();
+ if is_video_file(&key.path) {
+ // FIXME: can we do something better here ?
+ let reader =
+ crate::bridge::AfcReader::new(key.udid.clone(), key.path.clone());
+
+ let reader_for_block = reader;
+ let size_for_block = size as i32;
+ img = tokio::task::spawn_blocking(move || {
+ crate::bridge::bridge::generate_thumbnail_with_reader(
+ &reader_for_block,
+ size_for_block,
+ // FIXME: sizes aren't respected
+ 320,
+ 240,
+ )
+ })
+ .await
+ .unwrap_or_default();
+ } else {
+ let mut afc = afc_arc.lock().await;
+ if key.path.to_ascii_lowercase().ends_with(".heic") {
+ let mut fd = afc.open(key.path, AfcFopenMode::RdOnly).await?;
+ let buf = fd.read_entire().await?;
+ img = crate::bridge::bridge::heic_to_image(&buf);
+ } else {
+ img = file_to_image(&mut afc, key.path).await;
+ }
+ }
+
+ let row = payload.row;
+ let path_for_qt = payload.path_for_qt;
+ let qt_thread = payload.qt_thread;
+
+ if let Err(e) = qt_thread.queue(move |mut backend_qobj| {
+ backend_qobj.thumbnail_ready(path_for_qt, img, row);
+ }) {
+ eprintln!("image_loader: failed to queue thumbnail_ready: {e}");
+ }
+
+ Ok(())
}
+ .await;
});
}
});
diff --git a/src/rust/src/lib.rs b/src/rust/src/lib.rs
index 9bdb91f..8c99a06 100644
--- a/src/rust/src/lib.rs
+++ b/src/rust/src/lib.rs
@@ -40,6 +40,8 @@ mod utils;
mod query_sqlite;
mod image_loader;
mod bridge;
+mod apps;
+
const POSSIBLE_ROOT: &str = "../../../../";
const APP_LABEL: &str = "iDescriptor";
diff --git a/src/rust/src/qinput_get_text.cc b/src/rust/src/qinput_get_text.cc
new file mode 100644
index 0000000..814bb83
--- /dev/null
+++ b/src/rust/src/qinput_get_text.cc
@@ -0,0 +1,11 @@
+#include
+#include
+
+QString qinput_get_text(bool ok)
+{
+ return QInputDialog::getText(
+ nullptr, "SSH Root Password",
+ "Enter the root password: \n(leave empty if you "
+ "want to use the default)",
+ QLineEdit::Normal, QString(), &ok);
+}
\ No newline at end of file
diff --git a/src/rust/src/thumbnail.cc b/src/rust/src/thumbnail.cc
index bd911f3..9b0ba0f 100644
--- a/src/rust/src/thumbnail.cc
+++ b/src/rust/src/thumbnail.cc
@@ -1,4 +1,4 @@
-#include "thumbnail.h"
+#include "bridge.h"
#include "rust/cxx.h"
#include
extern "C" {
@@ -244,6 +244,7 @@ QImage generate_thumbnail_with_reader(const AfcReader &reader,
}
result = imgCopy;
+ // FIXME: scale
// Scale to requested size
/*
TODO: scaling might become optional
diff --git a/src/rust/src/utils.rs b/src/rust/src/utils.rs
index f781c70..8bc1e37 100644
--- a/src/rust/src/utils.rs
+++ b/src/rust/src/utils.rs
@@ -169,3 +169,20 @@ pub fn create_album_info(
json!({"album_id" : album_id, "item_count" : item_count,"file_path" : format!("{}/{}",asset_dir,asset_file_name)})
.to_string()
}
+
+// pub fn emit(thread: cxx_qt::CxxQtThread) {}
+use cxx_qt_lib::{QMap, QMapPair_QString_QVariant, QVariant};
+
+pub fn qmap_insert(map: &mut QMap, key: &str, value: &T)
+where
+ QVariant: for<'a> From<&'a T>,
+{
+ map.insert(QString::from(key), QVariant::from(value));
+}
+
+#[macro_export]
+macro_rules! qmap_insert {
+ ($map:expr, $key:expr , $value:expr) => {
+ $crate::utils::qmap_insert(&mut $map, $key, &$value)
+ };
+}