1.1.0-rc.2 (#83)

* reset version to 1.1.0 after merge from rc branch * ci: updated for next branch resolves #80 * bumped rc version * remove initial folder resolves #82 * added extra logging to help diagnose #81 * actually export package description * reformatted * Merge remote-tracking branch 'origin/next' into 1.1.0-rc.2
lilopkins · Dec 11, 2024 · 531e5a8 · 531e5a8
1 parent 0581dfa
commit 531e5a8
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 25 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - next
 
 env:
   EXECUTABLE_NAME: evidenceangel-ui

diff --git a/.github/workflows/check-version-bumped.yaml b/.github/workflows/check-version-bumped.yaml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - next
 
 jobs:
   check-version:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "evidenceangel"
 description = "Library and executables to work with EvidenceAngel evidence packages (*.evp)."
-version = "1.1.0-rc.1"
+version = "1.1.0-rc.2"
 edition = "2021"
 license = "GPL-3.0-or-later"
 authors = [

diff --git a/src/evidenceangel-ui/app.rs b/src/evidenceangel-ui/app.rs
@@ -791,7 +791,6 @@ impl Component for AppModel {
                     .modal(true)
                     .title(lang::lookup("header-save"))
                     .filters(&filter::filter_list(vec![filter::packages()]))
-                    .initial_folder(&gtk::gio::File::for_path("."))
                     .build();
 
                 let sender_c = sender.clone();
@@ -838,7 +837,6 @@ impl Component for AppModel {
                     .modal(true)
                     .title(lang::lookup("header-open"))
                     .filters(&filter::filter_list(vec![filter::packages()]))
-                    .initial_folder(&gtk::gio::File::for_path("."))
                     .build();
 
                 let sender_c = sender.clone();
@@ -1707,19 +1705,29 @@ impl Component for AppModel {
                                 let sender_c = sender.clone();
                                 clipboard.read_texture_async(
                                     Some(&Cancellable::new()),
-                                    move |cb| {
-                                        if let Some(data) = cb.ok().flatten() {
-                                            let media =
-                                                MediaFile::from(data.save_to_png_bytes().to_vec());
-                                            let evidence = Evidence::new(
-                                                EvidenceKind::Image,
-                                                evidenceangel::EvidenceData::Media {
-                                                    hash: media.hash(),
-                                                },
-                                            );
-                                            sender_c.input(AppInput::_AddMedia(media));
-                                            sender_c.input(AppInput::_AddEvidence(evidence, None));
-                                        } else {
+                                    move |cb| match cb {
+                                        Ok(texture) => {
+                                            if let Some(data) = texture {
+                                                let media = MediaFile::from(
+                                                    data.save_to_png_bytes().to_vec(),
+                                                );
+                                                let evidence = Evidence::new(
+                                                    EvidenceKind::Image,
+                                                    evidenceangel::EvidenceData::Media {
+                                                        hash: media.hash(),
+                                                    },
+                                                );
+                                                sender_c.input(AppInput::_AddMedia(media));
+                                                sender_c
+                                                    .input(AppInput::_AddEvidence(evidence, None));
+                                            } else {
+                                                sender_c.input(AppInput::ShowToast(lang::lookup(
+                                                    "paste-evidence-failed",
+                                                )));
+                                            }
+                                        }
+                                        Err(e) => {
+                                            log::warn!("Failed to paste image: {e}");
                                             sender_c.input(AppInput::ShowToast(lang::lookup(
                                                 "paste-evidence-failed",
                                             )));

diff --git a/src/evidenceangel-ui/dialogs/add_evidence.rs b/src/evidenceangel-ui/dialogs/add_evidence.rs
@@ -395,7 +395,6 @@ impl Component for AddImageEvidenceDialogModel {
                     .modal(true)
                     .title(lang::lookup("header-open"))
                     .filters(&filter::filter_list(vec![filter::images()]))
-                    .initial_folder(&gtk::gio::File::for_path("."))
                     .build();
 
                 let sender_c = sender.clone();

diff --git a/src/evidenceangel-ui/dialogs/export.rs b/src/evidenceangel-ui/dialogs/export.rs
@@ -165,7 +165,6 @@ impl Component for ExportDialogModel {
                 let dialog = gtk::FileDialog::builder()
                     .modal(true)
                     .title(lang::lookup("header-open"))
-                    .initial_folder(&gtk::gio::File::for_path("."))
                     .initial_name(self.test_case_name.as_ref().unwrap_or(&self.package_name))
                     .accept_label(lang::lookup("select"))
                     .build();

diff --git a/src/exporters/excel.rs b/src/exporters/excel.rs
@@ -97,6 +97,11 @@ fn create_metadata_sheet(
         worksheet.write_string_with_format(row, 1, format!("{author}"), &italic)?;
     }
 
+    row += 2;
+    if let Some(description) = package.metadata().description() {
+        worksheet.write_string(row, 1, description)?;
+    }
+
     Ok(())
 }
 

diff --git a/src/exporters/html.rs b/src/exporters/html.rs
@@ -51,6 +51,10 @@ impl Exporter for HtmlExporter {
                 .child(HtmlElement::new("em").content(&html_escape::encode_text(&authors))),
         );
 
+        if let Some(description) = package.metadata().description() {
+            body.add_child(HtmlElement::new("p").content(&html_escape::encode_text(description)));
+        }
+
         let mut test_cases: Vec<&TestCase> = package.test_case_iter()?.collect();
         test_cases.sort_by(|a, b| {
             a.metadata()
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - main
+          - next
     env:
       EXECUTABLE_NAME: evidenceangel-ui
@@ Expand Down @@