Merge branch 'master' into release

Dictor · Sep 11, 2020 · 8261fc8 · 8261fc8
2 parents 3d92a4d + f80972f
commit 8261fc8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ With docker-compose:
 version: "3"
   services: 
     webannie:
-      image: imdictor/web-annie
+      image: kimdictor/web-annie
       ports:
         - "8080:80"
       volumes:

diff --git a/main.go b/main.go
@@ -108,5 +108,5 @@ func main() {
 			return c.JSON(http.StatusOK, map[string]int{"count": deleteCnt})
 		}
 	})
-	e.Logger.Fatal(e.Start(":80"))
+	e.Logger.Fatal(e.Start(CurrentConfig.ListenAddress))
 }
diff --git a/model.go b/model.go
@@ -9,12 +9,16 @@ type (
 		HttpProxy         bool   `yaml:"http_proxy"`
 		HttpProxyAddress  string `yaml:"http_proxy_address"`
 		DownloadDirectory string `yaml:"download_path"`
+		ListenAddress string `yaml:"listen_address"`
+		IgnoreExitError bool `yaml:"ignore_exit_error"`
 	}
 )
 
 var (
 	DefaultConfig Config = Config{
 		HttpProxy:         false,
 		DownloadDirectory: "./download",
+		ListenAddress: ":80",
+		IgnoreExitError: false,
 	}
 )
diff --git a/static/style.css b/static/style.css
@@ -33,10 +33,12 @@ body {
 
 .task-name {
 	margin-right: auto;
+	overflow-x: auto;
 }
 
 .task-name p {
 	margin-bottom: 0;
+	word-break: break-word;
 }
 
 .task-name-address {
@@ -50,7 +52,7 @@ body {
 }
 
 .task-progress {
-	width: 110px;
+	min-width: 7rem;
 }
 
 .task-progress p {
@@ -68,6 +70,7 @@ body {
 }
 
 .task-control {
+	min-width: 5.5rem;
 }
 
 .task-control button {

diff --git a/task.go b/task.go
@@ -110,7 +110,11 @@ func (t *Task) Start() {
 		log.WriteString(exitString)
 		t.Info += exitString
 
-		t.Status = TASK_STATUS_COMPLETE
+		if !CurrentConfig.IgnoreExitError && !cmd.ProcessState.Success() {
+			t.Status = TASK_STATUS_FAIL
+		} else {
+			t.Status = TASK_STATUS_COMPLETE
+		}
 	}()
 }