From 922f1b345613992d598486c89407e84c8db1c714 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 17 Sep 2024 06:19:47 -0500 Subject: [PATCH] remove some unneccessary stuff --- src/rust/utils.rs | 34 +++++++++++++++++----------------- src/rust/video_model.rs | 11 +++++------ src/rust/ytdl.rs | 4 +--- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/rust/utils.rs b/src/rust/utils.rs index fa856b5..c6a803c 100644 --- a/src/rust/utils.rs +++ b/src/rust/utils.rs @@ -10,25 +10,25 @@ mod db { use diesel::{Connection, SqliteConnection}; use dirs::data_local_dir; - pub enum Model { - Songs, - Presentations, - Videos, - Images, - } + // pub enum Model { + // Songs, + // Presentations, + // Videos, + // Images, + // } - fn get_db() -> SqliteConnection { - let mut data = data_local_dir().unwrap(); - data.push("lumina"); - data.push("library-db.sqlite3"); - let mut db_url = String::from("sqlite://"); - db_url.push_str(data.to_str().unwrap()); - println!("DB: {:?}", db_url); + // fn get_db() -> SqliteConnection { + // let mut data = data_local_dir().unwrap(); + // data.push("lumina"); + // data.push("library-db.sqlite3"); + // let mut db_url = String::from("sqlite://"); + // db_url.push_str(data.to_str().unwrap()); + // println!("DB: {:?}", db_url); - SqliteConnection::establish(&db_url).unwrap_or_else(|_| { - panic!("error connecting to {}", db_url) - }) - } + // SqliteConnection::establish(&db_url).unwrap_or_else(|_| { + // panic!("error connecting to {}", db_url) + // }) + // } // fn get_items(model: Model) -> Result<(), Error> { // let conn = sqlx::SqliteConnection::connect( diff --git a/src/rust/video_model.rs b/src/rust/video_model.rs index ed65478..7748190 100644 --- a/src/rust/video_model.rs +++ b/src/rust/video_model.rs @@ -18,10 +18,10 @@ mod video_model { type QModelIndex = cxx_qt_lib::QModelIndex; include!("cxx-qt-lib/qvector.h"); type QVector_i32 = cxx_qt_lib::QVector; - include!("cxx-qt-lib/qstringlist.h"); - type QStringList = cxx_qt_lib::QStringList; - include!("cxx-qt-lib/qlist.h"); - type QList_QString = cxx_qt_lib::QList; + // include!("cxx-qt-lib/qstringlist.h"); + // type QStringList = cxx_qt_lib::QStringList; + // include!("cxx-qt-lib/qlist.h"); + // type QList_QString = cxx_qt_lib::QList; } #[qenum(VideoModel)] @@ -182,7 +182,6 @@ use crate::models::run_migrations; use crate::schema::videos::dsl::*; use cxx_qt::CxxQtType; use cxx_qt_lib::{QByteArray, QModelIndex, QString, QUrl, QVariant}; -use diesel::migration::MigrationConnection; use diesel::sqlite::SqliteConnection; use diesel::{delete, insert_into, prelude::*, update}; use std::path::PathBuf; @@ -495,7 +494,7 @@ impl video_model::VideoModel { model_index, &vector_roles, ); - println!("rust-end-time: {:?}", updated_end_time); + println!("rust-end-time: {updated_end_time:?}"); true } Err(_e) => false, diff --git a/src/rust/ytdl.rs b/src/rust/ytdl.rs index 7e7aa04..dd68012 100644 --- a/src/rust/ytdl.rs +++ b/src/rust/ytdl.rs @@ -24,7 +24,7 @@ mod ytdl { impl cxx_qt::Threading for Ytdl {} } -use cxx_qt::{CxxQtType, Threading}; +use cxx_qt::Threading; use cxx_qt_lib::{QString, QUrl}; use dirs; use std::{fs, pin::Pin}; @@ -99,6 +99,4 @@ impl ytdl::Ytdl { false } } - - async fn dl_video() {} }