Merge pull request #5 from ZimCodes/clap

Clap.rs Migration

Author: ZimCodes

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -9,10 +9,10 @@ body:
   - type: checkboxes
     id: support_check
     attributes:
-      label: OD Support
+      label: Is OD Support
       description: Is the OD part of the currently supported list?
       options:
-        - label: OD
+        - label: Is supported
           required: true
   - type: input
     id: summary
@@ -31,8 +31,9 @@ body:
   - type: textarea
     id: sources
     attributes:
-      label: Screenshots/Links
-      description: If applicable, add screenshots and/or a link to help explain your problem.'
+      label: References
+      description: If applicable, add references (such as screenshots, links) to help
+      explain your problem.
     validations:
       required: false
   - type: textarea

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,7 @@
 name: Feature Request
 description: Suggest an idea for this project
 title: "New Feature"
-labels: ["enhancement"]
+labels: [ "enhancement" ]
 body:
   - type: input
     id: summary
@@ -10,24 +10,25 @@ body:
       description: Provide a clear and concise description of the issue.
     validations:
       required: true
-- type: textarea
-  id: details
-  attributes:
-    label: Details
-    description: Provide a detailed description of the issue as well as how to reproduce it.
-  validations:
-    required: true
-- type: textarea
-  id: sources
-  attributes:
-    label: Screenshots/Links
-    description: If applicable, add screenshots and/or a link to help explain your problem.'
-  validations:
-    required: false
-- type: textarea
-  id: comments
-  attributes:
-    label: Comments
-    description: Any other information you would like to add?
-  validations:
-    required: false
+  - type: textarea
+    id: details
+    attributes:
+      label: Details
+      description: Provide a detailed description of the issue as well as how to reproduce it.
+    validations:
+      required: true
+  - type: textarea
+    id: sources
+    attributes:
+      label: References
+      description: If applicable, add references (such as screenshots, links) to help explain your
+      problem.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Comments
+      description: Any other information you would like to add?
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/new-od-template.yml

@@ -1,7 +1,7 @@
 name: New OD request
 description: Suggest support for a new Open Directory
 title: "New OD"
-labels: ["new od"]
+labels: [ "new od" ]
 assignees:
   - ZimCodes
 body:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "zeiver"
-version = "0.8.4"
+version = "0.8.5"
 authors = ["ZimCodes <23222943+ZimCodes@users.noreply.github.com>"]
 edition = "2021"
 description = "Web crawler designed to scrape, record, download, & scan content from ODs"
@@ -28,5 +28,6 @@ members = [
 crawler = {path = "./crawler"}
 cmd_opts = {path = "./cmd_opts"}
 logger = {path = "./logger"}
-reqwest = "0.11.4"
+reqwest = "~0.11.4"
 tokio = { version = "1.10.1", features = ["time","rt","macros","rt-multi-thread"] }
+base64 = "~0.13.0"

Cargo.toml

@@ -85,7 +85,7 @@ To **install/update** Zeiver follow these steps:
 The following code downloads files from _example.com/xms/imgs_, saves them in a local directory called _Cool_Content_,
 & sends a request with the ACCEPT-LANGUAGE header.
 
-`zeiver -h "accept-language$fr-CH, en;q=0.8, de;q=0.7" -o "./Cool_Content" example.com/xms/imgs`
+`zeiver -H "accept-language$fr-CH, en;q=0.8, de;q=0.7" -o "./Cool_Content" https://example.com/xms/imgs`
 
 ## Commands 
 ### Positional
@@ -279,10 +279,19 @@ Restrict Zeiver to send all requests through HTTPS connections only.
 
 ***-H, --headers***
 
-Sets the default headers to use for every request. *_Must use the __'header$value'__ format. Each header must also be
-**separated by a comma**._ 
+Sets the default headers to use for every request. *_Must use the __'header$value'__ format. 
+**Can be used multiple times!**
 
-Ex: `zeiver -H content-length$128,"accept$ text/html, application/xhtml+xml, image/webp"`
+Ex: `zeiver -H "accept$ text/html, application/xhtml+xml, image/webp" -H "content-length$128"`
+
+***--auth***
+
+The Basic Authentication to use.
+
+The basic authentication needed to use a _closed_ directory. This is a shortcut for using the
+`Authorization: Basic` header. _Must use the_ `username:password` _format._
+
+Ex: `zeiver --auth "demo:say it"`
 
 ***-u***
 

README.md

@@ -1,9 +1,9 @@
 [package]
 name = "cmd_opts"
-version = "0.8.3"
+version = "0.8.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-structopt = "~0.3.22"
+clap = {version = "~3.2.10", features = ["derive"]}