Merge pull request #10 from helb/zomato

Fix Zomato parser, thanks @VojtechMyslivec
helb · Jul 3, 2019 · 5b5f041 · 5b5f041
2 parents 48608cc + 3973ff8
commit 5b5f041
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/ansible-role/tasks/main.yml b/ansible-role/tasks/main.yml
@@ -12,9 +12,8 @@
 
 - name: Install apt requirements
   apt:
-    name: '{{ item }}'
+    name: '{{ jidlobot_requirements }}'
     state: present
-  with_items: '{{ jidlobot_requirements }}'
 
 - name: Clone jidlobot repo
   git:

diff --git a/ansible-role/templates/jidlobot.yml.j2 b/ansible-role/templates/jidlobot.yml.j2
@@ -1,7 +1,8 @@
 ## jidlobot.conf
 
 HTTP_TIMEOUT: 5
-ZOMATO_UA: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3452.0 Safari/537.36'
+ZOMATO_UA: 'Mozilla/5.0 (X11; Linux x86_64; rv:65.0) Gecko/20100101 Firefox/65.0'
+ZOMATO_LANG: 'cs,en'
 
 URLS:
 {% for url in jidlobot_urls %}

diff --git a/jidlobot.yml.example b/jidlobot.yml.example
@@ -1,3 +1,5 @@
+---
+
 HTTP_TIMEOUT: 5
 URLS:
     - https://www.menicka.cz/1631-u-malicke-brany.html
@@ -27,4 +29,7 @@ BACKENDS:
     - hipchat
     - console
 
-ZOMATO_UA: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3452.0 Safari/537.36
+ZOMATO_UA: 'Mozilla/5.0 (X11; Linux x86_64; rv:65.0) Gecko/20100101 Firefox/65.0'
+ZOMATO_LANG: 'cs,en'
+
+...
diff --git a/zomato.py b/zomato.py
@@ -10,9 +10,10 @@ def fetch(url, config):
     prices = []
 
     try:
-        url = re.sub(r"\?.*/?(daily-menu)?$", "/daily-menu", url)
+        url = re.sub(r"\?.*/?(daily-menu|denní-menu)?$", "/denní-menu", url)
         result = requests.get(url, timeout=config["HTTP_TIMEOUT"], headers={
             "User-Agent": config["ZOMATO_UA"],
+            "Accept-Language": config["ZOMATO_LANG"],
             "Referer": url
         })
         html = BeautifulSoup(result.content, "html5lib")