qgyd2021 commited on
Commit
86a6f36
·
1 Parent(s): 70cc96c
toolbox/douyin_selenium/tasks/bless_bag_collector.py CHANGED
@@ -70,7 +70,8 @@ class BlessBagCollector(object):
70
  return self.get_element_by_xpath(xpath)
71
 
72
  def get_live_ended_element(self):
73
- xpath = "//div[@id='TipsLayout']/div[3]/span"
 
74
  return self.get_element_by_xpath(xpath)
75
 
76
  def get_bless_bag_element(self):
@@ -182,10 +183,10 @@ class BlessBagCollector(object):
182
  logger.info(f"{self.flag}达到观看直播时长设置: {self.watch_duration//60}分钟,{self.watch_duration%60}秒.")
183
  break
184
 
185
- # live_ended_element = self.get_live_ended_element()
186
- # if live_ended_element is not None and live_ended_element.text == "直播已结束":
187
- # logger.info(f"{self.flag}直播已结束: {live_ended_element.text}.")
188
- # break
189
 
190
  online_user_element = self.get_online_user_element()
191
  if online_user_element is not None:
 
70
  return self.get_element_by_xpath(xpath)
71
 
72
  def get_live_ended_element(self):
73
+ # xpath = "//div[@id='TipsLayout']/div[3]/span"
74
+ xpath = "//div[@id='TipsLayout']/div[3]/span/div/div"
75
  return self.get_element_by_xpath(xpath)
76
 
77
  def get_bless_bag_element(self):
 
183
  logger.info(f"{self.flag}达到观看直播时长设置: {self.watch_duration//60}分钟,{self.watch_duration%60}秒.")
184
  break
185
 
186
+ live_ended_element = self.get_live_ended_element()
187
+ if live_ended_element is not None and live_ended_element.text in ("直播已结束", "直播已结束,猜你喜欢"):
188
+ logger.info(f"{self.flag}直播已结束: {live_ended_element.text}.")
189
+ break
190
 
191
  online_user_element = self.get_online_user_element()
192
  if online_user_element is not None: