Merge branch 'master' of http://git.choozmo.com:3000/choozmo/kw_tools

hhh/GATest.py

@@ -106,7 +106,9 @@ def main():
 #(FB_|facebook|IG_|LINE_|LINEMP_|qsear.ch)
 
   body=[{ 'viewId': VIEW_ID,
-  'dateRanges': [{'startDate': '2021-05-31', 'endDate': '2021-06-18'}],
+#  'dateRanges': [{'startDate': '2021-05-31', 'endDate': '2021-06-18'}],
+  'dateRanges': [{'startDate': '2021-05-31', 'endDate': '2021-06-25'}],
+
 #  'filtersExpression': 'ga:sourceMedium=~(FB_|facebook|IG_|LINE_|LINEMP_|qsear.ch)',
   'filtersExpression': 'ga:sourceMedium=~(FB_|facebook|IG_|LINE_|LINEMP_|qsear.ch)',
   'metrics': [{'expression': 'ga:users'},{'expression': 'ga:newusers'},{'expression': 'ga:sessions'},{'expression': 'ga:pageviews'},{'expression': 'ga:bounceRate'},{'expression': 'ga:pageviewsPerSession'}],
@@ -121,7 +123,8 @@ def main():
 
   body=[{ 'viewId': VIEW_ID,
 #  'dateRanges': [{'startDate': '2021-05-24', 'endDate': '2021-06-10'}],
-  'dateRanges': [{'startDate': '2021-05-31', 'endDate': '2021-06-18'}],
+#  'dateRanges': [{'startDate': '2021-05-31', 'endDate': '2021-06-18'}],
+  'dateRanges': [{'startDate': '2021-05-31', 'endDate': '2021-06-25'}],
 
 #  'filtersExpression': 'ga:sourceMedium=~(FB_|facebook|IG_|LINE_|LINEMP_|qsear.ch)',
   'filtersExpression': 'ga:sourceMedium!~(FB_|facebook|IG_|LINE_|LINEMP_|qsear.ch)',

hhh/SEO/full_customer_seo.py

@@ -28,7 +28,12 @@ def send_msg(kw):
 
 
 def empty_query(q):
-    global driver
+    options = webdriver.ChromeOptions()
+    options.add_argument("--proxy-server=socks5://172.104.67.159:8180")
+    driver = webdriver.Remote(
+        command_executor='http://127.0.0.1:4444/wd/hub',
+    desired_capabilities=options.to_capabilities())
+    driver.set_window_size(1400,1000)
     googleurl='https://www.google.com/search?q='+urllib.parse.quote(q)
     driver.get(googleurl)
     time.sleep(3)
@@ -252,7 +257,7 @@ ls[0].restart()
 time.sleep(10)
 #from selenium import webdriver
 #PROXY = "23.23.23.23:3128" # IP:PORT or HOST:PORT
-#chrome_options = webdriver.ChromeOptions()
+chrome_options = webdriver.ChromeOptions()
 #chrome_options.add_argument('--proxy-server=%s' % PROXY)
 #options.add_argument("--proxy-server=socks5://" + host + ":" + port);
 #chrome = webdriver.Chrome(options=chrome_options)