Version 1.0.0 (#2)

cdgriffith · web-flow · commit 280bb4e29714 · 2019-02-19T14:22:24.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,111 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.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/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+lvenv/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+.idea/
+
+config.yaml
+*.bat
+*.sh
diff --git a/.pep8speaks.yml b/.pep8speaks.yml
@@ -0,0 +1,11 @@
+# File : .pep8speaks.yml
+scanner:
+    diff_only: False
+
+
+pycodestyle:
+    max-line-length: 120
+    ignore:
+        - E402  # module level import not at top of file
+
+only_mention_files_with_errors: True
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1 @@
+FastFlix is written and maintained by Chris Griffith chris@cdgriffith.com.
diff --git a/CHANGES b/CHANGES
@@ -0,0 +1,7 @@
+Changelog
+---------
+
+Version 1.0.0
+~~~~~~~~~~~~~
+
+* Initial release
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2019 Chris Griffith
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -6,16 +6,25 @@ It is designed to work with ffmpeg with x265 support or an equivalent command li
 
 They are expected to be found via the system path or specified on startup via `FFMPEG` and `FFPROBE` env variables.
 
-# Installing
+# Releases 
 
-If you don't already have it, first step is to download ffmpeg. 
+View the [releases](https://github.com/cdgriffith/FastFlix/releases) for Windows and Linux binaries (Generated via Appveyor and also [available there](https://ci.appveyor.com/project/cdgriffith/fastflix)). 
 
-## Windows
+For legal reasons the ffmpeg binary cannot be bundled with the executable and must be [separately downloaded](https://www.ffmpeg.org/download.html).
 
-View the [releases](https://github.com/cdgriffith/FastFlix/releases) for prebuilt Windows binaries. For legal reasons
-the ffmpeg binary cannot bundled and must be [separately downloaded](https://ffmpeg.zeranoe.com/builds/).
+## Setting up ffmpeg
 
-## Linux
+There are three ways provided a path to ffmpeg. 
+
+1. Looks in the FFMPEG and FFPROBE environment variables
+2. Looks on the system PATH to see if it is already available
+3. Manually link to the directory housing the binary files via the GUI 
+
+## Running the code locally
+
+Requires Python 3.6 or greater. 
+
+Download and extract the [latest zip](https://github.com/cdgriffith/FastFlix/archive/master.zip). Then run the following.
 
 ```
 pip install requirements.txt
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,41 @@
+version: 1.0.0-{build}
+
+skip_commits:
+  files:
+    - data/*
+    - README.md
+    - AUTHORS
+    - CHANGES
+    - LICENSE
+    - .gitignore
+    - .pip8speaks.yml
+  message: /\[skip ci\]/
+
+
+image:
+  - Ubuntu1804
+  - Visual Studio 2017
+
+platform: x64
+
+branches:
+  only:
+  - master
+  - build
+
+install:
+  - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed
+  - cmd: C:\Python36-x64\python -m pip install -r requirements.txt
+  - sh: sudo apt install python3-pip -y
+  - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed --no-cache-dir
+  - sh: sudo python3.6 -m pip install -r requirements.txt --no-cache-dir --progress-bar off
+
+
+build_script:
+  - cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --noconsole flix\gui.py  --icon data\icon.ico --name FastFlix --clean --onefile
+  - sh: pyinstaller --add-data "data/icon.ico:data/" --noconsole flix/gui.py  --icon data/icon.ico --name FastFlix --clean --onefile
+
+test: off
+
+artifacts:
+  - path: dist\*
diff --git a/data/icon.ico b/data/icon.ico
diff --git a/flix/__init__.py b/flix/__init__.py
@@ -0,0 +1 @@
+from flix.flix import *
diff --git a/flix/__main__.py b/flix/__main__.py
@@ -0,0 +1,3 @@
+from flix.gui import main
+
+main()
diff --git a/flix/flix.py b/flix/flix.py
@@ -0,0 +1,122 @@
+from subprocess import run, PIPE
+import logging
+import os
+
+from box import Box, BoxError
+
+__all__ = ['FlixError', 'ff_version', 'Flix']
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+logger = logging.getLogger('flix')
+
+
+class FlixError(Exception):
+    """This flix won't fly"""
+
+
+def ff_version(ff, throw=True):
+    res = Flix.execute(f'"{ff}" -version')
+    if res.returncode != 0:
+        if throw:
+            raise FlixError(f'"{ff}" file not found')
+        else:
+            return None
+    return res.stdout.decode("utf-8").split(" ", 4)[2]
+
+
+class Flix:
+
+    def __init__(self, ffmpeg='ffmpeg', ffprobe='ffprobe'):
+        self.ffmpeg = ffmpeg
+        self.ffprobe = ffprobe
+        ff_version(self.ffmpeg)
+        ff_version(self.ffprobe)
+
+    def probe(self, file):
+        command = f'"{self.ffprobe}" -v quiet -print_format json -show_format -show_streams "{file}"'
+        logger.debug(f'running probe command: {command}')
+        result = self.execute(command)
+        try:
+            return Box.from_json(result.stdout.decode("utf-8"))
+        except BoxError:
+            logger.error(f"Could not decode output: {result.stderr}")
+            raise FlixError(result.stderr)
+
+    def parse(self, file):
+        data = self.probe(file)
+        if 'streams' not in data:
+            raise FlixError('Not a video file')
+        streams = {'video': [],
+                   'audio': [],
+                   'subtitle': [],
+                   'attachment': [],
+                   'data': []}
+
+        for track in data.streams:
+            if track.codec_type in streams:
+                streams[track.codec_type].append(track)
+            else:
+                logger.error(f'Unknown codec: {track.codec_type}')
+        return streams, data.format
+
+    def generate_x265_command(self, source, output, video_track, audio_track=None, additional_tracks=(),
+                              start_time=0, duration=None, crf=20, preset="medium", disable_hdr=False, scale_width=None,
+                              scale_height=None, keep_subtitles=False, crop=None):
+        start = ''
+        if duration:
+            start = f'-ss {start_time} -t {duration} -write_tmcd 0'
+
+        maps = ""
+        for track in additional_tracks:
+            maps += f" -map 0:{track} "
+
+        filter_list = []
+
+        if disable_hdr:
+            filter_list.append('zscale=t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0,'
+                               'zscale=t=bt709:m=bt709:r=tv,format=yuv420p')
+
+        if scale_width:
+            filter_list.append(f'scale={scale_width}:-1')
+        elif scale_height:
+            filter_list.append(f'scale=-1:{scale_height}')
+
+        if crop:
+            filter_list.append(f'crop={crop}')
+
+        filters = ",".join(filter_list)
+
+        return (f'"{self.ffmpeg}" -loglevel fatal -i "{source}" {start} '
+                f'-c:v libx265 -preset {preset} -x265-params log-level=error:crf={crf} -pix_fmt yuv420p '
+                f'{"-map_metadata -1" if start else ""} {f"-vf {filters}" if filters else ""} '
+                f'-map 0:{video_track} {"-an" if audio_track is None else f"-map 0:{audio_track}"} {maps} '
+                f'{"-map 0:s" if keep_subtitles else "-sn"} '
+                # -filter_complex "[0:v:0][0:3]overlay"
+                f' -y "{output}"')
+
+    def generate_thumbnail_command(self, source, output, video_track, start_time=0, disable_hdr=False,
+                                   crop=None):
+        start = ''
+        if start_time:
+            start = f'-ss {start_time}'
+
+        filter_list = []
+
+        if disable_hdr:
+            filter_list.append('zscale=t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0,'
+                               'zscale=t=bt709:m=bt709:r=tv,format=yuv420p')
+
+        if crop:
+            filter_list.append(f'crop={crop}')
+
+        filters = ",".join(filter_list) + "," if filter_list else ""
+
+        return (f'"{self.ffmpeg}" {start} -loglevel error -i "{source}"  '
+                f" -vf {filters}scale=min(600\\,iw):-1 "
+                f'-map 0:{video_track} -an -y '
+                f'-vframes 1 "{output}"')
+
+    @staticmethod
+    def execute(command):
+        return run(command, stdout=PIPE, stderr=PIPE, stdin=PIPE, shell=True)
diff --git a/flix/gui.py b/flix/gui.py
diff --git a/requirements.txt b/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+FastFlix is written and maintained by Chris Griffith [email protected].`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from flix.gui import main`
	`2`	`+`
	`3`	`+main()`