From 561731dde70f3e3fdc806891cc56aac36553fb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E4=B8=9E=E5=AE=8F?= Date: Fri, 16 Nov 2018 17:46:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B9=E7=94=A8ffmpeg=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/i3thuan5/siunn1ua2ah4/issues/6#issuecomment-439310399 --- .../\345\201\232\345\275\261\347\211\207.py" | 60 ++++++++----------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git "a/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" "b/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" index 69c08b2..a9e0f2d 100644 --- "a/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" +++ "b/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" @@ -54,42 +54,32 @@ def 收著資料(cls, 腔口參數, 圖陣列, 聲陣列, 字陣列, 存檔所 @classmethod def 敆做伙(cls, 圖陣列, 聲陣列, 字陣列, 存檔所在): with TemporaryDirectory() as 目錄: - 全部結果檔 = [] - for 第幾个, (圖, 聲, 字) in enumerate(zip(圖陣列, 聲陣列, 字陣列)): - 結果檔 = join(目錄, 'output{}.mkv'.format(第幾个)) - 暫時圖 = join(目錄, 'jpg{}.jpg'.format(第幾个)) - cls._走指令([ - 'convert', - 圖, - 暫時圖, - ]) - cls._走指令([ - 'avconv', - '-i', 暫時圖, '-i', 聲, '-vf', 'subtitles={}'.format(字), - '-s', 'svga', '-y', 結果檔, - ]) - 全部結果檔.append(結果檔) - 敆做伙結果檔 = join(目錄, 'result.mkv') - 敆做伙指令 = ['mkvmerge'] - 敆做伙指令.append('-o') - 敆做伙指令.append(敆做伙結果檔) - for 結果檔 in 全部結果檔: - 敆做伙指令.append(結果檔) - 敆做伙指令.append('+') - 敆做伙指令.pop() - cls._走指令(敆做伙指令) - - 敆做伙轉換檔 = join(目錄, 'result.mp4') - 上尾轉換指令 = ['avconv'] - 上尾轉換指令.append('-i') - 上尾轉換指令.append(敆做伙結果檔) -# 上尾轉換指令.append('-c') -# 上尾轉換指令.append('copy') - 上尾轉換指令.append('-y') - 上尾轉換指令.append(敆做伙轉換檔) - cls._走指令(上尾轉換指令) + 全部結果表 = join(目錄, 'tuan.pio') + with open(全部結果表, 'w') as 表: + for 第幾个, (圖, 聲, 字) in enumerate(zip(圖陣列, 聲陣列, 字陣列)): + 結果檔 = join(目錄, 'output{}.mp4'.format(第幾个)) + 暫時圖 = join(目錄, 'jpg{}.jpg'.format(第幾个)) + cls._走指令([ + 'convert', + 圖, + 暫時圖, + ]) + cls._走指令([ + 'avconv', + '-i', 暫時圖, '-i', 聲, '-vf', 'subtitles={}'.format(字), + '-s', 'svga', '-y', 結果檔, + ]) + print("file '{}'".format(結果檔), file=表) - copyfile(敆做伙轉換檔, 存檔所在) + 敆做伙指令 = [ + 'ffmpeg', + '-f', 'concat', + '-safe', '0', + '-i', 全部結果表, + '-c', 'copy', + 存檔所在 + ] + cls._走指令(敆做伙指令) @classmethod def 轉文本資料(cls, 腔口參數, 文字陣列, 目錄): From d0c09d27d7aaa33992f94ad7145d466f733b031e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E4=B8=9E=E5=AE=8F?= Date: Fri, 16 Nov 2018 17:53:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8A=A0compose=E8=BC=83=E5=A5=BD=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..21e229c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,13 @@ +version: '3.5' + +services: + gunicorn: + build: . + command: gunicorn siunn1ua2ah4.wsgi --log-level debug -w 2 -b 0.0.0.0:8000 + volumes: + - ./hok8_bu7/local.py:/usr/local/hok8-bu7/hok8_bu7/local.py + expose: + - "8000" + environment: + VIRTUAL_HOST: "xn--iwqtoz61h.xn--v0qr21b.xn--kpry57d" + VIRTUAL_PORT: 8000 From bc65c48e6ecc6208c17300365b4817307443cf68 Mon Sep 17 00:00:00 2001 From: pigu Date: Fri, 16 Nov 2018 20:12:52 +0800 Subject: [PATCH 3/4] Tsiunn-suann siu --- Dockerfile | 4 ++-- docker-compose.yml | 2 +- .../\345\201\232\345\275\261\347\211\207.py" | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7186449..f7a52f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM ubuntu:latest +FROM ubuntu:16.04 MAINTAINER sih4sing5hong5 -RUN apt-get update #20180423 +RUN apt-get update RUN apt-get install -y python3 g++ python3-dev RUN apt-get install -y libav-tools RUN apt-get install -y locales diff --git a/docker-compose.yml b/docker-compose.yml index 21e229c..873493c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.5' services: gunicorn: build: . - command: gunicorn siunn1ua2ah4.wsgi --log-level debug -w 2 -b 0.0.0.0:8000 + command: gunicorn siunn1ua2ah4.wsgi --log-level DEBUG -w 2 -b 0.0.0.0:8000 volumes: - ./hok8_bu7/local.py:/usr/local/hok8-bu7/hok8_bu7/local.py expose: diff --git "a/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" "b/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" index a9e0f2d..c88fb13 100644 --- "a/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" +++ "b/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" @@ -77,6 +77,7 @@ def 敆做伙(cls, 圖陣列, 聲陣列, 字陣列, 存檔所在): '-safe', '0', '-i', 全部結果表, '-c', 'copy', + '-y', 存檔所在 ] cls._走指令(敆做伙指令) From 3f1384aab33c7789a27a3d743738960ab5352113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E4=B8=9E=E5=AE=8F?= Date: Fri, 16 Nov 2018 20:15:17 +0800 Subject: [PATCH 4/4] flake8 --- .travis.yml | 1 - .../\345\201\232\345\275\261\347\211\207.py" | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e340afc..290ea26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ sudo: true dist: trusty language: python python: -- '3.4' - '3.5' env: - TOX_ENV=tan1uan5 diff --git "a/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" "b/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" index a9e0f2d..61b9857 100644 --- "a/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" +++ "b/\351\254\245\345\201\232\344\274\231/\345\201\232\345\275\261\347\211\207.py" @@ -3,7 +3,6 @@ from itertools import zip_longest import json from os.path import join -from shutil import copyfile from tempfile import TemporaryDirectory from urllib.parse import quote import ssl