update ua to chrome v116

sagan · Sep 11, 2023 · d704e64 · d704e64
1 parent 1b897bf
commit d704e64
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/cmd/batchdl/batchdl.go b/cmd/batchdl/batchdl.go
@@ -74,7 +74,7 @@ func init() {
 	command.Flags().BoolVarP(&freeOnly, "free", "", false, "Skip none-free torrent")
 	command.Flags().BoolVarP(&noPaid, "no-paid", "", false, "Skip paid (use bonus points) torrent")
 	command.Flags().BoolVarP(&largestFlag, "largest", "l", false, `Sort site torrents by size in desc order. Equivalent with "--sort size --order desc"`)
-	command.Flags().BoolVarP(&newestFlag, "newest", "n", false, `Download newest torrents of site. Equivalent with "--sort time --order desc --one-page --start-page 0"`)
+	command.Flags().BoolVarP(&newestFlag, "newest", "n", false, `Download newest torrents of site. Equivalent with "--sort time --order desc --one-page"`)
 	command.Flags().BoolVarP(&addRespectNoadd, "add-respect-noadd", "", false, "Used with '--action add'. Check and respect _noadd flag in client")
 	command.Flags().BoolVarP(&nohr, "no-hr", "", false, "Skip torrent that has any type of HnR (Hit and Run) restriction")
 	command.Flags().BoolVarP(&allowBreak, "break", "", false, "Break (stop finding more torrents) if all torrents of current page do not meet criterion")

diff --git a/cmd/show/show.go b/cmd/show/show.go
@@ -28,7 +28,7 @@ If no flags or args are provided, it will display current active torrents.`,
 }
 
 var (
-	largest          bool
+	largestFlag      bool
 	showTrackers     bool
 	showFiles        bool
 	showInfoHashOnly bool
@@ -46,7 +46,7 @@ var (
 
 func init() {
 	command.Flags().Int64VarP(&maxTorrents, "max-torrents", "", 0, "Show at most this number of torrents. Default (0) == unlimited")
-	command.Flags().BoolVarP(&largest, "largest", "l", false, "Show largest torrents first. Equavalent with '--sort size --order desc'")
+	command.Flags().BoolVarP(&largestFlag, "largest", "l", false, "Show largest torrents first. Equavalent with '--sort size --order desc'")
 	command.Flags().BoolVarP(&showAll, "all", "a", false, "Show all torrents. Equavalent with pass a '_all' arg")
 	command.Flags().BoolVarP(&showRaw, "raw", "", false, "Show torrent size in raw format")
 	command.Flags().BoolVarP(&showJson, "json", "", false, "Show output in json format")
@@ -76,7 +76,7 @@ func show(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to create client: %v", err)
 	}
 	desc := false
-	if largest {
+	if largestFlag {
 		sortFlag = "size"
 		desc = true
 	}

diff --git a/cmd/status/status.go b/cmd/status/status.go
@@ -24,6 +24,8 @@ var (
 	showAll        = false
 	showAllClients = false
 	showAllSites   = false
+	largestFlag    = false
+	newestFlag     = false
 )
 
 var command = &cobra.Command{
@@ -46,11 +48,16 @@ func init() {
 	command.Flags().BoolVarP(&showAllSites, "sites", "s", false, "Show all sites")
 	command.Flags().BoolVarP(&showTorrents, "torrents", "t", false, "Show torrents (active torrents for client / latest torrents for site)")
 	command.Flags().BoolVarP(&showFull, "full", "f", false, "Show full info of each client or site")
+	command.Flags().BoolVarP(&largestFlag, "largest", "l", false, `Sort site torrents by size in desc order"`)
+	command.Flags().BoolVarP(&newestFlag, "newest", "n", false, `Sort site torrents by time in desc order (newest first)"`)
 	cmd.RootCmd.AddCommand(command)
 }
 
 func status(cmd *cobra.Command, args []string) error {
 	names := args
+	if largestFlag && newestFlag {
+		return fmt.Errorf("--largest and --newest flags are NOT compatible")
+	}
 	if showAll || showAllClients || showAllSites {
 		if len(args) > 0 {
 			return fmt.Errorf("--all, --clients, --sites flags cann't be used with site or client names")
@@ -194,6 +201,15 @@ func status(cmd *cobra.Command, args []string) error {
 			}
 			if response.SiteTorrents != nil {
 				fmt.Printf("\n")
+				if largestFlag {
+					sort.Slice(response.SiteTorrents, func(i, j int) bool {
+						return response.SiteTorrents[i].Size > response.SiteTorrents[j].Size
+					})
+				} else if newestFlag {
+					sort.Slice(response.SiteTorrents, func(i, j int) bool {
+						return response.SiteTorrents[i].Time > response.SiteTorrents[j].Time
+					})
+				}
 				site.PrintTorrents(response.SiteTorrents, filter, now, false, dense)
 				if i != len(responses)-1 {
 					fmt.Printf("\n")

diff --git a/util/net.go b/util/net.go
@@ -21,15 +21,15 @@ var (
 		"Accept-Language":           "en-US,en;q=0.9",
 		"Cache-Control":             "max-age=0",
 		"Connection":                "keep-alive",
-		"sec-ch-ua":                 `"Not/A)Brand";v="99", "Google Chrome";v="115", "Chromium";v="115"`,
+		"sec-ch-ua":                 `"Chromium";v="116", "Not)A;Brand";v="24", "Google Chrome";v="116"`,
 		"sec-ch-ua-mobile":          "?0",
 		"sec-ch-ua-platform":        `"Windows"`,
 		"Sec-Fetch-Dest":            "document",
 		"Sec-Fetch-Mode":            "navigate",
 		"Sec-Fetch-Site":            "none",
 		"Sec-Fetch-User":            "?1",
 		"Upgrade-Insecure-Requests": "1",
-		"User-Agent":                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36",
+		"User-Agent":                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
 	}
 )