diff --git a/Cargo.toml b/Cargo.toml index bb17ffc..1965812 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ dirs = "5.0.0" diesel = { version = "2.0.3", features = ["sqlite"] } libsqlite3-sys = { version = ">=0.17.2, <0.26.0", features = ["bundled"] } youtube_dl = "0.8.0" +# sqlx = { version = "0.6.3", features = ["sqlite", "runtime-async-std"] } # ffmpeg-next = "6.0.0" # cxx-qt-build generates C++ code from the `#[cxx_qt::bridge]` module diff --git a/flake.nix b/flake.nix index 55c4914..9412786 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ cargo2nix.url = "github:cargo2nix/cargo2nix/release-0.11.0"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; + # nixpkgs.follows = "cargo2nix/nixpkgs"; }; outputs = inputs: with inputs; @@ -27,6 +28,8 @@ workspaceShell = rustPkgs.workspaceShell { packages = with pkgs; [ gcc + stdenv + bintools gnumake gdb qtcreator diff --git a/src/qml/presenter/Library.qml b/src/qml/presenter/Library.qml index 38bf09d..c4c1f2e 100644 --- a/src/qml/presenter/Library.qml +++ b/src/qml/presenter/Library.qml @@ -349,17 +349,14 @@ Item { if (videoexts.includes(extension)) { addVideo(file); - return; } if (imgexts.includes(extension)) { addImg(file); - return } if (presexts.includes(extension)) { addPres(file); - return } } @@ -375,12 +372,13 @@ Item { } if (imgexts.includes(ext)) { + console.log(file); addImg(file); + console.log(file); } if (presexts.includes(ext)) { addPres(file); - return; } } }