lordwelch/comicapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wordSplit' into develop

Browse Source
This commit is contained in:
lordwelch 2022-05-19 17:58:45 -07:00
commit 59eff520c8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comicapi/comicarchive.py
View File

@ -28,6 +28,7 @@ import zipfile
import natsort import natsort
import py7zr import py7zr
import wordninja
try: try:
from unrar.cffi import rarfile from unrar.cffi import rarfile
@ -1134,12 +1135,17 @@ class ComicArchive:
remove_c2c: bool = False, remove_c2c: bool = False,
remove_fcbd: bool = False, remove_fcbd: bool = False,
remove_publisher: bool = False, remove_publisher: bool = False,
split_words: bool = False,
) -> GenericMetadata: ) -> GenericMetadata:
metadata = GenericMetadata() metadata = GenericMetadata()
filename = self.path.name
if split_words:
filename = " ".join(wordninja.split(self.path.stem)) + self.path.suffix
if complicated_parser: if complicated_parser:
lex = filenamelexer.Lex(self.path.name) lex = filenamelexer.Lex(filename)
p = filenameparser.Parse( p = filenameparser.Parse(
lex.items, remove_c2c=remove_c2c, remove_fcbd=remove_fcbd, remove_publisher=remove_publisher lex.items, remove_c2c=remove_c2c, remove_fcbd=remove_fcbd, remove_publisher=remove_publisher
) )
@ -1159,7 +1165,7 @@ class ComicArchive:
metadata.format = "Annual" metadata.format = "Annual"
else: else:
fnp = filenameparser.FileNameParser() fnp = filenameparser.FileNameParser()
fnp.parse_filename(str(self.path)) fnp.parse_filename(filename)
if fnp.issue: if fnp.issue:
metadata.issue = fnp.issue metadata.issue = fnp.issue