update.

pydork/engine_common.py

@@ -13,7 +13,6 @@
 import requests
 import os
 import pickle
-import time
 
 # selenium driver auto install packages
 import chromedriver_autoinstaller
@@ -706,14 +705,35 @@ def get_text_links(self, soup: BeautifulSoup):
  list: textの検索結果([xxx,xxx,xxx...])
  """
  # linkのurlを取得する
+ self.MESSAGE.print_text(
+ self.SOUP_SELECT_URL, # type: ignore
+ header=self.MESSAGE.HEADER + ': ' + \
+ Color.GREEN + '[get_text_link.SOUP_SELECT_URL]' + Color.END,
+ separator=" :",
+ mode="debug",
+ )
  elements = soup.select(self.SOUP_SELECT_URL)
  elinks = [e['href'] for e in elements]
 
  # linkのtitleを取得する
+ self.MESSAGE.print_text(
+ self.SOUP_SELECT_TITLE, # type: ignore
+ header=self.MESSAGE.HEADER + ': ' + \
+ Color.GREEN + '[get_text_link.SOUP_SELECT_TITLE]' + Color.END,
+ separator=" :",
+ mode="debug",
+ )
  elements = soup.select(self.SOUP_SELECT_TITLE)
  etitles = [e.text for e in elements]
 
  # linkのtextを取得する
+ self.MESSAGE.print_text(
+ self.SOUP_SELECT_TEXT, # type: ignore
+ header=self.MESSAGE.HEADER + ': ' + \
+ Color.GREEN + '[get_text_link.SOUP_SELECT_TEXT]' + Color.END,
+ separator=" :",
+ mode="debug",
+ )
  elements = soup.select(self.SOUP_SELECT_TEXT)
  etext = [e.text for e in elements]
 

pydork/engine_google.py

@@ -202,16 +202,16 @@ def get_links(self, url: str, html: str, type: str):
 
  # Selenium経由、かつFirefoxを使っている場合
  if self.USE_SELENIUM:
- self.SOUP_SELECT_URL = '.yuRUbf > div > a'
- self.SOUP_SELECT_TITLE = '.yuRUbf > div > a > .LC20lb'
- self.SOUP_SELECT_TEXT = '.lEBKkf'
+ self.SOUP_SELECT_URL = '.yuRUbf > div > span > a'
+ self.SOUP_SELECT_TITLE = '.yuRUbf > div > span > a > h3'
+ self.SOUP_SELECT_TEXT = '.yXK7lf'
  self.SOUP_SELECT_NEXT_URL = '.AaVjTc > tbody > tr > td > a'
 
  # Splash経由で通信している場合
  elif self.USE_SPLASH:
- self.SOUP_SELECT_URL = '.yuRUbf > a'
- self.SOUP_SELECT_TITLE = '.yuRUbf > a > .LC20lb'
- self.SOUP_SELECT_TEXT = '.lEBKkf'
+ self.SOUP_SELECT_URL = '.yuRUbf > div > span > a.href'
+ self.SOUP_SELECT_TITLE = '.yuRUbf > div > span > a > h3'
+ self.SOUP_SELECT_TEXT = '.yXK7lf'
  self.SOUP_SELECT_NEXT_URL = '.AaVjTc > tbody > tr > td > a'
 
  # TODO: SEARCH_NEXT_URLを書き換える

setup.py

@@ -27,7 +27,6 @@
 
 # 補完ファイルインストール用関数
 def get_data_files():
-
  # 補完ファイルのインストール先を取得する関数
  def get_completefile_install_location(shell):
  # pathのprefixを定義