Fix #590

Nandaka · Dec 15, 2019 · 2d1a0a3 · 2d1a0a3
1 parent d2ad036
commit 2d1a0a3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 343 deletions.
diff --git a/PixivHelper.py b/PixivHelper.py
@@ -781,7 +781,7 @@ def ugoira2apng(ugoira_file, exportname, delete_ugoira, image=None):
 
     im = APNG()
     for fImage, delay in files:
-        im.append(fImage, delay=delay)
+        im.append_file(fImage, delay=delay)
     im.save(temp_name)
     shutil.move(temp_name, exportname)
     print_and_log('info', 'ugoira exported to: ' + exportname)

diff --git a/PixivUtil2.py b/PixivUtil2.py
@@ -2354,8 +2354,8 @@ def main():
             cmd = u"{0} -encoders".format(__config__.ffmpeg)
             ffmpeg_args = shlex.split(cmd)
             try:
-                p = subprocess.Popen(ffmpeg_args, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-                buff = p.stdout.read()
+                p = subprocess.run(ffmpeg_args, stderr=subprocess.PIPE, stdout=subprocess.PIPE, text=True)
+                buff = p.stdout
                 if buff.find(__config__.ffmpegCodec) == 0:
                     __config__.createWebm = False
                     PixivHelper.print_and_log('error', '{0}'.format("#" * 80))

diff --git a/apng.py b/apng.py
diff --git a/requirements.txt b/requirements.txt
@@ -8,3 +8,4 @@ Pillow>=6.1.0
 socksipy-branch>=1.1
 win_unicode_console>=0.5
 requests>=2.22.0
+apng=>0.3.3