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

[fix]: Fixing bugs when adding items to the service
Some checks failed
/ clippy (push) Failing after 5m6s
Details
/ test (push) Failing after 5m40s
Details

Browse source
This commit is contained in:
Chris Cochrun 2026-04-09 11:33:12 -05:00
parent 030fc23ac2
commit 9fa26e41cd
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/main.rs
View file

@ -204,7 +204,8 @@ enum Message {
AddSelectServiceItem(usize),
HoveredServiceItem(Option<usize>),
HoveredServiceDrop(Option<usize>),
AddServiceItem(usize, KindWrapper),
AddServiceItem(usize, ServiceItem),
AddServiceItemKind(usize, KindWrapper),
AddServiceItemsFiles(usize, Vec<ServiceItem>),
RemoveServiceItem(usize),
AddServiceItemDrop(usize),
@ -1251,6 +1252,12 @@ impl cosmic::Application for App {
Task::none()
}
Message::AddServiceItem(index, item) => {
self.service.insert(index, item);
self.presenter.update_items(self.service.clone());
self.hovered_dnd = None;
Task::none()
}
Message::AddServiceItemKind(index, item) => {
let item_index = item.0.1;
let kind = item.0.0;
let mut item;
@ -1315,18 +1322,19 @@ impl cosmic::Application for App {
.unwrap_or(slide)
})
.collect();
self.service.insert(index, item);
self.presenter.update_items(self.service.clone());
self.hovered_dnd = None;
Task::none()
return self
.update(Message::AddServiceItem(index, item));
}
Message::AddServiceItemsFiles(index, items) => {
self.hovered_dnd = None;
for item in items {
self.service.insert(index, item);
let mut tasks = Vec::new();
for (i, item) in items.into_iter().enumerate() {
tasks.push(self.update(Message::AddServiceItem(
index + i,
item,
)));
}
self.presenter.update_items(self.service.clone());
Task::none()
Task::batch(tasks)
}
Message::RemoveServiceItem(index) => {
self.service.remove(index);
@ -1339,7 +1347,10 @@ impl cosmic::Application for App {
}
Message::AddServiceItemDrop(index) => {
if let Some(item) = &self.library_dragged_item {
self.service.insert(index, item.clone());
return self.update(Message::AddServiceItem(
index,
item.clone(),
));
}
Task::none()
}
@ -2001,7 +2012,7 @@ where
return Message::None;
};
debug!(?item, index, "adding Service item");
Message::AddServiceItem(index, item)
Message::AddServiceItemKind(index, item)
}
"text/uri-list" => {
let Ok(text) = str::from_utf8(&data) else {
@ -2095,7 +2106,7 @@ where
return Message::None;
};
debug!(?item, "adding Service item");
Message::AddServiceItem(last_index, item)
Message::AddServiceItemKind(last_index, item)
}
"text/uri-list" => {
let Ok(text) = str::from_utf8(&data) else {