|
@@ -5,11 +5,41 @@ import time
|
|
from datetime import datetime
|
|
from datetime import datetime
|
|
from logger import logger
|
|
from logger import logger
|
|
|
|
|
|
-m=Market()
|
|
|
|
|
|
+# Handle command arguments
|
|
|
|
+import argparse
|
|
|
|
+parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,description="",epilog="")
|
|
|
|
+parser.add_argument(
|
|
|
|
+ "-p",
|
|
|
|
+ "--player",
|
|
|
|
+ metavar="yes/no",
|
|
|
|
+ default='no',
|
|
|
|
+ choices=['yes','no'],
|
|
|
|
+ help="Collect player data?"
|
|
|
|
+ )
|
|
|
|
+parser.add_argument(
|
|
|
|
+ "-l",
|
|
|
|
+ "--login",
|
|
|
|
+ metavar="yes/no",
|
|
|
|
+ default='no',
|
|
|
|
+ choices=['yes','no'],
|
|
|
|
+ help="Login to Browser?"
|
|
|
|
+ )
|
|
|
|
+args = parser.parse_args()
|
|
|
|
+CollectPlayerData = args.player
|
|
|
|
+login_yesno = args.login
|
|
|
|
+if login_yesno == 'yes':
|
|
|
|
+ Login = True
|
|
|
|
+else:
|
|
|
|
+ Login = False
|
|
|
|
+
|
|
|
|
+m=Market(login=Login)
|
|
p=Player()
|
|
p=Player()
|
|
|
|
+merr=0
|
|
|
|
+perr=0
|
|
|
|
|
|
|
|
|
|
def jobM():
|
|
def jobM():
|
|
|
|
+ global m
|
|
logger.info("Gathering Market Data.")
|
|
logger.info("Gathering Market Data.")
|
|
try:
|
|
try:
|
|
m.fetchData()
|
|
m.fetchData()
|
|
@@ -17,8 +47,13 @@ def jobM():
|
|
logger.info("Complete.")
|
|
logger.info("Complete.")
|
|
except Exception as e:
|
|
except Exception as e:
|
|
logger.error(f"{e}")
|
|
logger.error(f"{e}")
|
|
|
|
+ merr +=1
|
|
|
|
+ if merr >= 3:
|
|
|
|
+ merr=0
|
|
|
|
+ m=Market()
|
|
|
|
|
|
def jobP():
|
|
def jobP():
|
|
|
|
+ global p
|
|
logger.info("Gathering Player Data.")
|
|
logger.info("Gathering Player Data.")
|
|
try:
|
|
try:
|
|
p.fetchData()
|
|
p.fetchData()
|
|
@@ -26,12 +61,18 @@ def jobP():
|
|
logger.info("Complete.")
|
|
logger.info("Complete.")
|
|
except Exception as e:
|
|
except Exception as e:
|
|
logger.error(f"{e}")
|
|
logger.error(f"{e}")
|
|
|
|
+ perr +=1
|
|
|
|
+ if perr >= 3:
|
|
|
|
+ perr=0
|
|
|
|
+ p=Player()
|
|
|
|
|
|
schedule.every(15).minutes.do(jobM)
|
|
schedule.every(15).minutes.do(jobM)
|
|
-schedule.every(15).minutes.do(jobP)
|
|
|
|
-
|
|
|
|
jobM()
|
|
jobM()
|
|
-jobP()
|
|
|
|
|
|
+
|
|
|
|
+if CollectPlayerData == 'yes':
|
|
|
|
+ schedule.every(15).minutes.do(jobP)
|
|
|
|
+ jobP()
|
|
|
|
+
|
|
while 1:
|
|
while 1:
|
|
schedule.run_pending()
|
|
schedule.run_pending()
|
|
time.sleep(1)
|
|
time.sleep(1)
|