diff --git a/check_eksmo.exe b/check_eksmo.exe new file mode 100644 index 0000000..a8c34da Binary files /dev/null and b/check_eksmo.exe differ diff --git a/check_eksmo.py b/check_eksmo.py index 8dd4156..1e4d3e4 100644 --- a/check_eksmo.py +++ b/check_eksmo.py @@ -1,8 +1,8 @@ # # А. Петелин, 2023 -# Обновлено 22.05.2023 +# Обновлено 25.05.2023 # -# Работает с облегчённым ffmpeg_slim либо обычным 2023-04-17-git-65e537b833-essentials_build-www.gyan.dev win 64 2023 gcc 12.2.0 +# Работает с облегчённым ffmpeg (в комплекте) либо с обычным 2023-04-17-git-65e537b833-essentials_build-www.gyan.dev win 64 2023 gcc 12.2.0 # def on_error(exc_type, exc_value, exc_traceback): @@ -11,6 +11,7 @@ def on_error(exc_type, exc_value, exc_traceback): input(f"\nТысяча чертей! Какая-то дурацкая ошибка! \n\n {exc_value}\n") sys.exit(-1) +print("\nЗагрузка...", end='\r') import sys; sys.excepthook = on_error import os import re @@ -23,11 +24,10 @@ def on_error(exc_type, exc_value, exc_traceback): import datetime -help_string = """ - Этот скрипт проверит ваши аудиокниги на соответствие требованиям - издательства Эксмо. Принимаются файлы mp3, wav и папки. +help_string = """ Эта утилита проверит ваши аудиокниги на соответствие требованиям + издательства Эксмо. Принимаются файлы mp3, wav, flac и папки. - Пример: check_eksmo.py "D:\Книга 1\" "D:\Книга 2\" + Пример запуска: check_eksmo "D:\Книга 1\" "D:\Книга 2\" Или просто перетащите файл/папку сюда и нажмите Enter: @@ -198,7 +198,7 @@ async def run_ffmpeg(file, sem): async with sem: shortname = os.path.basename(file) # 001.mp3 print(f"Анализирую {shortname} ...") - cmd = f'ffmpeg_slim -hide_banner -nostats -loglevel info -i "{file}" -af astats,silencedetect=n=-45dB:d=5 -vn -f null - 2>&1' + cmd = f'ffmpeg -hide_banner -nostats -loglevel info -i "{file}" -af astats,silencedetect=n=-45dB:d=5 -vn -f null - 2>&1' proc = await asyncio.create_subprocess_shell(cmd, stdout=asyncio.subprocess.PIPE) stdout, stderr = decode(await proc.communicate()) #proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -267,7 +267,7 @@ async def main(files): if not files: input("Нет ни одного подходящего файла!") - exit() + sys.exit(-1) print(f'\nВсего {len(files)} файлов. Анализируем по {MAX_CONCURRENT_TASKS} одновременно.') asyncio.run(main(files)) diff --git a/ffmpeg_slim.exe b/ffmpeg.exe similarity index 100% rename from ffmpeg_slim.exe rename to ffmpeg.exe diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/compile with pyinstaller.txt" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/compile with pyinstaller.txt" new file mode 100644 index 0000000..7980f64 --- /dev/null +++ "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/compile with pyinstaller.txt" @@ -0,0 +1,16 @@ + + + 32- : + + pip config set global.target C:\Users\user\AppData\Roaming\Python\python38-32\site-packages + py -3.8-32 -m pip install ( ) + pip config unset global.target + +: + +pyinstaller.exe check_eksmo.py --onefile -i giza_pyramidki_all_sizes.ico + +: + +C:\Users\user\AppData\Local\Programs\Python\Python38-32\Scripts\pyinstaller.exe +C:\Users\user\AppData\Roaming\Python\Python38-32\Scripts\pyinstaller.exe ( ) \ No newline at end of file diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/1067308569_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/1067308569_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" new file mode 100644 index 0000000..a435970 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/1067308569_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/3096283932_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/3096283932_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" new file mode 100644 index 0000000..8cb24de Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/3096283932_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/88819434_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/88819434_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" new file mode 100644 index 0000000..3692ad8 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/88819434_Giza pyramids, desert, command line window, cmd, s_xl-beta-v2-2-2.png" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramid.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramid.png" new file mode 100644 index 0000000..2604158 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramid.png" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramid.psd" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramid.psd" new file mode 100644 index 0000000..22fdf68 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramid.psd" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki.ico" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki.ico" new file mode 100644 index 0000000..9160a10 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki.ico" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki.png" new file mode 100644 index 0000000..0c36385 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki.png" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki_2.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki_2.png" new file mode 100644 index 0000000..2126f4d Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki_2.png" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki_all_sizes.ico" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki_all_sizes.ico" new file mode 100644 index 0000000..26909cd Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/giza_pyramidki_all_sizes.ico" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam.png" new file mode 100644 index 0000000..1daa7dc Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam.png" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam.psd" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam.psd" new file mode 100644 index 0000000..9556711 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam.psd" differ diff --git "a/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam_db.png" "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam_db.png" new file mode 100644 index 0000000..3398b02 Binary files /dev/null and "b/\320\274\320\260\321\202\320\265\321\200\320\270\320\260\320\273\321\213/\320\270\320\272\320\276\320\275\320\272\320\260/wigwam_db.png" differ