From f22fe297c53853b0990108e5f8b4f1580d5d742b Mon Sep 17 00:00:00 2001 From: Barbagus Date: Thu, 8 Dec 2022 22:39:46 +0100 Subject: [PATCH] Packaging with flit --- .gitignore | 4 +++- README.md | 15 +------------- pyproject.toml | 28 +++++++++++++++++++++++++++ requirements-dev.txt | 3 --- requirements.txt | 2 -- delarte.py => src/delarte/__init__.py | 10 ++-------- src/delarte/__main__.py | 3 +++ 7 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 pyproject.toml delete mode 100644 requirements-dev.txt delete mode 100644 requirements.txt rename delarte.py => src/delarte/__init__.py (98%) mode change 100755 => 100644 create mode 100644 src/delarte/__main__.py diff --git a/.gitignore b/.gitignore index b339c25..84ea02d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ *.pyc __pycache__/ .vscode/ -*.mkv \ No newline at end of file +*.mkv +dist/ +.venv/ \ No newline at end of file diff --git a/README.md b/README.md index e2e1ede..252733d 100644 --- a/README.md +++ b/README.md @@ -14,20 +14,7 @@ ArteTV is a is a European public service channel dedicated to culture. Available 🚀 Quick start --------------- -_(Linux/Debian distribution)_ - -```bash -sudo apt install ffmpeg -mkdir ~/.venvs && python3 -m venv ~/.venvs/delarte -source ~/.venvs/delarte/bin/activate -git clone https://gitlab.com/Barbagus/delarte.git && cd delarte -pip install -r requirements.txt -export PATH_FFMPEG=$(which ffmpeg) -``` - -```bash -./delarte.py -``` +_to be determined_ 🔧 How it works diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..b7ea7d0 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,28 @@ +[build-system] +requires = ["flit_core >=3.2,<4"] +build-backend = "flit_core.buildapi" + +[project] +name = "delarte" +authors = [{name = "Etienne Zind", email = "etienne.zind@proton.me"}] +readme = "README.md" +license = {file = "LICENSE.md"} +classifiers = ["License :: OSI Approved :: GNU Affero General Public License v3"] +dynamic = ["version", "description"] +dependencies = [ + "m3u8", + "webvtt-py", +] + +[project.urls] +Home = "https://gitlab.com/Barbagus/delarte" + +[project.optional-dependencies] +dev = [ + "black", + "pydocstyle", + "toml" +] + +[project.scripts] +delarte = "delarte:main" \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index b709a81..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,3 +0,0 @@ -black -pydocstyle -toml diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 3908ec3..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -m3u8 -webvtt-py diff --git a/delarte.py b/src/delarte/__init__.py old mode 100755 new mode 100644 similarity index 98% rename from delarte.py rename to src/delarte/__init__.py index f500e60..1de6f15 --- a/delarte.py +++ b/src/delarte/__init__.py @@ -1,6 +1,3 @@ -#!/usr/bin/env python3 -# coding: utf8 - """delarte. ArteTV downloader @@ -9,6 +6,7 @@ Licence: GNU AGPL v3: http://www.gnu.org/licenses/ This file is part of [`delarte`](https://gitlab.com/Barbagus/delarte) """ +__version__ = "0.1" import io import json @@ -190,7 +188,7 @@ def build_args(video_index_url, audio_track, subtitles_track, file_base_name): if subtitles_track: subtitles_lang, subtitles_file = subtitles_track - args = [FFMPEG] + args = ["ffmpeg"] args.extend(["-i", video_index_url]) args.extend(["-i", audio_index_url]) if subtitles_track: @@ -252,7 +250,3 @@ def main(): subprocess.run(args) if subtitle_file: os.unlink(subtitle_file) - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/src/delarte/__main__.py b/src/delarte/__main__.py new file mode 100644 index 0000000..8273c4f --- /dev/null +++ b/src/delarte/__main__.py @@ -0,0 +1,3 @@ +from . import main + +main()