Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove FileNameParser class #80

Merged
merged 1 commit into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 1 addition & 27 deletions darkseid/comic.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
from darkseid.archivers.rar import RarArchiver
from darkseid.archivers.zip import ZipArchiver
from darkseid.comicinfo import ComicInfo
from darkseid.filename import FileNameParser
from darkseid.metadata import Metadata, Series
from darkseid.metadata import Metadata

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -259,31 +258,6 @@ def apply_archive_info_to_metadata(
except OSError:
page["ImageSize"] = str(len(data))

def metadata_from_filename(self: "Comic", parse_scan_info: bool = True) -> Metadata:
"""Attempts to get the metadata from the filename."""
metadata = Metadata()

fnp = FileNameParser()
fnp.parse_filename(self.path)

if fnp.issue != "":
metadata.issue = fnp.issue
if fnp.series != "":
series = Series(name=fnp.series)
if fnp.volume != "":
series.volume = fnp.volume
metadata.series = series
if fnp.year != "":
metadata.cover_date.year = fnp.year
if fnp.issue_count != "":
metadata.issue_count = fnp.issue_count
if parse_scan_info and fnp.remainder != "":
metadata.scan_info = fnp.remainder

metadata.is_empty = False

return metadata

def export_as_zip(self: "Comic", zipfilename: Path) -> bool:
"""Export CBR archives to CBZ format."""
if self.archive_type == self.ArchiveType.zip:
Expand Down
277 changes: 0 additions & 277 deletions darkseid/filename.py

This file was deleted.

16 changes: 0 additions & 16 deletions tests/test_comic.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,6 @@ def test_cbz_get_random_page(fake_cbz: Comic) -> None:
assert image == page


def test_archive_metadata_from_filename(fake_cbz: Comic) -> None:
"""Test to get metadata from comic archives filename."""
test_md = fake_cbz.metadata_from_filename()
assert test_md.series.name == "Captain Science"
assert test_md.issue == "1"


@pytest.mark.skipif(sys.platform in ["win32"], reason="Skip Windows.")
def test_archive_apply_file_info_to_metadata(fake_cbz: Comic) -> None:
"""Test to apply archive info to the generic metadata."""
Expand Down Expand Up @@ -192,15 +185,6 @@ def test_rar_read_metadata(fake_rar: Comic) -> None:
assert md.page_count == 36


# Skip test for Windows and MacOS.
@pytest.mark.skipif(sys.platform in ["win32", "darwin"], reason="Skip MacOS & Windows.")
def test_rar_metadata_from_filename(fake_rar: Comic) -> None:
"""Test to get metadata from comic archives filename."""
test_md = fake_rar.metadata_from_filename()
assert test_md.series.name == "Captain Science"
assert test_md.issue == "1"


# Skip test for Windows and MacOS.
@pytest.mark.skipif(sys.platform in ["win32", "darwin"], reason="Skip MacOS & Windows.")
def test_rar_number_of_pages(fake_rar: Comic) -> None:
Expand Down
Loading
Loading