diff --git a/README.md b/README.md index 4ffdc8d..137a456 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -

+

Version: 0.4.6
"A Simple Beat Time Marks Generator"
-- Created by Kevin T. Lee --

MIT Code - Version + Version
# DJ-beat @@ -73,7 +73,9 @@ $ djbeat -f ./test/treasure-trimed.wav -r 30 #### Arguments ``` --h, --help show this help message and exit. +-h, --help Display this help message and exit. +-v, Display the version. +-V, Display the beat time list in terminal. -p, --platform The platform, fcpx or pre, default='fcpx'. -f, --filepath The filepath of the input audio. -s, --fps FPS The sample rate of the music, a integer number, default='100'. diff --git a/assets/DJbeat-logo.png b/assets/DJbeat-logo.png deleted file mode 100644 index c17521a..0000000 Binary files a/assets/DJbeat-logo.png and /dev/null differ diff --git a/assets/logo.png b/assets/logo.png new file mode 100644 index 0000000..48baccb Binary files /dev/null and b/assets/logo.png differ diff --git a/djbeat/djbeat.py b/djbeat/djbeat.py index 76749b4..ac3be40 100644 --- a/djbeat/djbeat.py +++ b/djbeat/djbeat.py @@ -2,7 +2,7 @@ # author: Kevin T. Lee # description: DJ-beat is available to detect the beat from the audio and generate time marks for FCPX and premiere. -__version__ = '0.4.6' +__version__ = '0.4.7' import madmom import librosa @@ -14,6 +14,7 @@ from tqdm import tqdm from pyfiglet import Figlet from string import Template +from urllib.request import pathname2url class DJbeat(object): @@ -79,7 +80,7 @@ def gen_fcpxml(self): 'date_time': self.date_time, 'frame_rate': self.frame_rate, 'file_name': self.file_name, - 'file_path': self.abs_filepath, + 'file_path': pathname2url(self.abs_filepath), 'file_length': self.file_length, 'file_real_length': self.file_real_length, 'audio_sr': self.audio_sr, diff --git a/djbeat/requirements.txt b/djbeat/requirements.txt index 45f3c8c..e6f6b94 100644 --- a/djbeat/requirements.txt +++ b/djbeat/requirements.txt @@ -4,3 +4,4 @@ tqdm==4.31.1 madmom==0.16.1 librosa==0.6.3 pyfiglet==0.8.post1 +urllib3==1.23 diff --git a/setup.py b/setup.py index 8ac6511..77c17e0 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ entry_points={ "console_scripts": ['djbeat = djbeat.djbeat:main'] }, - version='0.4.6', + version='0.4.7', description="A simple CLI tool for generating beat marks of music for FCPX and PRE", license="MIT", install_requires=[ @@ -24,7 +24,8 @@ 'tqdm', 'madmom', 'librosa', - 'pyfiglet' + 'pyfiglet', + 'urllib3' ], # long_description=long_descr, include_package_data=True, diff --git a/test/treasure-trimed.wav.fcpxml b/test/treasure-trimed.wav.fcpxml index 15e8ff3..3f36233 100644 --- a/test/treasure-trimed.wav.fcpxml +++ b/test/treasure-trimed.wav.fcpxml @@ -2,12 +2,12 @@ - + - + diff --git "a/test/\344\270\255\346\226\207 \346\265\213\350\257\225.wav" "b/test/\344\270\255\346\226\207 \346\265\213\350\257\225.wav" new file mode 100644 index 0000000..ac54cc9 Binary files /dev/null and "b/test/\344\270\255\346\226\207 \346\265\213\350\257\225.wav" differ diff --git "a/test/\344\270\255\346\226\207 \346\265\213\350\257\225.wav.fcpxml" "b/test/\344\270\255\346\226\207 \346\265\213\350\257\225.wav.fcpxml" new file mode 100644 index 0000000..5b744e5 --- /dev/null +++ "b/test/\344\270\255\346\226\207 \346\265\213\350\257\225.wav.fcpxml" @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file