Replace nwg with azul

Author: fenhl

Cargo.lock

@@ -1,7 +1,8 @@
 [package]
 name = "lore-seeker"
-version = "0.0.2"
+version = "0.0.3"
 authors = ["Fenhl <fenhl@fenhl.net>"]
+edition = "2018"
 
 [lib]
 name = "lore_seeker_desktop"
@@ -10,31 +11,27 @@ path = "src/lib.rs"
 [[bin]]
 name = "install-cockatrice"
 path = "src/bin/install-cockatrice.rs"
-doc = false
 test = false
 bench = false
 
 [[bin]]
-name = "lore-seeker-windows"
+name = "lore-seeker-desktop"
 path = "src/main.rs"
-doc = false
 test = false
 bench = false
 
 [[bin]]
 name = "lore-seeker-release"
 path = "src/bin/release.rs"
-doc = false
 test = false
 bench = false
 
-[build-dependencies]
+[target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
 
 [dependencies]
 cargo_metadata = "*"
 itertools = "*"
-native-windows-gui = "0.2.0"
 open = "*"
 reqwest = "*"
 semver = "*"
@@ -44,3 +41,6 @@ serde_json = "1.0"
 tempfile = "*"
 urlencoding = "*"
 wrapped_enum = "*"
+
+[dependencies.azul]
+git = "https://github.com/maps4print/azul"

Cargo.toml

@@ -1,5 +1,3 @@
-extern crate winres;
-
 use std::{
     fs::File,
     io::{
@@ -8,6 +6,7 @@ use std::{
     },
     process::Command
 };
+#[cfg(windows)]
 use winres::WindowsResource;
 
 /// Modified from <https://stackoverflow.com/questions/43753491/include-git-commit-hash-as-string-into-rust-program>

build.rs

@@ -2,8 +2,6 @@
 #![deny(unused, unused_qualifications)]
 #![forbid(unused_import_braces)]
 
-extern crate lore_seeker_desktop;
-
 use lore_seeker_desktop::trice;
 
 fn main() -> Result<(), trice::Error> {

src/bin/install-cockatrice.rs

@@ -2,11 +2,6 @@
 #![deny(unused, unused_qualifications)]
 #![forbid(unused_import_braces)]
 
-extern crate cargo_metadata;
-extern crate lore_seeker_desktop;
-extern crate reqwest;
-extern crate semver;
-extern crate tempfile;
 #[macro_use] extern crate wrapped_enum;
 
 use std::{
@@ -23,10 +18,7 @@ use semver::{
     Version
 };
 use lore_seeker_desktop::{
-    github::{
-        self,
-        Repo
-    },
+    github::Repo,
     util
 };
 
@@ -42,7 +34,6 @@ wrapped_enum! {
     #[derive(Debug)]
     enum Error {
         Cargo(cargo_metadata::Error),
-        GitHub(github::Error),
         Io(io::Error),
         Other(OtherError),
         ReleaseClient(util::ReleaseClientError),
@@ -55,15 +46,16 @@ fn main() -> Result<(), Error> {
     //TODO make sure working dir is clean and on master and up to date with remote and remote is up to date. Alternatively, make sure we're on gitdir master and up to date
     let repo = Repo::new("fenhl", "lore-seeker-desktop");
     let client = util::release_client()?;
-    let local_version = cargo_metadata::metadata(None)?.packages.first().ok_or(OtherError::MissingPackage)?.version.parse::<Version>()?;
+    let metadata = cargo_metadata::MetadataCommand::default().exec()?;
+    let local_version = &metadata.packages.first().ok_or(OtherError::MissingPackage)?.version;
     let remote_version = repo.latest_release(&client)?.tag_name[1..].parse::<Version>()?;
     match local_version.cmp(&remote_version) {
         Less => { return Err(OtherError::VersionRegression.into()); }
         Equal => { return Err(OtherError::SameVersion.into()); }
-        Greater => ()
+        Greater => {}
     }
-    if !Command::new("cargo").arg("build").arg("--bin=lore-seeker-windows").arg("--release").status()?.success() { return Err(OtherError::Command.into()); }
-    if !Command::new("cargo").arg("+stable-i686-pc-windows-msvc").arg("build").arg("--bin=lore-seeker-windows").arg("--release").arg("--target-dir=target-x86").status()?.success() { return Err(OtherError::Command.into()); }
+    if !Command::new("cargo").arg("build").arg("--bin=lore-seeker-desktop").arg("--release").status()?.success() { return Err(OtherError::Command.into()); }
+    if !Command::new("cargo").arg("+stable-i686-pc-windows-msvc").arg("build").arg("--bin=lore-seeker-desktop").arg("--release").arg("--target-dir=target-x86").status()?.success() { return Err(OtherError::Command.into()); }
     let release_notes = {
         let mut release_notes_file = tempfile::Builder::new()
             .prefix("lore-seeker-desktop-release-notes")
@@ -75,8 +67,8 @@ fn main() -> Result<(), Error> {
         buf
     };
     let release = repo.create_release(&client, format!("Lore Seeker Desktop {}", local_version), format!("v{}", local_version), release_notes)?;
-    repo.release_attach(&client, &release, "lore-seeker-windows-64bit.exe", "application/vnd.microsoft.portable-executable", File::open("target/release/lore-seeker-windows.exe")?)?;
-    repo.release_attach(&client, &release, "lore-seeker-windows-32bit.exe", "application/vnd.microsoft.portable-executable", File::open("target-x86/release/lore-seeker-windows.exe")?)?;
+    repo.release_attach(&client, &release, "lore-seeker-windows-64bit.exe", "application/vnd.microsoft.portable-executable", File::open("target/release/lore-seeker-desktop.exe")?)?;
+    repo.release_attach(&client, &release, "lore-seeker-windows-32bit.exe", "application/vnd.microsoft.portable-executable", File::open("target-x86/release/lore-seeker-desktop.exe")?)?;
     repo.publish_release(&client, release)?;
     Ok(())
 }

src/bin/release.rs

@@ -2,32 +2,8 @@
 
 #![allow(missing_docs)] //TODO
 
-use std::fmt;
-use reqwest;
-
-/// An error that can occur in the GitHub API.
-#[derive(Debug)]
-pub enum Error {
-    /// An error occurred in the `reqwest` crate.
-    Reqwest(reqwest::Error),
-    /// The latest release's tag name is not listed in the repo's tags.
-    TagNotFound
-}
-
-impl From<reqwest::Error> for Error {
-    fn from(e: reqwest::Error) -> Error {
-        Error::Reqwest(e)
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            Error::Reqwest(ref e) => e.fmt(f),
-            Error::TagNotFound => write!(f, "Release tag not found.")
-        }
-    }
-}
+use serde_derive::Deserialize;
+use serde_json::json;
 
 #[derive(Deserialize)]
 pub struct Release {
@@ -72,7 +48,7 @@ impl Repo {
         }
     }
 
-    pub fn latest_release(&self, client: &reqwest::Client) -> Result<Release, Error> {
+    pub fn latest_release(&self, client: &reqwest::Client) -> Result<Release, reqwest::Error> {
         Ok(
             client.get(&format!("https://api.github.com/repos/{}/{}/releases/latest", self.user, self.name))
                 .send()?
@@ -82,7 +58,7 @@ impl Repo {
     }
 
     /// Creates a draft release, which can be published using `Repo::publish_release`.
-    pub fn create_release(&self, client: &reqwest::Client, name: String, tag_name: String, body: String) -> Result<Release, Error> {
+    pub fn create_release(&self, client: &reqwest::Client, name: String, tag_name: String, body: String) -> Result<Release, reqwest::Error> {
         Ok(
             client.post(&format!("https://api.github.com/repos/{}/{}/releases", self.user, self.name))
                 .json(&json!({
@@ -97,7 +73,7 @@ impl Repo {
         )
     }
 
-    pub fn publish_release(&self, client: &reqwest::Client, release: Release) -> Result<Release, Error> {
+    pub fn publish_release(&self, client: &reqwest::Client, release: Release) -> Result<Release, reqwest::Error> {
         Ok(
             client.patch(&format!("https://api.github.com/repos/{}/{}/releases/{}", self.user, self.name, release.id))
                 .json(&json!({"draft": false}))
@@ -107,7 +83,7 @@ impl Repo {
         )
     }
 
-    pub fn release_attach(&self, client: &reqwest::Client, release: &Release, name: &str, content_type: &'static str, body: impl Into<reqwest::Body>) -> Result<ReleaseAsset, Error> {
+    pub fn release_attach(&self, client: &reqwest::Client, release: &Release, name: &str, content_type: &'static str, body: impl Into<reqwest::Body>) -> Result<ReleaseAsset, reqwest::Error> {
         let mut headers = reqwest::header::HeaderMap::new();
         headers.insert(reqwest::header::CONTENT_TYPE, reqwest::header::HeaderValue::from_static(content_type));
         Ok(
@@ -121,7 +97,7 @@ impl Repo {
         )
     }
 
-    pub fn tags(&self, client: &reqwest::Client) -> Result<Vec<Tag>, Error> {
+    pub fn tags(&self, client: &reqwest::Client) -> Result<Vec<Tag>, reqwest::Error> {
         Ok(
             client.get(&format!("https://api.github.com/repos/{}/{}/tags", self.user, self.name))
                 .send()?

src/github.rs

@@ -5,14 +5,6 @@
 #![deny(missing_docs, unused, unused_qualifications)]
 #![forbid(unused_import_braces)]
 
-extern crate itertools;
-#[cfg(windows)] extern crate native_windows_gui as nwg;
-extern crate reqwest;
-#[macro_use] extern crate serde_derive;
-#[macro_use] extern crate serde_json;
-extern crate tempfile;
-#[macro_use] extern crate wrapped_enum;
-
 pub mod github;
 pub mod trice;
 pub mod update;