From aa7cdf46e06ad8fff961ea3c33a5bf5489760aa6 Mon Sep 17 00:00:00 2001
From: lifegpc <g1710431395@gmail.com>
Date: Fri, 6 Oct 2023 05:15:06 +0000
Subject: [PATCH] Update

---
 .github/workflows/CI.yml            |  1 +
 .github/workflows/docker.yml        |  6 +++++-
 .github/workflows/github-pages.yaml |  1 +
 docker-compose.yml                  | 11 +++++++++++
 src/opthelper.rs                    |  3 +++
 src/opts.rs                         |  9 +++++++++
 6 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 docker-compose.yml

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 50801b2..6126f69 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [ master ]
     paths-ignore:
+      - '.github/workflows/docker.yml'
       - '.github/workflows/github-pages.yaml'
       - 'doc/**'
       - Dockerfile
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fbeeda2..23ed2ef 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,11 +4,15 @@ on:
   push:
     branches: [ "master" ]
     paths-ignore:
-      - '.github/workflows/CI.yaml'
+      - '.github/workflows/CI.yml'
       - '.github/workflows/github-pages.yaml'
       - 'doc/**'
       - README.md
 
+concurrency:
+  group: "docker"
+  cancel-in-progress: false
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml
index 32def13..f89a65c 100644
--- a/.github/workflows/github-pages.yaml
+++ b/.github/workflows/github-pages.yaml
@@ -9,6 +9,7 @@ on:
     branches: [ "master" ]
     paths-ignore:
       - '.github/workflows/CI.yml'
+      - '.github/workflows/docker.yml'
       - 'doc/**'
       - Dockerfile
       - docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0118576
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  pixiv_downloader:
+    image: lifegpc/pixiv_downloader:master
+    volumes:
+      - ./downloads:/app/downloads
+      - ./data:/app/data
+      - ./tmp:/app/temp
+    ports:
+      - 8080:8080
diff --git a/src/opthelper.rs b/src/opthelper.rs
index 707f41b..6bce67a 100644
--- a/src/opthelper.rs
+++ b/src/opthelper.rs
@@ -397,6 +397,9 @@ impl OptHelper {
             let v = self.settings.get_ref().get("server").unwrap();
             return SocketAddr::from_str(v.as_str().unwrap()).unwrap();
         }
+        #[cfg(feature = "docker")]
+        return SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8080);
+        #[cfg(not(feature = "docker"))]
         SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
     }
 
diff --git a/src/opts.rs b/src/opts.rs
index 2c83719..82a544c 100644
--- a/src/opts.rs
+++ b/src/opts.rs
@@ -16,6 +16,8 @@ use std::net::SocketAddr;
 use std::num::ParseFloatError;
 use std::num::ParseIntError;
 use std::num::TryFromIntError;
+#[cfg(feature = "docker")]
+use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
 
@@ -205,6 +207,13 @@ impl CommandOpts {
                 None
             }
         } else {
+            #[cfg(feature = "docker")]
+            {
+                let pb = PathBuf::from("/app/data/config.json");
+                if pb.exists() {
+                    return Some(String::from(pb.to_str().unwrap()));
+                }
+            }
             let mut pb = get_exe_path_else_current();
             pb = pb.join("pixiv_downloader.json");
             if pb.exists() {