subextract 0.2.0__tar.gz → 0.3.0__tar.gz

subextract-0.3.0/PKG-INFO

@@ -0,0 +1,18 @@
+Metadata-Version: 2.4
+Name: subextract
+Version: 0.3.0
+Summary: CLI for easy extraction of subtitles from mkv files
+Keywords: subtitle,cli,media,mkv
+Author: disrupted
+Author-email: disrupted <hi@salomonpopp.me>
+License-Expression: GPL-3.0-only
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Classifier: Environment :: Console
+Classifier: Typing :: Typed
+Requires-Dist: langcodes>=3.5.1
+Requires-Dist: pyyaml>=6.0.3
+Requires-Python: >=3.15
+Project-URL: Homepage, https://github.com/disrupted/subextract
+Project-URL: Repository, https://github.com/disrupted/subextract
+Project-URL: Issues, https://github.com/disrupted/subextract/issues

subextract-0.3.0/pyproject.toml

@@ -0,0 +1,106 @@
+[project]
+name = "subextract"
+version = "0.3.0"
+description = "CLI for easy extraction of subtitles from mkv files"
+license = "GPL-3.0-only"
+requires-python = ">=3.15"
+keywords = [
+    "subtitle",
+    "cli",
+    "media",
+    "mkv",
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+    "Environment :: Console",
+    "Typing :: Typed",
+]
+dependencies = [
+    "langcodes>=3.5.1",
+    "pyyaml>=6.0.3",
+]
+
+[[project.authors]]
+name = "disrupted"
+email = "hi@salomonpopp.me"
+
+[project.urls]
+Homepage = "https://github.com/disrupted/subextract"
+Repository = "https://github.com/disrupted/subextract"
+Issues = "https://github.com/disrupted/subextract/issues"
+
+[project.scripts]
+subextract = "subextract.cli:main"
+
+[dependency-groups]
+dev = [
+    "pytest>=9.2.0",
+    "ruff>=0.17.4",
+    "ty>=0.0.101",
+]
+
+[build-system]
+requires = ["uv_build>=0.13.7,<0.14"]
+build-backend = "uv_build"
+
+[tool.ty.src]
+include = [
+    "subextract",
+    "tests",
+]
+
+[tool.ty.environment]
+python-version = "3.15"
+
+[tool.ruff]
+output-format = "grouped"
+show-fixes = true
+target-version = "py315"
+
+[tool.ruff.lint]
+select = [
+    "F",
+    "E",
+    "W",
+    "C90",
+    "I",
+    "UP",
+    "B",
+    "RUF",
+    "YTT",
+    "BLE",
+    "C4",
+    "T10",
+    "EM",
+    "ISC",
+    "ICN",
+    "INP",
+    "PIE",
+    "RSE",
+    "RET",
+    "SLOT",
+    "SIM",
+    "PTH",
+    "PGH",
+    "PL",
+    "TRY",
+]
+ignore = [
+    "E501",
+    "ISC001",
+    "PLR09",
+    "PLR2004",
+    "TRY003",
+    "RET504",
+    "RET505",
+    "RUF001",
+    "PLW2901",
+]
+
+[tool.uv]
+package = true
+trusted-publishing = "always"
+
+[tool.uv.build-backend]
+module-root = ""

subextract-0.3.0/pyproject.toml.orig

