Vanilla/artemis
1
0
Fork 0
forked from Hay1tsme/artemis
Code Pull Requests Activity

mai2: fix opt reader

Browse Source
This commit is contained in:
Hay1tsme
2025-04-08 23:45:15 -04:00
parent 9a14e54328
commit c955c1ae37
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
titles/mai2/read.py
View File

@ -349,16 +349,16 @@ class Mai2Reader(BaseReader):
with open(datacfg_file, encoding="utf-8") as f: with open(datacfg_file, encoding="utf-8") as f:
troot = ET.fromstring(f.read()) troot = ET.fromstring(f.read())
if troot.find("DataConfig/version") is None: if troot.find("version") is None:
self.logger.warning(f"{directory}/DataConfig.xml contains no Version section, opt info will not be read") self.logger.warning(f"{directory}/DataConfig.xml contains no Version section, opt info will not be read")
return None return None
ver_maj = troot.find("DataConfig/version/major") ver_maj = troot.find("version/major")
ver_min = troot.find("DataConfig/version/minor") ver_min = troot.find("version/minor")
ver_rel = troot.find("DataConfig/version/release") ver_rel = troot.find("version/release")
cm_maj = troot.find("DataConfig/cardMakerVersion/major") cm_maj = troot.find("cardMakerVersion/major")
cm_min = troot.find("DataConfig/cardMakerVersion/minor") cm_min = troot.find("cardMakerVersion/minor")
cm_rel = troot.find("DataConfig/cardMakerVersion/release") cm_rel = troot.find("cardMakerVersion/release")
if ver_maj is None: # Probably not worth checking that the other sections exist if ver_maj is None: # Probably not worth checking that the other sections exist
self.logger.warning(f"{datacfg_file} contains no major item in the Version section, opt info will not be read") self.logger.warning(f"{datacfg_file} contains no major item in the Version section, opt info will not be read")
@ -376,7 +376,7 @@ class Mai2Reader(BaseReader):
opt_id = await self.data.static.get_opt_by_version_folder(self.version, opt_folder) opt_id = await self.data.static.get_opt_by_version_folder(self.version, opt_folder)
if not opt_id: if not opt_id:
opt_id = await self.data.static.put_opt(self.version, opt_folder, int(ver_rel.text), int(cm_rel.text) if cm_rel else None) opt_id = await self.data.static.put_opt(self.version, opt_folder, int(ver_rel.text), int(cm_rel.text) if cm_rel is not None else None)
if not opt_id: if not opt_id:
self.logger.error(f"Failed to put opt folder info for {opt_folder}") self.logger.error(f"Failed to put opt folder info for {opt_folder}")
return None return None
@ -384,6 +384,6 @@ class Mai2Reader(BaseReader):
opt_id = opt_id['id'] opt_id = opt_id['id']
self.logger.info( self.logger.info(
f"Opt folder {opt_folder} (Database ID {opt_id}) contains v{ver_maj.text}.{ver_min.text}.{ver_rel.text} (cm v{cm_maj.text if cm_maj else 'None'}.{cm_min.text if cm_min else 'None'}.{cm_rel.text if cm_rel else 'None'})" f"Opt folder {opt_folder} (Database ID {opt_id}) contains v{ver_maj.text}.{ver_min.text}.{ver_rel.text} (cm v{cm_maj.text if cm_maj is not None else 'None'}.{cm_min.text if cm_min is not None else 'None'}.{cm_rel.text if cm_rel is not None else 'None'})"
) )
return opt_id return opt_id