Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

blind fix import compatibility

Browse source
This commit is contained in:
Your Name 2022-08-16 22:18:34 -04:00
parent f5836b5437
commit b481635203
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/importers/douban.py
View file

@ -153,7 +153,7 @@ class DoubanImporter:
return None return None
v = self.entity_lookup[k] v = self.entity_lookup[k]
if len(v) > 1: if len(v) > 1:
v.sort(key=lambda c: abs(timestamp - datetime.strptime(c[1], "%Y-%m-%d %H:%M:%S").replace(tzinfo=tz_sh))) v.sort(key=lambda c: abs(timestamp - (datetime.strptime(c[1], "%Y-%m-%d %H:%M:%S") if type(c[1])==str else c[1]).replace(tzinfo=tz_sh)))
return v[0][0] return v[0][0]
# for sheet in self.mark_data.values(): # for sheet in self.mark_data.values():
# for cells in sheet: # for cells in sheet:
@ -190,7 +190,9 @@ class DoubanImporter:
content = cells[6] content = cells[6]
self.processed += 1 self.processed += 1
if time: if time:
time = datetime.strptime(time, "%Y-%m-%d %H:%M:%S").replace(tzinfo=tz_sh) if type(time) == str:
time = datetime.strptime(time, "%Y-%m-%d %H:%M:%S")
time = time.replace(tzinfo=tz_sh)
else: else:
time = None time = None
if not content: if not content:

10
sync/jobs.py
View file

@ -117,6 +117,7 @@ class DoufenParser:
start_row_index = self.__progress_row start_row_index = self.__progress_row
# parse data # parse data
tz = pytz.timezone('Asia/Shanghai')
i = start_row_index i = start_row_index
for row in ws.iter_rows(min_row=start_row_index, max_row=max_row, values_only=True): for row in ws.iter_rows(min_row=start_row_index, max_row=max_row, values_only=True):
cells = [cell for cell in row] cells = [cell for cell in row]
@ -124,9 +125,10 @@ class DoufenParser:
tags = cells[self.TAG_INDEX - 1] tags = cells[self.TAG_INDEX - 1]
tags = list(set(tags.lower().split(','))) if tags else None tags = list(set(tags.lower().split(','))) if tags else None
time = cells[self.TIME_INDEX - 1] time = cells[self.TIME_INDEX - 1]
if time: if time and type(time) == str:
time = datetime.strptime(time, "%Y-%m-%d %H:%M:%S") time = datetime.strptime(time, "%Y-%m-%d %H:%M:%S")
tz = pytz.timezone('Asia/Shanghai') time = time.replace(tzinfo=tz)
elif time and type(time) == datetime:
time = time.replace(tzinfo=tz) time = time.replace(tzinfo=tz)
else: else:
time = None time = None
@ -150,8 +152,8 @@ class DoufenParser:
is_first_sheet = False is_first_sheet = False
def __get_item_number(self): def __get_item_number(self):
assert not self.__wb is None, 'workbook not found' assert self.__wb is not None, 'workbook not found'
assert not self.__mappings is None, 'mappings not found' assert self.__mappings is not None, 'mappings not found'
sheets = [mapping['sheet'] for mapping in self.__mappings] sheets = [mapping['sheet'] for mapping in self.__mappings]
item_number = 0 item_number = 0