Add support for explicit proxy configuration

.gitignore

@@ -1,2 +1,5 @@
 __pycache__
 *.pyc
+
+.vscode
+.devcontainer

Dockerfile

@@ -0,0 +1,26 @@
+# Base image
+FROM python:3.9.5-slim as base
+
+# Build stage
+FROM base as builder
+
+# Dependency install directory
+RUN mkdir /install
+WORKDIR /install
+
+# Install dependencies
+COPY ./requirements.txt .
+RUN pip install --prefix /install -r requirements.txt
+
+# Run stage
+FROM base
+
+WORKDIR /usr/src/app
+
+# Fetch dependencies from the build stage
+COPY --from=builder /install /usr/local
+
+COPY ./doctoshotgun.py .
+
+# Entrypoint - Run the main script
+ENTRYPOINT ["./doctoshotgun.py"]

README.md

@@ -1,11 +1,10 @@
 # DOCTOSHOTGUN
 
-This script lets you automatically book a vaccine slot on Doctolib for today or
-tomorrow, following rules from the French Government.
-
+This script lets you automatically book a vaccine slot on Doctolib in France and in Germany in
+the next seven days.
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/rbignon/doctoshotgun/da5f65a1e2ecc7b543376b1549c62004a454b90d/example.svg">
+  <img src="https://github.com/rbignon/doctoshotgun/raw/master/example.svg">
 </p>
 
 ## Python dependencies
@@ -14,9 +13,13 @@ tomorrow, following rules from the French Government.
 - cloudscraper
 - dateutil
 - termcolor
+- colorama
+- playsound (optional)
 
 ## How to use it
 
+You need python3 for this script. If you don't have it, please [install it first](https://www.python.org/).
+
 Install dependencies:
 
 ```
@@ -26,31 +29,70 @@ pip install -r requirements.txt
 Run:
 
 ```
-./doctoshotgun.py <city> <email> [password]
+./doctoshotgun.py <country{fr,de}> <city> <email> [<password>]
 ```
 
-Optional arguments:
+Further optional arguments:
+
+```
+--debug, -d           show debug information
+--pfizer, -z          select only Pfizer vaccine
+--moderna, -m         select only Moderna vaccine
+--janssen, -j         select only Janssen vaccine
+--astrazeneca, -a     select only AstraZeneca vaccine
+--only-second, -2     select only second dose
+--only-third, -3      select only third dose
+--patient PATIENT, -p PATIENT
+                      give patient ID
+--time-window TIME_WINDOW, -t TIME_WINDOW
+                      set how many next days the script look for slots (default = 7)
+--center CENTER, -c CENTER
+                      filter centers
+--center-regex CENTER_REGEX
+                      filter centers by regex
+--center-exclude CENTER_EXCLUDE, -x CENTER_EXCLUDE
+                      exclude centers
+--center-exclude-regex CENTER_EXCLUDE_REGEX
+                      exclude centers by regex
+--include-neighbor-city, -n
+                      include neighboring cities
+--start-date START_DATE
+                      first date on which you want to book the first slot (format should be DD/MM/YYYY)
+--end-date END_DATE   last date on which you want to book the first slot (format should be DD/MM/YYYY)
+--dry-run             do not really book the slot
+--code CODE           2FA code
+--proxy PROXY, -P PROXY
+                      configure a network proxy to use
+```
+
+### With Docker
+
+Build the image:
 
 ```
---center "<center_name>" [--center "<other_center>" …]  : filter centers to only choose one from the provided list
---patient <index>                                       : select patient for which book a slot
---debug                                                 : display debug information
+docker build . -t doctoshotgun
+```
+
+Run the container:
+
+```
+docker run -it doctoshotgun <country{fr,de}> <city> <email> [<password>]
 ```
 
 ### Multiple cities
 
 You can also look for slot in multiple cities at the same time. Cities must be separated by commas:
 
 ```
-$ ./doctoshotgun.py <city1>,<city2>,<city3> <email> [password]
+$ ./doctoshotgun.py <country{fr,de}> <city1>,<city2>,<city3> <email> [<password>]
 ```
 
 ### Filter on centers
 
-You can give name of centers in which you want specifictly looking for:
+You can give name of centers in which you want specifically looking for:
 
 ```
-$ ./doctoshotgun.py paris [email protected] \
+$ ./doctoshotgun.py fr paris [email protected] \
       --center "Centre de Vaccination Covid 19 - Ville de Paris" \
       --center "Centre de Vaccination du 7eme arrondissement de Paris - Gymnase Camou"
 ```
@@ -60,7 +102,7 @@ $ ./doctoshotgun.py paris [email protected] \
 For doctolib accounts with more thant one patient, you can select patient just after launching the script:
 
 ```
-$ ./doctoshotgun.py paris [email protected] PASSWORD
+$ ./doctoshotgun.py fr paris [email protected] PASSWORD
 Available patients are:
 * [0] Roger Philibert
 * [1] Luce Philibert
@@ -70,10 +112,44 @@ For which patient do you want to book a slot?
 You can also give the patient id as argument:
 
 ```
-$ ./doctoshotgun.py paris [email protected] PASSWORD -p 1
+$ ./doctoshotgun.py fr paris [email protected] PASSWORD -p 1
+Starting to look for vaccine slots for Luce Philibert in 1 next day(s) starting today...
+```
+
+### Set time window
+
+By default, the script looks for slots between now and next day at 23:59:59. If you belong to a category of patients that is allowed to book a slot in a more distant future, you can expand the time window. For exemple, if you want to search in the next 5 days :
+
+```
+$ ./doctoshotgun.py fr paris [email protected] -t 5
+Password:
+Starting to look for vaccine slots for Roger Philibert in 5 next day(s) starting today...
+This may take a few minutes/hours, be patient!
+```
+
+### Look on specific date
+
+By default, the script looks for slots between now and next day at 23:59:59. If you can't be vaccinated right now (e.g covid in the last 3 months or out of town) and you are looking for an appointment in a distant future, you can pass a starting date:
+
+```
+$ ./doctoshotgun.py fr paris [email protected] --start-date 17/06/2021
+Password:
+Starting to look for vaccine slots for Roger Philibert in 7 next day(s) starting 17/06/2021...
+This may take a few minutes/hours, be patient!
+```
+
+### Filter by vaccine
+
+The Pfizer vaccine is the only vaccine allowed in France for people between 16 and 18. For this case, you can use the -z option.
+
+```
+$ ./doctoshotgun.py fr paris [email protected] PASSWORD -z
 Starting to look for vaccine slots for Luce Philibert...
+Vaccines: Pfizer
+This may take a few minutes/hours, be patient!
 ```
 
+It is also possible to filter on Moderna vaccine with the -m option and Janssen with the -j option.
 
 ## Development