Merge pull request #670 from bravochar/bugfixes

Bugfixes: Headless Window Size, Reserve Price, Logging

.gitignore

@@ -10,14 +10,15 @@
 .profile
 .profile-amz*
 .vscode/
-/config/*_credentials.json
+/config/*.json
 /config/apprise.conf
-/config/apprise_config.json
 Pipfile.lock
 __pycache__/
 build/
 dist/
 geckodriver.log
 html_saves/*.html
 screenshots/*.png
-logs/*.log*
+logs/*.log*
+tags
+.venv*

__INSTALL (RUN FIRST).bat

@@ -1,6 +1,7 @@
 @echo on
 pip install pipenv
 pause
+set PIPENV_VENV_IN_PROJECT=1
 pipenv install
 
 

cli/cli.py

@@ -21,6 +21,7 @@
 import platform
 import shutil
 import time
+import traceback
 from datetime import datetime
 from functools import wraps
 from pathlib import Path
@@ -63,11 +64,13 @@ def notify_on_crash(func):
     def decorator(*args, **kwargs):
         try:
             func(*args, **kwargs)
+
         except KeyboardInterrupt:
             pass
-        else:
+
+        except Exception as e:
+            log.error(traceback.format_exc())
             notification_handler.send_notification(f"FairGame has crashed.")
-            raise
 
     return decorator
 

config/fairgame.conf

@@ -99,6 +99,11 @@
     "CHECKOUT_TITLES": [
       "Amazon.com Checkout",
       "Amazon.co.uk Checkout",
+      "Amazon.ca Checkout",
+      "Amazon.es Checkout",
+      "Amazon.de Checkout",
+      "Amazon.fr Checkout",
+      "Amazon.it Checkout",
       "Place Your Order - Amazon.ca Checkout",
       "Place Your Order - Amazon.co.uk Checkout",
       "Amazon.de Checkout",
@@ -165,7 +170,14 @@
       "Complete your Amazon Prime sign up"
     ],
     "OUT_OF_STOCK": [
-      "Out of Stock - AmazonSmile Checkout"
+      "Out of Stock - AmazonSmile Checkout",
+      "Out of Stock - Amazon.com Checkout",
+      "Out of Stock - Amazon.ca Checkout",
+      "Out of Stock - Amazon.de Checkout",
+      "Out of Stock - Amazon.fr Checkout",
+      "Out of Stock - Amazon.co.uk Checkout",
+      "Out of Stock - Amazon.es Checkout",
+      "Out of Stock - Amazon.it Checkout"
     ],
     "NO_SELLERS": [
       "Currently, there are no sellers that can deliver this item to your location.",
@@ -220,6 +232,9 @@
       ],
       "ATC": [
         "//div[@id='aod-pinned-offer' or @id='aod-offer' or @id='olpOfferList']//input[@name='submit.addToCart']"
+      ],
+      "ATC_BUY_BOX":[
+        "//div[@id='qualifiedBuybox']//input[@id='add-to-cart-button']"
       ]
     }
   }