Merge pull request #3 from raydouglass/overhaul

Updates to repo

.github/workflows/pr.yml

@@ -7,24 +7,26 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  format:
+  pre-commit:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Run black formatter
-        uses: psf/black@stable
+        uses: actions/checkout@v4
         with:
-          src: media_management_scripts
+          fetch-depth: 0
+      - name: Run pre-commit
+        uses: pre-commit/[email protected]
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11"]
-    needs: format
+    needs: pre-commit
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:

.github/workflows/publish.yml

@@ -0,0 +1,37 @@
+name: Publish releases
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+
+jobs:
+  build-and-publish:
+    name: Build and publish
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: Install pypa/setuptools
+      run: |
+        python -m pip install build
+    - name: Build wheels
+      run: |
+        python3 -m build --sdist --wheel --outdir dist/ .
+    - name: Publish distribution to Test PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        repository-url: https://test.pypi.org/legacy/
+    - name: Publish distribution to PyPI if tagged
+      if: startsWith(github.ref, 'refs/tags')
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

@@ -1,14 +1,155 @@
-*.log
-dist/
-deploy.sh
-*.pyc
-node_modules/
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
 build/
-static/
-*.sqlite3
-.idea/
-awsCredentials.py
-temperature_package.tgz
-.coverage
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
 *.egg-info/
-.vscode/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+.vscode/

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+  - repo: https://github.com/psf/black
+    rev: 23.9.1
+    hooks:
+      - id: black

README.md

@@ -47,7 +47,7 @@ __[rename](#rename)__
 __[search](#search)__
 
 __[tv-rename](#tv-rename)__
- 
+
 
 Help output
 ```
@@ -158,7 +158,7 @@ Battlestar Galatica (2003) - s00e01 - Battlestar Galactica The Miniseries (1).mk
 
 ## rename
 
-`manage-media rename <template> <input file>` or `manage-media rename --recursive <template> <input directory>` 
+`manage-media rename <template> <input file>` or `manage-media rename --recursive <template> <input directory>`
 
 A flexible tool to rename files
 
@@ -272,7 +272,7 @@ For example, if you ripped some Battlestar Galactica blurays, you might have a f
     - BSG_Season1_Disc2_t01.mkv
     - BSG_Season1_Disc2_t02.mkv
     - BSG_Season1_Disc2_t03.mkv
-   
+
 `manage-media tv-rename -s 1 -e 1 --tvdb --show "Battlestar Galactica" --output "BSG/Season 1" BSG_Season1_Disc*`
 
 Result
@@ -286,8 +286,8 @@ Result
         - Battlestar Galatica (2003) - S01E06 - Litmus.mkv
         - Battlestar Galatica (2003) - S01E07 - Six Degrees of Separation.mkv
         - Battlestar Galatica (2003) - S01E08 - Flesh and Bone.mkv
-        
-        
+
+
 ## Configuration
 
 You can configuration where to find various executables by creating a file `~/.config/mms/config.ini`. By default, commands will use the executables found in your path.

media_management_scripts/__init__.py

@@ -1 +1,6 @@
-version = "0.4.4"
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version("media_management_scripts")
+except PackageNotFoundError:
+    __version__ = "unknown version"

media_management_scripts/commands/__init__.py

@@ -152,7 +152,7 @@ def _bulk_print(
     "itunes",
     "metadata",
     "metadata_compare",
-    #'movie_rename',
+    "movie_rename",
     "rename",
     "search",
     "select_streams",

media_management_scripts/commands/convert.py

@@ -20,7 +20,7 @@ def name(self):
     def build_argparse(self, subparser):
         desc = """
     Converts a video file to 'standard' parameters. By default, this is H264 with AAC audio.
-    
+
     Convert to HEVC/H.265:
         convert --video-codec hevc <input> <output>
     Convert to HEVC with AC3 audio:

media_management_scripts/commands/movie_rename.py

@@ -20,12 +20,6 @@ def build_argparse(self, subparser):
             const=True,
             default=False,
         )
-        movie_rename_parser.add_argument("--ssh")
-        movie_rename_parser.add_argument("--username")
-        movie_rename_parser.add_argument("--host")
-        movie_rename_parser.add_argument("--pkey")
-        movie_rename_parser.add_argument("--output-path", "-o")
-        movie_rename_parser.add_argument("--move-source-path", default=None)
         movie_rename_parser.add_argument("input", nargs="+", help="Input Files")
 
     def subexecute(self, ns):