@@ -0,0 +1,97 @@
+[project]
+name = "subextract"
+version = "0.3.0"
+description = "CLI for easy extraction of subtitles from mkv files"
+license = "GPL-3.0-only"
+requires-python = ">=3.15"
+authors = [
+  { name = "disrupted", email = "hi@salomonpopp.me" },
+]
+keywords = ["subtitle", "cli", "media", "mkv"]
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "Operating System :: OS Independent",
+  "Environment :: Console",
+  "Typing :: Typed",
+]
+dependencies = [
+  "langcodes>=3.5.1",
+  "pyyaml>=6.0.3",
+]
+
+[project.urls]
+Homepage = "https://github.com/disrupted/subextract"
+Repository = "https://github.com/disrupted/subextract"
+Issues = "https://github.com/disrupted/subextract/issues"
+
+[project.scripts]
+subextract = "subextract.cli:main"
+
+[dependency-groups]
+dev = [
+  "pytest>=9.2.0",
+  "ruff>=0.17.4",
+  "ty>=0.0.101",
+]
+
+[build-system]
+requires = ["uv_build>=0.13.7,<0.14"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-root = ""
+
+[tool.ty]
+src = { include = ["subextract", "tests"] }
+
+[tool.ty.environment]
+python-version = "3.15"
+
+[tool.ruff]
+output-format = "grouped"
+show-fixes = true
+target-version = "py315"
+
+[tool.ruff.lint]
+select = [
+  "F",
+  "E",
+  "W",
+  "C90",
+  "I",
+  "UP",
+  "B",
+  "RUF",
+  "YTT",
+  "BLE",
+  "C4",
+  "T10",
+  "EM",
+  "ISC",
+  "ICN",
+  "INP",
+  "PIE",
+  "RSE",
+  "RET",
+  "SLOT",
+  "SIM",
+  "PTH",
+  "PGH",
+  "PL",
+  "TRY",
+]
+ignore = [
+  "E501",
+  "ISC001",
+  "PLR09",
+  "PLR2004",
+  "TRY003",
+  "RET504",
+  "RET505",
+  "RUF001",
+  "PLW2901",
+]
+
+[tool.uv]
+package = true
+trusted-publishing = "always"

{subextract-0.2.0 → subextract-0.3.0}/subextract/cli.py

@@ -9,7 +9,7 @@ from pathlib import Path
 import yaml
 
 from . import __version__
-from .language import Language
+from .language import DEFAULT_LANGUAGE, Language
 
 parser = argparse.ArgumentParser(description="Extract subtitles from MKV files")
 parser.add_argument(
@@ -34,9 +34,9 @@ parser.add_argument(
 )
 parser.add_argument(
     "--lang",
-    type=Language,
     help="Language to extract (default: en)",
-    default=Language("en"),
+    type=Language.from_str,
+    default=DEFAULT_LANGUAGE,
 )
 parser.add_argument(
     "--sdh",
@@ -50,7 +50,7 @@ parser.add_argument(
     "file",
     nargs="+",
     metavar="FILE",
-    type=argparse.FileType("r"),
+    type=Path,
     help="the .mkv video file",
 )
 
@@ -62,13 +62,13 @@ def mkvextract(track_id: int, path: Path, out_filename: str):
         "tracks",
         f"{track_id}:{path.with_name(out_filename)}",
     ]
-    proc = subprocess.run(mkvextract_args)
+    proc = subprocess.run(mkvextract_args, check=True)
     return proc
 
 
 def identify(path: Path) -> dict:
     mkvmerge_args = ["mkvmerge", "-F", "json", "-i", path]
-    proc = subprocess.run(mkvmerge_args, stdout=subprocess.PIPE)
+    proc = subprocess.run(mkvmerge_args, stdout=subprocess.PIPE, check=True)
     return json.loads(proc.stdout)
 
 
@@ -87,7 +87,7 @@ def is_sdh(track: dict, sdh: bool) -> bool:
 
 
 def get_out_name(path: Path, track: dict) -> str:
-    lang = Language(track["properties"]["language"]).alpha1
+    lang = Language.from_str(track["properties"]["language"]).alpha1
     return f"{path.stem}.{lang}.srt"
 
 
@@ -100,7 +100,7 @@ def extract(path: Path, track: dict):
 
 def main():
     args = parser.parse_args()
-    if args.id and (args.lang or args.sdh):
+    if args.id and (args.lang != DEFAULT_LANGUAGE or args.sdh):
         parser.error("--id and --lang|--sdh are mutually exclusive")
 
     logging.basicConfig(
@@ -108,9 +108,8 @@ def main():
         format="%(levelname)s | %(message)s",
     )
 
-    for f in args.file:
-        path = Path(f.name)
-        if path.suffix not in ".mkv":
+    for path in args.file:
+        if path.suffix != ".mkv":
             logging.error(f"wrong file extension {path.suffix}")
             sys.exit(1)
 
@@ -120,7 +119,7 @@ def main():
             try:
                 tracks = [data["tracks"][args.id]]
             except IndexError:
-                logging.error(f"subtitle with id {args.id} doesn't exist")
+                logging.exception(f"subtitle with id {args.id} doesn't exist")
                 sys.exit(1)
         else:
             tracks = [

subextract-0.3.0/subextract/language.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+import langcodes
+
+
+@dataclass(frozen=True)
+class Language:
+    _lang: langcodes.Language
+
+    @staticmethod
+    def from_str(lang: str) -> Language:
+        return Language(langcodes.Language.get(lang))
+
+    @property
+    def alpha1(self):
+        """en"""
+        return self._lang.to_tag()
+
+    @property
+    def alpha2(self):
+        """eng"""
+        return self._lang.to_alpha3(variant="B")
+
+
+DEFAULT_LANGUAGE = Language.from_str(langcodes.DEFAULT_LANGUAGE)

subextract-0.2.0/PKG-INFO

@@ -1,14 +0,0 @@
-Metadata-Version: 2.1
-Name: subextract
-Version: 0.2.0
-Summary: CLI for easy extraction of subtitles from mkv files
-License: GPL-3.0
-Author: disrupted
-Author-email: hi@salomonpopp.me
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.9
-Requires-Dist: PyYAML (>=6.0,<7.0)
-Requires-Dist: langcodes (>=3.3.0,<4.0.0)

subextract-0.2.0/pyproject.toml

@@ -1,20 +0,0 @@
-[tool.poetry]
-name = "subextract"
-version = "0.2.0"
-description = "CLI for easy extraction of subtitles from mkv files"
-authors = ["disrupted <hi@salomonpopp.me>"]
-license = "GPL-3.0"
-
-[tool.poetry.scripts]
-subextract = 'subextract.cli:main'
-
-[tool.poetry.dependencies]
-python = "^3.9"
-PyYAML = "^6.0"
-langcodes = "^3.3.0"
-
-[tool.poetry.dev-dependencies]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"

subextract-0.2.0/setup.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['subextract']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['PyYAML>=6.0,<7.0', 'langcodes>=3.3.0,<4.0.0']
-
-entry_points = \
-{'console_scripts': ['subextract = subextract.cli:main']}
-
-setup_kwargs = {
-    'name': 'subextract',
-    'version': '0.2.0',
-    'description': 'CLI for easy extraction of subtitles from mkv files',
-    'long_description': None,
-    'author': 'disrupted',
-    'author_email': 'hi@salomonpopp.me',
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': None,
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'entry_points': entry_points,
-    'python_requires': '>=3.9,<4.0',
-}
-
-
-setup(**setup_kwargs)

subextract-0.2.0/subextract/language.py

@@ -1,16 +0,0 @@
-import langcodes
-
-
-class Language:
-    def __init__(self, lang: str):
-        self._lang = langcodes.Language.get(lang)
-
-    @property
-    def alpha1(self):
-        """en"""
-        return self._lang.to_tag()
-
-    @property
-    def alpha2(self):
-        """eng"""
-        return self._lang.to_alpha3(variant="B")