Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add ability to name instance in config so that discord notifications … #489

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

add ability to name instance in config so that discord notifications … #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b11f34
add ability to name instance in config so that discord notifications …
SalvadorSTM Feb 4, 2021
f95fcf2
change instance name to Fairgame instead of Fairgame1
SalvadorSTM Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/amazon_config.template_json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"instance_name": "Fairgame",
"asin_groups": 2,
"asin_list_1": ["B07JH53M4T"],
"reserve_min_1": 10,
Expand Down
47 changes: 25 additions & 22 deletions stores/amazon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ def __init__(
with open(AUTOBUY_CONFIG_PATH) as json_file:
try:
config = json.load(json_file)
global instance_name
instance_name = config["instance_name"]
log.info(f"Running as instance name: {instance_name}")
self.asin_groups = int(config["asin_groups"])
self.amazon_website = config.get(
"amazon_website", "smile.amazon.com"
Expand Down Expand Up @@ -213,7 +216,7 @@ def run(self, delay=DEFAULT_REFRESH_DELAY, test=False):
self.login()
self.notification_handler.play_notify_sound()
self.send_notification(
"Bot Logged in and Starting up", "Start-Up", self.take_screenshots
f"{instance_name}: Bot Logged in and Starting up", "Start-Up", self.take_screenshots
)
if self.get_cart_count() > 0:
log.warning(f"Found {cart_quantity} item(s) in your cart.")
Expand Down Expand Up @@ -406,7 +409,7 @@ def login(self):
self.driver.refresh()
else:
self.send_notification(
"Solving catpcha", "captcha", self.take_screenshots
f"{instance_name}: Solving catpcha", "captcha", self.take_screenshots
)
captcha_entry.send_keys(solution + Keys.RETURN)
self.wait_for_page_change(current_page)
Expand Down Expand Up @@ -480,7 +483,7 @@ def check_stock(self, asin, reserve_min, reserve_max, retry=0):
log.error("Failed to delete chrome processes")
log.error("Please restart bot")
self.send_notification(
message="Bot Failed, please restart bot",
message=f"{instance_name}: Bot Failed, please restart bot",
page_name="Bot Failed",
take_screenshot=False,
)
Expand All @@ -489,7 +492,7 @@ def check_stock(self, asin, reserve_min, reserve_max, retry=0):
log.error("Failed to recreate webdriver processes")
log.error("Please restart bot")
self.send_notification(
message="Bot Failed, please restart bot",
message=f"{instance_name}: Bot Failed, please restart bot",
page_name="Bot Failed",
take_screenshot=False,
)
Expand Down Expand Up @@ -760,7 +763,7 @@ def check_stock(self, asin, reserve_min, reserve_max, retry=0):
self.notification_handler.play_notify_sound()
if self.detailed:
self.send_notification(
message=f"Found Stock ASIN:{asin}",
message=f"{instance_name}: Found Stock ASIN:{asin}",
page_name="Stock Alert",
take_screenshot=self.take_screenshots,
)
Expand All @@ -781,7 +784,7 @@ def check_stock(self, asin, reserve_min, reserve_max, retry=0):
log.info("did not add to cart, trying again")
log.debug(f"failed title was {self.driver.title}")
self.send_notification(
"Failed Add to Cart", "failed-atc", self.take_screenshots
f"{instance_name}: Failed Add to Cart", "failed-atc", self.take_screenshots
)
self.save_page_source("failed-atc")
in_stock = self.check_stock(
Expand Down Expand Up @@ -849,7 +852,7 @@ def navigate_pages(self, test):
if not self.unknown_title_notification_sent:
self.notification_handler.play_alarm_sound()
self.send_notification(
"User interaction required for checkout!",
f"{instance_name}: User interaction required for checkout!",
title,
self.take_screenshots,
)
Expand Down Expand Up @@ -889,12 +892,12 @@ def navigate_pages(self, test):
"FairGame thinks it completed the purchase, please verify ASAP"
)
self.send_notification(
message="FairGame may have made a purchase, please confirm ASAP",
message=f"{instance_name}: FairGame may have made a purchase, please confirm ASAP",
page_name="unknown-title-purchase",
take_screenshot=self.take_screenshots,
)
self.send_notification(
message="Notifications that follow assume purchase has been made, YOU MUST CONFIRM THIS ASAP",
message=f"{instance_name}: Notifications that follow assume purchase has been made, YOU MUST CONFIRM THIS ASAP",
page_name="confirm-purchase",
take_screenshot=False,
)
Expand Down Expand Up @@ -938,7 +941,7 @@ def navigate_pages(self, test):
"If this works, VERIFY THE ADDRESS IT SHIPPED TO IMMEDIATELY!"
)
self.send_notification(
message="Clicking ship to address, hopefully this works. VERIFY ASAP!",
message=f"{instance_name}: Clicking ship to address, hopefully this works. VERIFY ASAP!",
page_name="choose-shipping",
take_screenshot=self.take_screenshots,
)
Expand Down Expand Up @@ -967,7 +970,7 @@ def navigate_pages(self, test):
f"'{title}' is not a known page title. Please create issue indicating the title with a screenshot of page"
)
self.send_notification(
f"Encountered Unknown Page Title: `{title}",
f"{instance_name}: Encountered Unknown Page Title: `{title}",
"unknown-title",
self.take_screenshots,
)
Expand Down Expand Up @@ -1057,7 +1060,7 @@ def handle_prime_signup(self):
log.info("sign up for Prime and this won't happen anymore")
self.save_page_source("prime-signup-error")
self.send_notification(
"Prime Sign-up Error occurred",
f"{instance_name}: Prime Sign-up Error occurred",
"prime-signup-error",
self.take_screenshots,
)
Expand All @@ -1069,7 +1072,7 @@ def handle_prime_signup(self):
log.error("Prime offer page popped up, user intervention required")
self.notification_handler.play_alarm_sound()
self.notification_handler.send_notification(
"Prime offer page popped up, user intervention required"
f"{instance_name}: Prime offer page popped up, user intervention required"
)
timeout = self.get_timeout(timeout=60)
while self.driver.title in amazon_config["PRIME_TITLES"]:
Expand All @@ -1095,7 +1098,7 @@ def handle_home_page(self):
self.wait_for_page_change(current_page)
else:
self.send_notification(
"Could not click cart button, user intervention required",
f"{instance_name}: Could not click cart button, user intervention required",
"home-page-error",
self.take_screenshots,
)
Expand Down Expand Up @@ -1135,7 +1138,7 @@ def handle_cart(self):
log.info("couldn't find buttons to proceed to checkout")
self.save_page_source("ptc-error")
self.send_notification(
"Proceed to Checkout Error Occurred",
f"{instance_name}: Proceed to Checkout Error Occurred",
"ptc-error",
self.take_screenshots,
)
Expand All @@ -1156,7 +1159,7 @@ def handle_cart(self):
if button:
if self.detailed:
self.send_notification(
message="Attempting to Proceed to Checkout",
message=f"{instance_name}: Attempting to Proceed to Checkout",
page_name="ptc",
take_screenshot=self.take_screenshots,
)
Expand Down Expand Up @@ -1190,7 +1193,7 @@ def handle_checkout(self, test):
log.error("couldn't find buttons to proceed to checkout")
self.save_page_source("ptc-error")
self.send_notification(
"Error in checkout. Please check browser window.",
f"{instance_name}: Error in checkout. Please check browser window.",
"ptc-error",
self.take_screenshots,
)
Expand All @@ -1215,7 +1218,7 @@ def handle_checkout(self, test):
@debug
def handle_order_complete(self):
log.info("Order Placed.")
self.send_notification("Order placed.", "order-placed", self.take_screenshots)
self.send_notification(f"{instance_name}: Order placed.", "order-placed", self.take_screenshots)
self.great_success = True
if self.single_shot:
self.asin_list = []
Expand All @@ -1225,14 +1228,14 @@ def handle_order_complete(self):
@debug
def handle_doggos(self):
self.notification_handler.send_notification(
"You got dogs, bot may not work correctly. Ending Checkout"
f"{instance_name}: You got dogs, bot may not work correctly. Ending Checkout"
)
self.try_to_checkout = False

@debug
def handle_out_of_stock(self):
self.notification_handler.send_notification(
"Carted it, but went out of stock, better luck next time."
f"{instance_name}: Carted it, but went out of stock, better luck next time."
)
self.try_to_checkout = False

Expand All @@ -1258,7 +1261,7 @@ def handle_captcha(self):
time.sleep(3)
else:
self.send_notification(
"Solving catpcha", "captcha", self.take_screenshots
f"{instance_name}: Solving catpcha", "captcha", self.take_screenshots
)
self.driver.find_element_by_xpath(
'//*[@id="captchacharacters"]'
Expand Down Expand Up @@ -1299,7 +1302,7 @@ def handle_business_po(self):
"Could not find the continue button, user intervention required, complete checkout manually"
)
self.notification_handler.send_notification(
"Could not click continue button, user intervention required"
f"{instance_name}: Could not click continue button, user intervention required"
)
time.sleep(300)

Expand Down