Fix lints, fix GTK deprecation and release 1.4.1

martinber · martinber · commit 48a9eb8321f7 · 2023-11-29T23:23:48.000-03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "noaa-apt"
-version = "1.4.0"
+version = "1.4.1"
 authors = ["Martin Bernardi <martinber.710@gmail.com>"]
 edition = "2018"
 build = "src/build.rs"
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,14 @@
+noaa-apt (1.4.1-1) testing; urgency=medium
+
+  * Add a more descriptive error message when loading files with incorrect
+    lengths in the header.
+  * Added the run-noaa-apt.sh script to all builds for launching the program
+    using double-click.
+  * Added a simple manpage for the Debian package version.
+  * Updated dependencies.
+
+ -- Martin Bernardi <martin@mbernardi.com.ar>  Wed, 29 Nov 2023 21:55:33 -0300
+
 noaa-apt (1.4.0-1) testing; urgency=medium
 
   * New false color method based on palettes.
diff --git a/docs/download.md b/docs/download.md
@@ -29,7 +29,7 @@ After downloading and installing, visit [the Usage page](./usage.html).
     an "Install" button. Otherwise open a terminal and install it by running:
 
     ```
-    sudo apt install ~/Downloads/noaa-apt_1.4.0-1_amd64.deb
+    sudo apt install ~/Downloads/noaa-apt_1.4.1-1_amd64.deb
     ```
 
     To run, search for noaa-apt in your installed programs or run `noaa-apt` in
@@ -139,11 +139,11 @@ installed what you need:
 My builds use a statically linked libssl, so you don't need libssl unless you
 compiled noaa-apt yourself.
 
-[amd64_deb]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt_1.4.0-1_amd64.deb
-[x86_64_windows_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt-1.4.0-x86_64-windows-gnu.zip
-[x86_64_linux_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt-1.4.0-x86_64-linux-gnu.zip
-[x86_64_linux_gnu_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt-1.4.0-x86_64-linux-gnu-nogui.zip
-[armv7_linux_gnueabihf_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt-1.4.0-armv7-linux-gnueabihf.zip
-[armv7_linux_gnueabihf_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt-1.4.0-armv7-linux-gnueabihf-nogui.zip
-[aarch64_linux_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt-1.4.0-aarch64-linux-gnu.zip
-[aarch64_linux_gnu_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.0/noaa-apt-1.4.0-aarch64-linux-gnu-nogui.zip
+[amd64_deb]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt_1.4.1-1_amd64.deb
+[x86_64_windows_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt-1.4.1-x86_64-windows-gnu.zip
+[x86_64_linux_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt-1.4.1-x86_64-linux-gnu.zip
+[x86_64_linux_gnu_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt-1.4.1-x86_64-linux-gnu-nogui.zip
+[armv7_linux_gnueabihf_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt-1.4.1-armv7-linux-gnueabihf.zip
+[armv7_linux_gnueabihf_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt-1.4.1-armv7-linux-gnueabihf-nogui.zip
+[aarch64_linux_gnu_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt-1.4.1-aarch64-linux-gnu.zip
+[aarch64_linux_gnu_nogui_zip]: https://github.com/martinber/noaa-apt/releases/download/v1.4.1/noaa-apt-1.4.1-aarch64-linux-gnu-nogui.zip
diff --git a/docs/version_check b/docs/version_check
@@ -1 +1 @@
-1.4.0
+1.4.1
diff --git a/src/gui/gui.rs b/src/gui/gui.rs
@@ -582,7 +582,7 @@ fn build_system_menu(widgets: &Widgets) {
         {
             dialog.connect_activate_link(|dialog, url| {
                 misc::open_in_browser(dialog, url).expect("Failed to open link");
-                return gtk::Inhibit(true); // Override `show_uri_on_window`
+                return Propagation::Stop; // Override `show_uri_on_window`
             });
         }
 
diff --git a/src/gui/work.rs b/src/gui/work.rs
@@ -66,7 +66,7 @@ pub fn decode() {
                                 let local_time = time.with_timezone(&chrono::Local);
                                 // GTK counts months from 0 to 11. Years and days are fine
                                 widgets.p_calendar.select_month(
-                                    local_time.month0() as u32,
+                                    local_time.month0(),
                                     local_time.year() as u32,
                                 );
                                 widgets.p_calendar.select_day(local_time.day());
@@ -91,7 +91,7 @@ pub fn decode() {
                                 let local_time = time.with_timezone(&chrono::Local);
                                 // GTK counts months from 0 to 11. Years and days are fine
                                 widgets.p_calendar.select_month(
-                                    local_time.month0() as u32,
+                                    local_time.month0(),
                                     local_time.year() as u32,
                                 );
                                 widgets.p_calendar.select_day(local_time.day());
diff --git a/src/misc.rs b/src/misc.rs
@@ -84,7 +84,7 @@ fn fetch_versions(current: &str) -> err::Result<(Version, Version)> {
         "https://noaa-apt.mbernardi.com.ar/version_check?{}",
         current
     );
-    let latest = reqwest::blocking::get(&addr)?.text()?;
+    let latest = reqwest::blocking::get(addr)?.text()?;
     let latest_version = Version::parse(latest.trim_end_matches('\n'))?;
     Ok((current_version, latest_version))
 }
diff --git a/src/program.rc b/src/program.rc
@@ -1,20 +1,20 @@
 id ICON "icon.ico"
 1 VERSIONINFO
-FILEVERSION     1,4,0,0
-PRODUCTVERSION  1,4,0,0
+FILEVERSION     1,4,1,0
+PRODUCTVERSION  1,4,1,0
 BEGIN
 BLOCK "StringFileInfo"
 BEGIN
     BLOCK "040904E4"
     BEGIN
         VALUE "CompanyName", "Martin Bernardi"
         VALUE "FileDescription", "noaa-apt image decoder"
-        VALUE "FileVersion", "1.4.0"
+        VALUE "FileVersion", "1.4.1"
         VALUE "InternalName", "noaa-apt"
         VALUE "LegalCopyright", "Martin Bernardi"
         VALUE "OriginalFilename", "noaa-apt.exe"
         VALUE "ProductName", "noaa-apt"
-        VALUE "ProductVersion", "1.4.0"
+        VALUE "ProductVersion", "1.4.1"
     END
 END
 BLOCK "VarFileInfo"

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ fn build_system_menu(widgets: &Widgets) {`
`582`	`582`	`{`
`583`	`583`	`dialog.connect_activate_link(\|dialog, url\| {`
`584`	`584`	`misc::open_in_browser(dialog, url).expect("Failed to open link");`
`585`		- return gtk::Inhibit(true); // Override `show_uri_on_window`
	`585`	+ return Propagation::Stop; // Override `show_uri_on_window`
`586`	`586`	`});`
`587`	`587`	`}`
`588`	`588`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ fn fetch_versions(current: &str) -> err::Result<(Version, Version)> {`
`84`	`84`	`"https://noaa-apt.mbernardi.com.ar/version_check?{}",`
`85`	`85`	`current`
`86`	`86`	`);`
`87`		`- let latest = reqwest::blocking::get(&addr)?.text()?;`
	`87`	`+ let latest = reqwest::blocking::get(addr)?.text()?;`
`88`	`88`	`let latest_version = Version::parse(latest.trim_end_matches('\n'))?;`
`89`	`89`	`Ok((current_version, latest_version))`
`90`	`90`	`}`