diff --git a/MappingTable/mapping_info.xml b/MappingTable/mapping_info.xml index 89a1a65..0fb707f 100644 --- a/MappingTable/mapping_info.xml +++ b/MappingTable/mapping_info.xml @@ -3,6 +3,9 @@ keyword:用于匹配标签/导演/系列/制作/发行的关键词,每个名字前后都需要用逗号隔开。当其中包含刮削得到的关键词时,可以输出对应语言的词。 zh_cn/zh_tw/jp:指对应语言输出的词,按设置的对应语言输出。当输出词为“删除”时表示:遇到该关键词时,在对应内容中删除该关键词--> + + + @@ -46,6 +49,9 @@ zh_cn/zh_tw/jp:指对应语言输出的词,按设置的对应语言输出。 + + + @@ -377,6 +383,10 @@ zh_cn/zh_tw/jp:指对应语言输出的词,按设置的对应语言输出。 + + + + diff --git a/WebCrawler/__init__.py b/WebCrawler/__init__.py index d9c2ab0..2af960a 100644 --- a/WebCrawler/__init__.py +++ b/WebCrawler/__init__.py @@ -309,9 +309,9 @@ def get_data_from_json(file_number, oCC): # 从JSON返回元数据 elif ccm == 2: json_data['actor_list'] = [actor_mapping_data.xpath('a[contains(@keyword, $name)]/@zh_tw', name=aa)[0] for aa in json_data['actor_list']] json_data['actor'] = actor_mapping_data.xpath('a[contains(@keyword, $name)]/@zh_tw', name=json_data['actor'])[0] - # elif ccm == 3: - # json_data['actor_list'] = [actor_mapping_data.xpath('a[contains(@keyword, $name)]/@jp', name=aa)[0] for aa in json_data['actor_list']] - # json_data['actor'] = actor_mapping_data.xpath('a[contains(@keyword, $name)]/@jp', name=json_data['actor'])[0] + elif ccm == 3: + json_data['actor_list'] = [actor_mapping_data.xpath('a[contains(@keyword, $name)]/@jp', name=aa)[0] for aa in json_data['actor_list']] + json_data['actor'] = actor_mapping_data.xpath('a[contains(@keyword, $name)]/@jp', name=json_data['actor'])[0] except: json_data['actor_list'] = [oCC.convert(aa) for aa in json_data['actor_list']] json_data['actor'] = oCC.convert(json_data['actor']) @@ -323,16 +323,23 @@ def get_data_from_json(file_number, oCC): # 从JSON返回元数据 elif ccm == 2: json_data[cc] = [info_mapping_data.xpath('a[contains(@keyword, $name)]/@zh_tw', name=t)[0] for t in json_data[cc]] json_data[cc] = ADC_function.delete_all_elements_in_list("删除", json_data[cc]) - # elif ccm == 3: - # json_data[cc] = [info_mapping_data.xpath('a[contains(@keyword, $name)]/@jp', name=t)[0] for t in json_data[cc]] - # #json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + elif ccm == 3: + json_data[cc] = [info_mapping_data.xpath('a[contains(@keyword, $name)]/@jp', name=t)[0] for t in json_data[cc]] + json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) except: json_data[cc] = [oCC.convert(t) for t in json_data[cc]] - # elif cc == "studio": - # elif cc == "series": - # elif cc == "label": else: try: + if ccm == 1: + json_data[cc] = actor_mapping_data.xpath('a[contains(@keyword, $name)]/@zh_cn', name=json_data[cc])[0] + json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + elif ccm == 2: + json_data[cc] = actor_mapping_data.xpath('a[contains(@keyword, $name)]/@zh_tw', name=json_data[cc])[0] + json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + elif ccm == 3: + json_data[cc] = actor_mapping_data.xpath('a[contains(@keyword, $name)]/@jp', name=json_data[cc])[0] + json_data[cc] = ADC_function.delete_list_all_elements("删除", json_data[cc]) + except IndexError: json_data[cc] = oCC.convert(json_data[cc]) except: pass