Added --anyways/-a flag for forcing archival even when there is a recent snapshot.

Author: jaytaylor

capture.go

@@ -27,6 +27,7 @@ var (
 
 // Config settings for page capture client behavior.
 type Config struct {
+	Anyway         bool          // Force archival even if there is already a recent snapshot of the page.
 	Wait           bool          // Wait until the crawl has been completed.
 	WaitTimeout    time.Duration // Max time to wait for crawl completion.  Default is unlimited.
 	PollInterval   time.Duration // Interval between crawl completion checks.  Defaults to 5s.
@@ -43,6 +44,7 @@ func Capture(u string, cfg ...Config) (string, error) {
 
 	var (
 		submitID string
+		anyway   string
 		body     []byte
 		resp     *http.Response
 		final    string
@@ -56,7 +58,11 @@ func Capture(u string, cfg ...Config) (string, error) {
 		return "", err
 	}
 
-	content := fmt.Sprintf("submitid=%v&url=%v", url.QueryEscape(submitID), url.QueryEscape(u))
+	if len(cfg) > 0 && cfg[0].Anyway {
+		anyway = "&anyway=1"
+	}
+
+	content := fmt.Sprintf("submitid=%v&url=%v%v", url.QueryEscape(submitID), url.QueryEscape(u), anyway)
 
 	resp, body, err = doRequest("POST", BaseURL+"/submit/", ioutil.NopCloser(bytes.NewBufferString(content)), timeout)
 	if err != nil {

cmd/archive.is/main.go

@@ -17,6 +17,7 @@ var (
 	RequestTimeout time.Duration = archiveis.DefaultRequestTimeout
 	PollInterval   time.Duration = archiveis.DefaultPollInterval
 	WaitTimeout    time.Duration = time.Duration(0)
+	Anyway         bool
 	submitID       string
 )
 
@@ -27,6 +28,7 @@ func init() {
 	rootCmd.PersistentFlags().DurationVarP(&RequestTimeout, "request-timeout", "r", RequestTimeout, "Timeout duration for HTTP requests")
 	rootCmd.PersistentFlags().DurationVarP(&PollInterval, "poll-interval", "p", PollInterval, "Poll interval, only applies when -w/--wait is active")
 	rootCmd.PersistentFlags().DurationVarP(&WaitTimeout, "wait-timeout", "", WaitTimeout, "Maximum wait duration, only applies when -w/--wait is active (default: infinite)")
+	rootCmd.PersistentFlags().BoolVarP(&Anyway, "anyway", "a", false, "Force archival even if there is already a recent snapshot of the page")
 	rootCmd.PersistentFlags().StringVarP(&archiveis.BaseURL, "base-url", "b", archiveis.BaseURL, "Archive.is server base URL address")
 	rootCmd.PersistentFlags().StringVarP(&archiveis.HTTPHost, "http-host", "", archiveis.HTTPHost, "'Host' header to use")
 	rootCmd.PersistentFlags().StringVarP(&archiveis.UserAgent, "user-agent", "u", archiveis.UserAgent, "'User-Agent' header to use")
@@ -49,6 +51,7 @@ var rootCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg := archiveis.Config{
+			Anyway:   Anyway,
 			Wait:     Wait,
 			SubmitID: submitID,
 		}