diff --git a/Dockerfile b/Dockerfile index 3389d0c..5829909 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y python3 python3-pip && apt install nano RUN apt-get update && apt-get install -y \ wget unzip \ && rm -rf /var/lib/apt/lists/* \ - && wget https://storage.googleapis.com/chrome-for-testing-public/124.0.6367.60/linux64/chromedriver-linux64.zip \ + && wget https://storage.googleapis.com/chrome-for-testing-public/124.0.6422.141/linux64/chromedriver-linux64.zip \ && unzip chromedriver-linux64.zip \ && mv chromedriver-linux64/chromedriver /usr/local/bin/ \ && chmod +x /usr/local/bin/chromedriver \ diff --git a/main.py b/main.py index adc576a..ae840eb 100644 --- a/main.py +++ b/main.py @@ -75,8 +75,12 @@ def find_fomc(driver, date:str): def find_non_farm(driver): try: driver.get(nonfarm_url) + for _ in range(100): + driver.execute_script("window.scrollTo(0, document.body.scrollHeight);") + # print all of the page source that was loaded + print(driver.page_source.encode("utf-8")) print("Open") - date = driver.title.split(" ")[5] + date = driver.title value = driver.find_element(By.XPATH, '/html/body/div[2]/div[5]/div/div[1]/pre').text.split('\n') start , end = find_indices(value) result = value[start:end] @@ -306,7 +310,7 @@ schedules = { if __name__ == "__main__": global nonfarm_url, cpi_url, fomc_url, pce_url, options options = Options() - options.add_argument('--headless') + # options.add_argument('--headless') options.add_argument('--no-sandbox') options.add_argument('--disable-dev-shm-usage') options.add_argument("--window-size=1920,1080") # 可以根據需要調整這個大小 @@ -319,7 +323,7 @@ if __name__ == "__main__": pmi_url = "https://www.ismworld.org/supply-management-news-and-reports/reports/ism-report-on-business/pmi/"#+month/ print("Start Time:" , datetime.fromtimestamp(time.time())) - +''' for times, task in schedules.items(): func = task["function"] args = task["args"] @@ -331,15 +335,16 @@ if __name__ == "__main__": print("Broadcast completed") has_broadcasted = False time.sleep(0.1) # Check every 0.1 seconds +''' #NonFarm - # driver = webdriver.Chrome(options=options) - # driver, date, message = find_non_farm(driver) - # print("Non Farm Date") - # print(date) - # print("Non Farm Message") - # print(message) + driver = webdriver.Chrome(options=options) + driver, date, message = find_non_farm(driver) + print("Non Farm Date") + print(date) + print("Non Farm Message") + print(message) #CPI # find_cpi("FEBRUARY")