Skip to content

Commit 8831b9d

Browse files
mawilmsmawilms
authored
Bugfix/version fix (#56)
Contains major bugfixes. The version is now changing when a plugin is installed over the catalog. This release contains changes regarding the new API and major fixes that causes the interactions with the plugins to break.
1 parent 9579867 commit 8831b9d

File tree

8 files changed

+56
-62
lines changed

8 files changed

+56
-62
lines changed

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
![Github testing](https://github.com/mawilms/lembas/actions/workflows/testing.yml/badge.svg)
88
![GitHub issues](https://img.shields.io/github/issues/mawilms/lembas)
9-
[![GitHub license](https://img.shields.io/github/license/mawilms/lembas)](https://github.com/mawilms/lembas/blob/main/LICENSE)
9+
![GitHub downloads](https://img.shields.io/github/downloads/mawilms/lembas/total)
10+
![GitHub Latest version](https://img.shields.io/github/v/release/mawilms/lembas?include_prereleases)
1011

1112
</div>
1213

‎src/core/api_connector.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::collections::HashMap;
77
pub trait APIOperations {
88
async fn fetch_plugins() -> Result<HashMap<String, BasePlugin>, APIError>;
99

10-
async fn fetch_details(title: String) -> Result<DetailsPlugin, APIError>;
10+
async fn fetch_details(plugin_id: i32) -> Result<DetailsPlugin, APIError>;
1111
}
1212

1313
pub struct APIConnector {}
@@ -24,10 +24,10 @@ impl APIOperations for APIConnector {
2424
}
2525
}
2626

27-
async fn fetch_details(title: String) -> Result<DetailsPlugin, APIError> {
27+
async fn fetch_details(plugin_id: i32) -> Result<DetailsPlugin, APIError> {
2828
match reqwest::get(format!(
2929
"https://lembas-backend.herokuapp.com/plugins/{}",
30-
title.to_lowercase()
30+
plugin_id
3131
))
3232
.await
3333
{

‎src/core/installer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl Installer {
156156
.expect("Couldn't find your home directory")
157157
.join("Documents")
158158
.join("The Lord of the Rings Online")
159-
.join("plugins_backup");
159+
.join("PluginsBackup");
160160

161161
if !backup_path.exists() {
162162
create_dir(&backup_path).unwrap();

‎src/core/synchronizer.rs

+5-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ impl Synchronizer {
2424
db_plugins: &HashMap<String, InstalledPlugin>,
2525
) {
2626
for (key, element) in local_plugins {
27-
if let Ok(retrieved_plugin) = APIConnector::fetch_details(element.name.clone()).await {
27+
if !db_plugins.contains_key(key) {
28+
Self::delete_plugin(&element.name).unwrap();
29+
} else if let Ok(retrieved_plugin) =
30+
APIConnector::fetch_details(db_plugins.get(key).unwrap().plugin_id).await
31+
{
2832
if db_plugins.contains_key(key) {
2933
let local_plugin = db_plugins.get(key).unwrap();
3034
if local_plugin.latest_version != retrieved_plugin.base_plugin.latest_version {
@@ -48,12 +52,6 @@ impl Synchronizer {
4852
}
4953
}
5054
}
51-
52-
for (key, element) in db_plugins {
53-
if !local_plugins.contains_key(key) {
54-
Self::delete_plugin(&element.title).unwrap();
55-
}
56-
}
5755
}
5856

5957
pub fn search_local() -> Result<HashMap<String, Information>, Box<dyn Error>> {

‎src/gui/views/catalog.rs

+13-16
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@ impl Catalog {
6464
state.plugins = filerted_plugins;
6565
Command::none()
6666
}
67-
Message::Catalog(index, msg) => {
68-
state.plugins[index].update(msg);
69-
Command::none()
70-
}
67+
Message::Catalog(index, msg) => state.plugins[index]
68+
.update(msg)
69+
.map(move |msg| Message::Catalog(index, msg)),
7170
Message::LoadPlugins => {
7271
Command::perform(APIConnector::fetch_plugins(), Message::LoadedPlugins)
7372
}
@@ -175,7 +174,7 @@ impl Catalog {
175174
let search_plugins = TextInput::new(
176175
input,
177176
"Search plugins...",
178-
&input_value,
177+
input_value,
179178
Message::CatalogInputChanged,
180179
)
181180
.padding(5);
@@ -308,7 +307,7 @@ impl PluginRow {
308307
pub fn update(&mut self, message: RowMessage) -> Command<RowMessage> {
309308
match message {
310309
RowMessage::InstallPressed(plugin) => Command::perform(
311-
APIConnector::fetch_details(plugin.title),
310+
APIConnector::fetch_details(plugin.id),
312311
RowMessage::DetailsFetched,
313312
),
314313

@@ -321,24 +320,22 @@ impl PluginRow {
321320
Command::none()
322321
}
323322
RowMessage::DetailsFetched(fetched_plugin) => {
324-
if fetched_plugin.is_ok() {
325-
let plugin = fetched_plugin.unwrap();
326-
if Installer::download(&plugin).is_ok() {
327-
self.status = "Downloaded".to_string();
328-
if Installer::extract(&plugin).is_ok() {
329-
self.status = "Unpacked".to_string();
330-
Installer::delete_cache_folder(&plugin);
331-
if Synchronizer::insert_plugin(&plugin).is_ok() {
323+
if let Ok(fetched_plugin) = fetched_plugin {
324+
if Installer::download(&fetched_plugin).is_ok() {
325+
if Installer::extract(&fetched_plugin).is_ok() {
326+
Installer::delete_cache_folder(&fetched_plugin);
327+
if Synchronizer::insert_plugin(&fetched_plugin).is_ok() {
332328
self.status = "Installed".to_string();
329+
self.current_version = fetched_plugin.base_plugin.latest_version;
333330
} else {
334331
self.status = "Installation failed".to_string();
335332
}
336-
} else {
337-
self.status = "Unpacking failed".to_string();
338333
}
339334
} else {
340335
self.status = "Download failed".to_string();
341336
}
337+
} else {
338+
self.status = "Download failed".to_string();
342339
}
343340
Command::none()
344341
}

‎src/gui/views/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ impl Application for Lembas {
128128
Command::none()
129129
}
130130
Message::PluginAction(msg) => {
131-
state.plugins_view.update(msg);
132-
Command::none()
131+
state.plugins_view.update(msg).map(Message::PluginAction)
133132
}
134133
Message::CatalogAction(msg) => {
135134
state.catalog_view.update(msg).map(Message::CatalogAction)

‎src/gui/views/plugins.rs

+30-31
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ impl Plugins {
7979
match self {
8080
Plugins::Loaded(state) => match message {
8181
PluginMessage::Plugin(index, msg) => {
82-
if let Event::Synchronize = state.plugins[index].update(msg) {
82+
let update_event = state.plugins[index].update(msg);
83+
if let Event::Synchronize = update_event.0 {
8384
let mut plugins: Vec<PluginRow> = Vec::new();
8485
let mut all_plugins: Vec<InstalledPlugin> =
8586
Synchronizer::get_plugins().values().cloned().collect();
@@ -98,7 +99,9 @@ impl Plugins {
9899
}
99100
state.plugins = plugins;
100101
}
101-
Command::none()
102+
update_event
103+
.1
104+
.map(move |msg| PluginMessage::Plugin(index, msg))
102105
}
103106

104107
PluginMessage::RefreshPressed => {
@@ -127,6 +130,7 @@ impl Plugins {
127130
&plugin.latest_version,
128131
&plugin.folder,
129132
));
133+
plugins.sort_by(|a, b| a.title.to_lowercase().cmp(&b.title.to_lowercase()));
130134
}
131135
state.plugins = plugins;
132136
Command::none()
@@ -347,66 +351,61 @@ impl PluginRow {
347351
}
348352
}
349353

350-
pub fn update(&mut self, message: RowMessage) -> Event {
354+
pub fn update(&mut self, message: RowMessage) -> (Event, Command<RowMessage>) {
351355
match message {
352356
RowMessage::ToggleView => {
353357
self.opened = !self.opened;
354-
Event::Nothing
355-
}
356-
RowMessage::UpdatePressed(plugin) => {
357-
Command::perform(
358-
APIConnector::fetch_details(plugin.title),
359-
RowMessage::Updating,
360-
);
361-
Event::Nothing
362-
}
363-
RowMessage::DeletePressed(row) => {
364-
Command::perform(APIConnector::fetch_details(row.title), RowMessage::Deleting);
365-
Event::Nothing
358+
(Event::Nothing, Command::none())
366359
}
360+
RowMessage::UpdatePressed(plugin) => (
361+
Event::Nothing,
362+
Command::perform(APIConnector::fetch_details(plugin.id), RowMessage::Updating),
363+
),
364+
RowMessage::DeletePressed(row) => (
365+
Event::Nothing,
366+
Command::perform(APIConnector::fetch_details(row.id), RowMessage::Deleting),
367+
),
367368
RowMessage::WebsitePressed(id, title) => {
368369
webbrowser::open(&format!(
369370
"https://www.lotrointerface.com/downloads/info{}-{}.html",
370371
id, title,
371372
))
372373
.unwrap();
373-
Event::Nothing
374+
(Event::Nothing, Command::none())
374375
}
375376
RowMessage::Updating(fetched_plugin) => {
376377
if let Ok(fetched_plugin) = fetched_plugin {
377378
if Installer::download(&fetched_plugin).is_ok() {
378-
self.status = "Downloaded".to_string();
379379
if Installer::delete(
380380
&fetched_plugin.base_plugin.folder,
381381
&fetched_plugin.files,
382382
)
383383
.is_ok()
384384
{
385385
if Installer::extract(&fetched_plugin).is_ok() {
386-
self.status = "Unpacked".to_string();
387386
Installer::delete_cache_folder(&fetched_plugin);
388387
if Synchronizer::insert_plugin(&fetched_plugin).is_ok() {
389-
self.status = "Installed".to_string();
390-
Event::Synchronize
388+
self.status = "Updated".to_string();
389+
(Event::Synchronize, Command::none())
391390
} else {
392-
self.status = "Install failed".to_string();
393-
Event::Nothing
391+
self.status = "Update failed".to_string();
392+
(Event::Nothing, Command::none())
394393
}
395394
} else {
396395
self.status = "Unpacking failed".to_string();
397-
Event::Nothing
396+
(Event::Nothing, Command::none())
398397
}
399398
} else {
400399
self.status = "Installation failed".to_string();
401-
Event::Nothing
400+
(Event::Nothing, Command::none())
402401
}
403402
} else {
404403
self.status = "Download failed".to_string();
405-
Event::Nothing
404+
(Event::Nothing, Command::none())
406405
}
407406
} else {
408-
self.status = "Download failed".to_string();
409-
Event::Nothing
407+
self.status = "Update failed".to_string();
408+
(Event::Nothing, Command::none())
410409
}
411410
}
412411
RowMessage::Deleting(fetched_plugin) => {
@@ -416,18 +415,18 @@ impl PluginRow {
416415
{
417416
if Synchronizer::delete_plugin(&fetched_plugin.base_plugin.title).is_ok() {
418417
self.status = "Deleted".to_string();
419-
Event::Synchronize
418+
(Event::Synchronize, Command::none())
420419
} else {
421420
self.status = "Delete failed".to_string();
422-
Event::Nothing
421+
(Event::Nothing, Command::none())
423422
}
424423
} else {
425424
self.status = "Delete failed".to_string();
426-
Event::Nothing
425+
(Event::Nothing, Command::none())
427426
}
428427
} else {
429428
self.status = "Delete failed".to_string();
430-
Event::Nothing
429+
(Event::Nothing, Command::none())
431430
}
432431
}
433432
}

‎src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![warn(clippy::all, clippy::pedantic)]
22
#![allow(clippy::too_many_lines)]
3-
//#![windows_subsystem = "windows"]
3+
#![windows_subsystem = "windows"]
44

55
mod core;
66
mod gui;

0 commit comments

Comments
 (0)