diff --git a/taptap/taptap_report_new.py b/taptap/taptap_report_new.py index 52ba0d8..ac166ef 100644 --- a/taptap/taptap_report_new.py +++ b/taptap/taptap_report_new.py @@ -44,9 +44,28 @@ class TapTapReport: for key in gameid_order.keys(): all.setdefault(key, {})['gameid'] = key.split("#")[0] all[key]['catename'] = key.split('#')[1] - all[key]['date'] = self.day - all[key]['diff_order'] = gameid_order[key].get(self.bday, 301) - gameid_order[key].get(self.day, 301) - all.setdefault(key, {})['current_order'] = gameid_order[key].get(self.day, 301) + all[key]['date'] = self.bday + if gameid_order[key].get(self.bday, 0) and gameid_order[key].get(self.bbday, 0): + all[key]['diff_order'] = gameid_order[key].get(self.bbday, 0) - gameid_order[key].get(self.bday, 0) + all.setdefault(key, {})['current_order'] = gameid_order[key].get(self.bday, 0) + elif not gameid_order[key].get(self.bday, 0): + if gameid_order[key].get(self.day, 0): + # 当前没数据,取后一天的值 + all[key]['diff_order'] = gameid_order[key].get(self.bbday, 0) - gameid_order[key].get(self.day, 0) + all.setdefault(key, {})['current_order'] = gameid_order[key].get(self.day, 0) + else: + # 前2天都没数据,默认为游戏下架 + pass + + elif not gameid_order[key].get(self.bbday, 0): + if gameid_order[key].get(self.day, 0): + # 一天前没数据,取2天前的数据 + all[key]['diff_order'] = gameid_order[key].get(self.day, 0) + all.setdefault(key, {})['current_order'] = gameid_order[key].get(self.day, 0) + else: + # 前2天都没数据,默认为游戏上架 + all[key]['diff_order'] = gameid_order[key].get(self.bday, 0) + all.setdefault(key, {})['current_order'] = gameid_order[key].get(self.bday, 0) for key in gameid_info.keys(): all[key]['title'] = gameid_info[key]['title'] @@ -79,8 +98,8 @@ class TapTapReport: for line in all.values(): try: - print(line) - # mydb.insert("taptap_data", line) + #print(line) + mydb.insert("taptap_data_new", line) except Exception: log.error(f"install 2 db failed ,values={line}", exc_info=True)