chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move to using rust strings in the video struct

Browse source
This commit is contained in:
Chris Cochrun 2024-06-17 16:28:08 -05:00
parent 3d09157be8
commit 6036240b02
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/rust/video_model.rs
View file

@ -193,8 +193,8 @@ use self::video_model::{
#[derive(Default, Clone, Debug)] #[derive(Default, Clone, Debug)]
pub struct Video { pub struct Video {
id: i32, id: i32,
title: QString, title: String,
path: QString, path: String,
start_time: f32, start_time: f32,
end_time: f32, end_time: f32,
looping: bool, looping: bool,
@ -236,8 +236,8 @@ impl video_model::VideoModel {
let img = self::Video { let img = self::Video {
id: video.id, id: video.id,
title: QString::from(&video.title), title: video.title,
path: QString::from(&video.path), path: video.path,
start_time: video.start_time.unwrap_or(0.0), start_time: video.start_time.unwrap_or(0.0),
end_time: video.end_time.unwrap_or(0.0), end_time: video.end_time.unwrap_or(0.0),
looping: video.looping, looping: video.looping,
@ -325,8 +325,8 @@ impl video_model::VideoModel {
// println!("{:?}", db); // println!("{:?}", db);
let video = self::Video { let video = self::Video {
id: video_id, id: video_id,
title: video_title.clone(), title: video_title.clone().to_string(),
path: video_path.clone(), path: video_path.clone().to_string(),
start_time: 0.0, start_time: 0.0,
end_time: 0.0, end_time: 0.0,
looping: false, looping: false,
@ -553,7 +553,7 @@ impl video_model::VideoModel {
.iter_mut() .iter_mut()
.filter(|x| x.id == index) .filter(|x| x.id == index)
{ {
video.title = updated_title.clone(); video.title = updated_title.clone().to_string();
println!("rust-title: {:?}", video.title); println!("rust-title: {:?}", video.title);
} }
// TODO this seems to not be updating in the actual list // TODO this seems to not be updating in the actual list
@ -592,7 +592,7 @@ impl video_model::VideoModel {
.iter_mut() .iter_mut()
.filter(|x| x.id == index) .filter(|x| x.id == index)
{ {
video.path = updated_path.clone(); video.path = updated_path.clone().to_string();
println!("rust-title: {:?}", video.title); println!("rust-title: {:?}", video.title);
} }
self.as_mut().data_changed( self.as_mut().data_changed(
@ -615,8 +615,12 @@ impl video_model::VideoModel {
if let Some(video) = self.videos.get(index.row() as usize) { if let Some(video) = self.videos.get(index.row() as usize) {
return match role { return match role {
VideoRoles::Id => QVariant::from(&video.id), VideoRoles::Id => QVariant::from(&video.id),
VideoRoles::Title => QVariant::from(&video.title), VideoRoles::Title => {
VideoRoles::Path => QVariant::from(&video.path), QVariant::from(&QString::from(&video.title))
}
VideoRoles::Path => {
QVariant::from(&QString::from(&video.path))
}
VideoRoles::StartTime => { VideoRoles::StartTime => {
QVariant::from(&video.start_time) QVariant::from(&video.start_time)
} }