w

swire_shop_item_list.py

@@ -91,7 +91,7 @@ def keyin_keyword(driver, keyword):
 
 
 
-def get_next_job(db):
+def get_next_job(db,repeat=False,repkw=None,repnum=None):
     global globalkw
 
     result={}
@@ -107,6 +107,9 @@ def get_next_job(db):
         result['num']=c['num']
         break
 
+    if repeat:
+        result['kw']=repkw
+        result['repnum']=repnum
 
     cursor = db.query('select lat,lon,loc from lat_lon_loc where num ="'+str(result['num'])+'"')
     for c in cursor:
@@ -115,6 +118,13 @@ def get_next_job(db):
         result['loc']=c['loc']
         break
 
+    if repeat:
+
+        cursor = db.query('select  lat_txt,lon_txt from swire_store_list where num ="'+str(result['num'])+'" and keyword="'+result['kw']+'" order by rand() limit 1')
+        for c in cursor:
+            result['lat']=c['lat_txt']
+            result['lon']=c['lon_txt']
+
     return result
 
 
@@ -246,8 +256,10 @@ def main():
     global store_list_table
     global globalkw
     global proxyport
+
     if len(sys.argv)>1:
         globalkw=sys.argv[1]
+
     failcnt=0
     localip=socket.gethostbyname(socket.gethostname())
 #    if localip=='192.168.1.108':
@@ -267,6 +279,8 @@ def main():
         proxyport=int(sys.argv[2])
 
 
+
+
     if not chrome_window:
         print('restart docker p{}'.format(port))
 #        os.system('sudo docker container restart p'+str(port))
@@ -280,7 +294,12 @@ def main():
 
     while True:
         try:
-            job=get_next_job(db)
+            if len(sys.argv) > 3 :
+                repkw=sys.argv[1]
+                repnum=sys.argv[2]
+                job=get_next_job(db,repeat=True,repkw=repkw,repnum=repnum)
+            else:
+                job=get_next_job(db)
             print(job)
             keyword  = job['kw']
             latitude = job['lat'] #緯度