ajour · casperstorm · Aug 22, 2020 · Aug 19, 2020 · Aug 19, 2020 · Aug 19, 2020
diff --git a/.github/workflows/commit_to_pr_body.yml b/.github/workflows/commit_to_pr_body.yml
@@ -0,0 +1,14 @@
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+name: Pull Request updated
+
+jobs:
+  history:
+    name: Pull Request Body
+    runs-on: ubuntu-latest
+    if: startsWith(github.event.pull_request.head.ref, 'release/')
+    steps:
+      - name: Pull Request Body
+        uses: technote-space/pr-commit-body-action@v1
diff --git a/.github/workflows/pull_request_template.md b/.github/workflows/pull_request_template.md
@@ -0,0 +1,4 @@
+# Description
+
+<!-- START pr-commits -->
+<!-- END pr-commits -->
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ajour"
 description = "A World of Warcraft addon manager"
-version = "0.1.0-beta2"
+version = "0.1.0-beta3"
 authors = ["Casper Rogild Storm"]
 license = "MIT"
 homepage = "https://github.com/casperstorm/ajour"
@@ -20,3 +20,6 @@ serde_json = "1.0.57"
 isahc = { version = "0.9.6", features = ["json"] }
 zip = "0.5.6"
 percent-encoding = "2.1.0"
+
+[build-dependencies]
+embed-resource = "1.3.3"
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ make app
 make dmg
 
 # Windows
-cargo wix -I .\resources\windows\wix\main.wxs
+cargo build --release
 ```
 
 # Configuration
@@ -58,9 +58,11 @@ Ajour doesn't create the config file for you, but it looks for one in the follow
 
 ## Windows
 
-On Windows, the config file should be located at:
+On Windows, it looks for a config file in the following locations:
 
 - `%APPDATA%\ajour\ajour.yml`
+- `In the same directory as the executable`
+
 
 # Screenshots
 

diff --git a/build.rs b/build.rs
@@ -0,0 +1,6 @@
+extern crate embed_resource;
+
+fn main() {
+    #[cfg(windows)]
+    embed_resource::compile("resources/windows/res.rc");
+}
diff --git a/resources/windows/res.rc b/resources/windows/res.rc
@@ -0,0 +1,3 @@
+#define IDI_ICON 0x101
+
+IDI_ICON ICON "ajour.ico"
diff --git a/resources/windows/wix/main.wxs b/resources/windows/wix/main.wxs
diff --git a/src/addon.rs b/src/addon.rs
@@ -201,6 +201,17 @@ impl Addon {
         dependencies
     }
 
+    /// Takes a `Addon` and updates self.
+    /// Used when we reparse a single `Addon`.
+    pub fn update_addon(&mut self, other: &Addon) {
+        self.title = other.title.clone();
+        self.version = other.version.clone();
+        self.dependencies = other.dependencies.clone();
+        self.wowi_id = other.wowi_id.clone();
+        self.tukui_id = other.tukui_id.clone();
+        self.curse_id = other.curse_id;
+    }
+
     /// Check if the `Addon` is updatable.
     /// We strip both version for non digits, and then
     /// checks if `remote_version` is a sub_slice of `local_version`.

diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -1,4 +1,5 @@
 use serde_derive::Deserialize;
+#[cfg(not(windows))]
 use std::env;
 use std::fs;
 use std::path::PathBuf;
@@ -89,11 +90,26 @@ fn installed_config() -> Option<PathBuf> {
 /// according to the following order:
 ///
 /// 1. %APPDATA%\ajour\ajour.yml
+/// 2. In the same directory as the executable
 #[cfg(windows)]
 fn installed_config() -> Option<PathBuf> {
-    dirs::config_dir()
+    let fallback = dirs::config_dir()
         .map(|path| path.join("ajour\\ajour.yml"))
-        .filter(|new| new.exists())
+        .filter(|new| new.exists());
+    if let Some(fallback) = fallback {
+        return Some(fallback);
+    }
+
+    let fallback = std::env::current_exe();
+    if let Ok(fallback) = fallback.as_ref().map(|p| p.parent()) {
+        if let Some(fallback) = fallback.map(|f| f.join("ajour.yml")) {
+            if fallback.exists() {
+                return Some(fallback);
+            }
+        }
+    }
+
+    None
 }
 
 /// Returns the config after the content of the file

diff --git a/src/fs.rs b/src/fs.rs
@@ -17,26 +17,23 @@ pub async fn install_addon(
     to_directory: &PathBuf,
 ) -> Result<()> {
     let zip_path = from_directory.join(addon.id.clone());
-    // TODO: This sometimes fails: No such file or directory (os error 2).
     let mut zip_file = std::fs::File::open(&zip_path)?;
     let mut archive = zip::ZipArchive::new(&mut zip_file)?;
 
     // TODO: Maybe remove old addon here, so we don't replace.
-
-    for i in 1..archive.len() {
+    for i in 0..archive.len() {
         let mut file = archive.by_index(i)?;
         let path = to_directory.join(file.sanitized_name());
-
-        if file.is_dir() {
-            std::fs::create_dir_all(path)?;
+        if (&*file.name()).ends_with('/') {
+            std::fs::create_dir_all(&path).unwrap();
         } else {
-            let mut target = std::fs::OpenOptions::new()
-                .write(true)
-                .create(true)
-                .truncate(true)
-                .open(path)?;
-
-            std::io::copy(&mut file, &mut target)?;
+            if let Some(p) = path.parent() {
+                if !p.exists() {
+                    std::fs::create_dir_all(&p).unwrap();
+                }
+            }
+            let mut outfile = std::fs::File::create(&path).unwrap();
+            std::io::copy(&mut file, &mut outfile).unwrap();
         }
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#define IDI_ICON 0x101

		IDI_ICON ICON "ajour.ico"