-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Temp exe * Updated temporary exe file * Delete tesla_dashcam_190b3.exe * Fix check release * Updated README with initial 0.1.10 and additional TODO Updated README with items already in progress for 0.1.10 Added items to TODO list * Fix running tesla_dashcam when installed with pip * Updated README with additional items done for next release * Initial set of updates for 0.1.10. * Timestamp sorting fix * Added Chapter Markers in To-Do list * Made behaviour for single folder same as multiple Made behaviour for single folder discovered same as multiple. * --delete_souce now also for execution without --monitor * Updated README and reorged 0.1.10 items a bit * Fix deleting foldr file if name same as clip name * Exclude ffmpeg.exe * Default output folder, change in folder filename Added default output folder Changed folder filename to <Start_Timestamp>_<End_Timestamp> Source is optional now * Set Python version to 3.7 only * Updated readme for 0.1.10 Finished updating readme * Set version to 0.1.10 * Fixed metadata issue Fixed if all 3 files of a timestamp are corrupt Ensured that video_timestamp is dateformat if timestamp was retrieved from filename instead of clip. * Fixed issue if camera file was missing Fixed an issue if a camera file was missing. Removed now unused MOVIE_LAYOUT dictionary * Release 0.1.10 * Fixed traceback issue for ffmpeg (#39) * Added option to test distribution with TestPyPi * Version change to 0.1.11 * Updated README Added 2 fixes for 0.1.11 Added option to crop videos in TODO section * Fixed output folder issues * Missing piece for PyPi Figured out missing piece allowing easy execution from PyPi. * Updated links to executables * Removed DIAGONAL as it is not implemented * Formatting update with Black Formatting update with Black * Fix for folder deletion with empty files Fix for issue #40 where folders would not be deleted if there are 0-byte or corrupt files within the folder * Fixed --output with filename issue Fixed issue #52 with --output when providing a filename * Changed concat for movie creation Changed how to concatenate the clips in create_movie resulting in massive performance improvement. * Updated README for create_movie Updated readme for create_movie performance improvement * Add chapter markers Concatenated video files now will have chapter markers. Folder level will have chapters for each clip, merged will have chapters for each folder * removed single clip exception Removed single clip exception for creating movie as we now add chapters in it as well hence need to process. * Add flags -movstart and +faststart Added flags -movstart and +faststart to movies (not clips) created * Updated README * Version change to 0.1.12 beta 0 * Further fix for output argument Further fix for output argument to determine what was provided. * Fix chapter settings when video speed is adjusted Chapter settings were not taking into consideration that clips were sped-up or slowed-down. * Fix issue 54 (win10toast notifier) Potential fix for issue 54 * Missed something * Fix traceback with invalid output path * Trigger file or folder and few fixes Option to provide a trigger file or folder for monitoring. Fix for sub-dir scanning Fix for nothing being processed if . was provided as source. * Cosmetic fixes * Added chapter offset & movie filename fix Added optional chapter offset for merged video file. Fix for moviefile when output filename is provided on monitor * Beta version 0.1.12.2 * Fix typo in new version check output (#56) * Update README * Final prep of README for 0.1.12 * Cleanup * Fixes for chapter and deletion with corruptio files Fix for chapter of 1st clip Fix for deletion of files & folders with corrupt files. * Fix oopsie * Fix if file does not have timestamp Fix if fiel does not have timestamp for issue introduced with fixing deletion of corrupt/empty files * Added durations of resulting movie to print out * Version to 0.1.12 for release
- Loading branch information
1 parent
ea11d61
commit 30ec25b
Showing
4 changed files
with
1,573 additions
and
1,206 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,20 +14,19 @@ | |
| from setuptools import find_packages, setup, Command # type: ignore | ||
|
|
||
| # Package meta-data. | ||
| NAME = 'tesla_dashcam' | ||
| DESCRIPTION = 'Python program to merge video files created by Tesla ' \ | ||
| 'dashcam' | ||
| URL = 'https://github.com/ehendrix23/tesla_dashcam' | ||
| EMAIL = '[email protected]' | ||
| AUTHOR = 'Erik Hendrix' | ||
| REQUIRES_PYTHON = '>=3.7.0' | ||
| NAME = "tesla_dashcam" | ||
| DESCRIPTION = "Python program to merge video files created by Tesla " "dashcam" | ||
| URL = "https://github.com/ehendrix23/tesla_dashcam" | ||
| EMAIL = "[email protected]" | ||
| AUTHOR = "Erik Hendrix" | ||
| REQUIRES_PYTHON = ">=3.7.0" | ||
| VERSION = None | ||
|
|
||
| # What packages are required for this module to be executed? | ||
| REQUIRED = [ # type: ignore | ||
| 'tzlocal', | ||
| 'requests', | ||
| 'psutil', | ||
| "tzlocal", | ||
| "requests", | ||
| "psutil", | ||
| ] | ||
|
|
||
| # The rest you shouldn't have to touch too much :) | ||
|
|
@@ -40,27 +39,28 @@ | |
|
|
||
| # Import the README and use it as the long-description. | ||
| # Note: this will only work if 'README.rst' is present in your MANIFEST.in file! | ||
| with io.open(os.path.join(HERE, 'README.rst'), encoding='utf-8') as f: | ||
| LONG_DESC = '\n' + f.read() | ||
| with io.open(os.path.join(HERE, "README.rst"), encoding="utf-8") as f: | ||
| LONG_DESC = "\n" + f.read() | ||
|
|
||
| # Load the package's __version__.py module as a dictionary. | ||
| ABOUT = {} # type: ignore | ||
| if not VERSION: | ||
| with open(os.path.join(HERE, NAME, '__version__.py')) as f: | ||
| with open(os.path.join(HERE, NAME, "__version__.py")) as f: | ||
| exec(f.read(), ABOUT) # pylint: disable=exec-used | ||
| else: | ||
| ABOUT['__version__'] = VERSION | ||
| ABOUT["__version__"] = VERSION | ||
|
|
||
|
|
||
| class UploadCommand(Command): | ||
| """Support setup.py upload.""" | ||
|
|
||
| description = 'Build and publish the package.' | ||
| description = "Build and publish the package." | ||
| user_options = [] # type: ignore | ||
|
|
||
| @staticmethod | ||
| def status(string): | ||
| """Prints things in bold.""" | ||
| print('\033[1m{0}\033[0m'.format(string)) | ||
| print("\033[1m{0}\033[0m".format(string)) | ||
|
|
||
| def initialize_options(self): | ||
| """Add options for initialization.""" | ||
|
|
@@ -73,21 +73,62 @@ def finalize_options(self): | |
| def run(self): | ||
| """Run.""" | ||
| try: | ||
| self.status('Removing previous builds…') | ||
| rmtree(os.path.join(HERE, 'dist')) | ||
| self.status("Removing previous builds…") | ||
| rmtree(os.path.join(HERE, "dist")) | ||
| except OSError: | ||
| pass | ||
|
|
||
| self.status('Building Source and Wheel (universal) distribution…') | ||
| os.system('{0} setup.py sdist bdist_wheel --universal'.format( | ||
| sys.executable)) | ||
| self.status("Building Source and Wheel (universal) distribution…") | ||
| os.system("{0} setup.py sdist bdist_wheel --universal".format(sys.executable)) | ||
|
|
||
| self.status('Uploading the package to PyPi via Twine…') | ||
| os.system('twine upload dist/*') | ||
| self.status("Uploading the package to PyPi via Twine…") | ||
| os.system("twine upload dist/*") | ||
|
|
||
| self.status('Pushing git tags…') | ||
| os.system('git tag v{0}'.format(ABOUT['__version__'])) | ||
| os.system('git push --tags') | ||
| self.status("Pushing git tags…") | ||
| os.system("git tag v{0}".format(ABOUT["__version__"])) | ||
| os.system("git push --tags") | ||
|
|
||
| sys.exit() | ||
|
|
||
|
|
||
| class TestUploadCommand(Command): | ||
| """Support setup.py upload.""" | ||
|
|
||
| description = "Build and publish the package to TestPyPi." | ||
| user_options = [] # type: ignore | ||
|
|
||
| @staticmethod | ||
| def status(string): | ||
| """Prints things in bold.""" | ||
| print("\033[1m{0}\033[0m".format(string)) | ||
|
|
||
| def initialize_options(self): | ||
| """Add options for initialization.""" | ||
| pass | ||
|
|
||
| def finalize_options(self): | ||
| """Add options for finalization.""" | ||
| pass | ||
|
|
||
| def run(self): | ||
| """Run.""" | ||
| try: | ||
| self.status("Removing previous builds…") | ||
| rmtree(os.path.join(HERE, "dist")) | ||
| except OSError: | ||
| pass | ||
|
|
||
| self.status("Building Source and Wheel (universal) distribution…") | ||
| os.system("{0} setup.py sdist bdist_wheel --universal".format(sys.executable)) | ||
|
|
||
| self.status("Uploading the package to TestPyPi via Twine…") | ||
| os.system( | ||
| "twine upload --repository-url " "https://test.pypi.org/legacy/ dist/*" | ||
| ) | ||
|
|
||
| self.status("Pushing git tags…") | ||
| os.system("git tag v{0}".format(ABOUT["__version__"])) | ||
| os.system("git push --tags") | ||
|
|
||
| sys.exit() | ||
|
|
||
|
|
@@ -135,39 +176,33 @@ def run(self): | |
| # Where the magic happens: | ||
| setup( | ||
| name=NAME, | ||
| version=ABOUT['__version__'], | ||
| version=ABOUT["__version__"], | ||
| description=DESCRIPTION, | ||
| long_description=LONG_DESC, | ||
| long_description_content_type='text/x-rst', | ||
| long_description_content_type="text/x-rst", | ||
| author=AUTHOR, | ||
| # author_email=EMAIL, | ||
| python_requires=REQUIRES_PYTHON, | ||
| url=URL, | ||
| packages=find_packages(exclude=('tests',)), | ||
| packages=find_packages(exclude=("tests",)), | ||
| # If your package is a single module, use this instead of 'packages': | ||
| # py_modules=['tesla_dashcam'], | ||
|
|
||
| entry_points={ | ||
| 'console_scripts': ['tesla_dashcam=tesla_dashcam:main'], | ||
| }, | ||
| entry_points={"console_scripts": ["tesla_dashcam=tesla_dashcam:main"]}, | ||
| install_requires=REQUIRED, | ||
| include_package_data=True, | ||
| license='Apache License 2.0', | ||
| license="Apache License 2.0", | ||
| classifiers=[ | ||
| # Trove classifiers | ||
| # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers | ||
| 'Intended Audience :: End Users/Desktop', | ||
| 'License :: OSI Approved :: Apache Software License', | ||
| 'Programming Language :: Python', | ||
| 'Programming Language :: Python :: 3', | ||
| 'Programming Language :: Python :: 3.7', | ||
| 'Programming Language :: Python :: Implementation :: CPython', | ||
| 'Programming Language :: Python :: Implementation :: PyPy', | ||
| 'Topic :: Multimedia :: Video :: Conversion', | ||
| "Intended Audience :: End Users/Desktop", | ||
| "License :: OSI Approved :: Apache Software License", | ||
| "Programming Language :: Python", | ||
| "Programming Language :: Python :: 3", | ||
| "Programming Language :: Python :: 3.7", | ||
| "Programming Language :: Python :: Implementation :: CPython", | ||
| "Programming Language :: Python :: Implementation :: PyPy", | ||
| "Topic :: Multimedia :: Video :: Conversion", | ||
| ], | ||
| # $ setup.py publish support. | ||
| cmdclass={ | ||
| 'upload': UploadCommand, | ||
| 'testupload': TestUploadCommand, | ||
| }, | ||
| cmdclass={"upload": UploadCommand, "testupload": TestUploadCommand}, | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| __version__ = '0.1.11' | ||
| __version__ = "0.1.12" |
Oops, something went wrong.