@@ -23,6 +23,8 @@ import (
23
23
"math/rand" // for debug purposes
24
24
)
25
25
26
+ const VERSION = "0.3"
27
+
26
28
var debugging = false // if true, debug messages will be shown
27
29
28
30
var (
42
44
output string
43
45
noResume bool
44
46
filter string
47
+ order string
45
48
)
46
49
47
50
// progress bar elements
@@ -87,6 +90,7 @@ func Initialize() {
87
90
flag .BoolVar (& noResume , "no-resume" , false , "If passed, download starts again, else the download is resumed" )
88
91
89
92
flag .StringVar (& filter , "filter" , "" , "Filter all pages by some attributes" )
93
+ flag .StringVar (& order , "order" , "" , "Order by some attributes" )
90
94
91
95
flag .Usage = usage
92
96
flag .Parse ()
@@ -95,6 +99,7 @@ func Initialize() {
95
99
password = strings .TrimSpace (password )
96
100
output = strings .TrimSpace (output )
97
101
filter = strings .TrimSpace (filter )
102
+ order = strings .TrimSpace (order )
98
103
99
104
// Check for non-valid flags
100
105
usernameIsNull := username == ""
@@ -394,18 +399,25 @@ MainLoop:
394
399
}
395
400
}
396
401
402
+ func version () {
403
+ fmt .Fprintln (os .Stderr , "Audisto Data Downloader, Version " + VERSION )
404
+ }
405
+
397
406
func usage () {
398
- fmt .Fprintf (os .Stderr , `usage: data-downloader [options]
407
+ version ()
408
+ fmt .Fprintf (os .Stderr , `
409
+ usage: data-downloader [options]
399
410
400
411
Parameters:
401
412
-username=[USERNAME] API Username (required)
402
413
-password=[PASSWORD] API Password (required)
403
414
-crawl=[ID] ID of the crawl to download (required)
404
415
-output=[FILE] Path for the output file
405
416
If missing the data will be send to the terminal (stdout)
406
- -no-details If passed, details in API request is set to 0 else
417
+ -no-details If passed, details in API request is set to 0 else to 1
407
418
-no-resume If passed, download starts again, else the download is resumed
408
- -filter=[FILTER] If passed, all pages are filtered by given FILTER
419
+ -filter=[FILTER] If passed, all pages are filtered by given FILTER./bui
420
+ -order=[ORDER] If passed, all pages are ordered by given ORDER
409
421
` )
410
422
}
411
423
@@ -533,6 +545,9 @@ func (r *Resumer) nextChunk() ([]byte, int, int64, error) {
533
545
if filter != "" {
534
546
queryParameters .Add ("filter" , filter )
535
547
}
548
+ if order != "" {
549
+ queryParameters .Add ("order" , order )
550
+ }
536
551
queryParameters .Add ("chunk" , strconv .FormatInt (nextChunkNumber , 10 ))
537
552
queryParameters .Add ("chunk_size" , strconv .FormatInt (r .chunkSize , 10 ))
538
553
queryParameters .Add ("output" , "tsv" )
0 commit comments