Skip to content

Commit

Permalink
Revert "Merge branch 'beta' into ownBeta"
Browse files Browse the repository at this point in the history
This reverts commit cb67518, reversing
changes made to 7e719ec.
  • Loading branch information
IAmWebSA committed Jun 10, 2021
1 parent cb67518 commit fe4d9f5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 297 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ installer/
build/
dist/

# local chromium
/tools/local-chromium/
25 changes: 4 additions & 21 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from tools.utils import create_missing_dirs, get_current_version, \
get_latest_version, pushover_validation, remove_prefix, \
telegram_validation, unique, update_available
from tools.chromium_downloader import check_chromium, download_chromium, check_webdriver, download_webdriver, current_platform

PATH = os.path.dirname(os.path.realpath(__file__))

Expand Down Expand Up @@ -418,19 +417,6 @@ def subcommand_code(args):
gen_code_interactive(args.file)


def subcommand_install_chromium():
# Mac_Arm currently not working
if current_platform() == 'mac-arm':
print('Zur Zeit kann keine eigene Chromium Instanz auf einem Mac M1 installiert werden.')
else:
if not check_chromium():
download_chromium()
else:
print('Eigene Chromium Instanz bereits installiert.')
if not check_webdriver():
download_webdriver()


def validate_args(args):
"""
Raises ValueError if args contain invalid settings.
Expand Down Expand Up @@ -520,7 +506,6 @@ def main():
"Was möchtest du tun?\n"
"[1] Termin suchen\n"
"[2] Vermittlungscode generieren\n"
"[3] Eigene Chromium Instanz im Vaccipy Ordner installieren\n"
f"[x] Erweiterte Einstellungen {'verbergen' if extended_settings else 'anzeigen'}\n")

if extended_settings:
Expand All @@ -538,8 +523,6 @@ def main():
subcommand_search(args)
elif option == "2":
subcommand_code(args)
elif option == "3":
subcommand_install_chromium()
elif option == "x":
extended_settings = not extended_settings
elif extended_settings and option == "c":
Expand Down Expand Up @@ -574,14 +557,14 @@ def main():

if __name__ == "__main__":
print("""
_
(_)
__ __ __ _ ___ ___ _ _ __ _ _
_
(_)
__ __ __ _ ___ ___ _ _ __ _ _
\ \ / / / _` | / __| / __| | | | '_ \ | | | |
\ V / | (_| | | (__ | (__ | | | |_) | | |_| |
\_/ \__,_| \___| \___| |_| | .__/ \__, |
| | __/ |
|_| |___/
|_| |___/
""")

# Auf aktuelle Version prüfen
Expand Down
267 changes: 0 additions & 267 deletions tools/chromium_downloader.py

This file was deleted.

7 changes: 0 additions & 7 deletions tools/its.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
from tools.kontaktdaten import decode_wochentag, validate_codes, validate_kontakt, \
validate_zeitrahmen
from tools.utils import fire_notifications
from tools.chromium_downloader import chromium_executable, check_chromium, webdriver_executable, check_webdriver

try:
import beepy
Expand Down Expand Up @@ -233,8 +232,6 @@ def get_chromedriver_path(self):
chromedriver_from_env = os.getenv("VACCIPY_CHROMEDRIVER")
if chromedriver_from_env:
return chromedriver_from_env
if check_webdriver():
return webdriver_executable()

# Chromedriver anhand des OS auswählen
if 'linux' in self.operating_system:
Expand Down Expand Up @@ -272,8 +269,6 @@ def get_chromedriver(self, headless):
chromebin_from_env = os.getenv("VACCIPY_CHROME_BIN")
if chromebin_from_env:
chrome_options.binary_location = os.getenv("VACCIPY_CHROME_BIN")
elif check_chromium():
chrome_options.binary_location = str(chromium_executable())

chrome_options.headless = headless

Expand Down Expand Up @@ -748,7 +743,6 @@ def reservierung_hier_finden(
ts = datetime.fromtimestamp(termin["begin"] / 1000).strftime(
'%d.%m.%Y um %H:%M Uhr')
self.log.warn(f"{num}. Termin: {ts}")
self.log.warn(f"Link: {url}impftermine/suche/{code}/{plz}")
self.log.info('-' * 50)

if not terminpaare_angenommen:
Expand All @@ -762,7 +756,6 @@ def reservierung_hier_finden(
ts = datetime.fromtimestamp(termin["begin"] / 1000).strftime(
'%d.%m.%Y um %H:%M Uhr')
self.log.success(f"{num}. Termin: {ts}")
self.log.success(f"Link: {url}impftermine/suche/{code}/{plz}")

# Reservierungs-Objekt besteht aus Terminpaar und Impfzentrum
return {
Expand Down

0 comments on commit fe4d9f5

Please sign in to comment.