Merge remote-tracking branch 'origin/master'

website_clickjobs/type-1/_clickjob1023.py

@@ -174,6 +174,6 @@ def execute(domain, target_domain, brands, query_list):
     if(timetaken < 50):
         extrasleep = 50 - timetaken
     print("Ctrl+C or Ctrl+Z to stop now.")
-    print("You have " + str(10 + extrasleep) + " seconds.")
-    time.sleep(10 + extrasleep)
+    print("You have " + str(30 + extrasleep) + " seconds.")
+    time.sleep(30 + extrasleep)
     return statuscode

website_clickjobs/type-1/hhh_r2.py

@@ -42,15 +42,15 @@ brands={domain:'hhh'}
 
 data = getdata()
 
-extras = [['https://hhh.com.tw/HHH_NEW/designers_static/596.html', '百玥空間設計'], ['https://hhh.com.tw/HHH_NEW/designers_static/767.html', 'ACE 空間制作所'], ['https://hhh.com.tw/HHH_NEW/designers_static/767.html', 'ACE空間制作所']]
+extras = [['https://hhh.com.tw/HHH_NEW/designers_static/596.html', '百玥空間設計'], ['https://hhh.com.tw/HHH_NEW/designers_static/767.html', 'ACE 空間制作所'], ['https://hhh.com.tw/HHH_NEW/designers_static/767.html', 'ACE空間制作所'],['傳奇室內裝修設計','https://hhh.com.tw/HHH_NEW/designers/index_designerList.php?cid=862'],['傳奇設計','https://hhh.com.tw/HHH_NEW/designers/index_designerList.php?cid=862'],['傳奇室內裝修設計','https://hhh.com.tw/HHH_NEW/designers/index_designerList.php?cid=862'],['傳奇設計','https://hhh.com.tw/HHH_NEW/designers/index_designerList.php?cid=862']]
 times = 5
 
 for e in extras:
     for i in range(times):
         data.append(e)
 
+runcount=0
 while True:
-    
     if len(priority)!=0: # CURRENTLY UNUSED
         target = random.choice(priority)
         ql = target[1:]
@@ -73,8 +73,10 @@ while True:
             target_domain = target_domain.replace('hhh.com.tw', 'm.hhh.com.tw')
         print(target_domain)    # mobile version?
         print(ql)
-        time.sleep(3)
         statuscode = execute(domain, target_domain, brands, ql)
         if statuscode == 444:
-            time.sleep(120)
+            print("Completed ", runcount, " times before being caught")
+            time.sleep(300)
+        else:
+            runcount+=1
 time.sleep(60)