Merge pull request #26 from spiegel-im-spiegel/update-packages

debug
goark · Jan 16, 2021 · d572a87 · d572a87
2 parents 5130c8e + 6fdb455
commit d572a87
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,8 +1,6 @@
 name: lint
 on:
   push:
-    tags:
-      - v*
     branches:
       - master
   pull_request:

diff --git a/.github/workflows/vulns.yml b/.github/workflows/vulns.yml
@@ -1,8 +1,6 @@
 name: vulns
 on:
   push:
-    tags:
-      - v*
     branches:
       - master
   pull_request:

diff --git a/facade/facade.go b/facade/facade.go
@@ -48,8 +48,8 @@ func newRootCmd(ui *rwi.RWI, args []string) *cobra.Command {
 				return debugPrint(ui, err)
 			}
 
-			//log size
-			log, err := cmd.Flags().GetInt("log")
+			//history log
+			log, err := cmd.Flags().GetInt("log") //log size
 			if err != nil {
 				return debugPrint(ui, err)
 			}
@@ -61,10 +61,14 @@ func newRootCmd(ui *rwi.RWI, args []string) *cobra.Command {
 					_ = ui.OutputErrln(err)
 				}
 			}
+			defer func() {
+				if err := hist.Save(); err != nil {
+					_ = debugPrint(ui, err)
+				}
+			}()
 
 			//set options
 			opts := options.New(style, hist)
-
 			if interactiveFlag {
 				//interactive mode
 				if err := interactive.Do(opts); err != nil {
@@ -74,35 +78,41 @@ func newRootCmd(ui *rwi.RWI, args []string) *cobra.Command {
 				//command line
 				ctx := signal.Context(context.Background(), os.Interrupt)
 				if len(args) > 0 {
+					var lastErr error
 					for _, arg := range args {
-						r, err := opts.MakeLink(ctx, arg)
-						if err != nil {
-							return debugPrint(ui, err)
-						}
-						if err := ui.WriteFrom(r); err != nil {
-							return debugPrint(ui, err)
+						if r, err := opts.MakeLink(ctx, arg); err != nil {
+							_ = ui.OutputErrln(err)
+							lastErr = err
+						} else if err := ui.WriteFrom(r); err != nil {
+							_ = ui.OutputErrln(err)
+							lastErr = err
+						} else {
+							_ = ui.Outputln()
 						}
-						_ = ui.Outputln()
+					}
+					if lastErr != nil {
+						return debugPrint(ui, lastErr)
 					}
 				} else {
+					var lastErr error
 					scanner := bufio.NewScanner(ui.Reader())
 					for scanner.Scan() {
-						r, err := opts.MakeLink(ctx, scanner.Text())
-						if err != nil {
-							return debugPrint(ui, err)
-						}
-						if err := ui.WriteFrom(r); err != nil {
-							return debugPrint(ui, err)
+						if r, err := opts.MakeLink(ctx, scanner.Text()); err != nil {
+							_ = ui.OutputErrln(err)
+							lastErr = err
+						} else if err := ui.WriteFrom(r); err != nil {
+							_ = ui.OutputErrln(err)
+							lastErr = err
+						} else {
+							_ = ui.Outputln()
 						}
-						_ = ui.Outputln()
 					}
-					return scanner.Err()
+					if lastErr != nil {
+						return debugPrint(ui, lastErr)
+					}
+					return debugPrint(ui, scanner.Err())
 				}
 			}
-
-			if err := hist.Save(); err != nil {
-				return debugPrint(ui, err)
-			}
 			return nil
 		},
 	}