diff --git a/files/helpers.py b/files/helpers.py index bb050e6..3213c0b 100644 --- a/files/helpers.py +++ b/files/helpers.py @@ -660,13 +660,13 @@ def produce_ffmpeg_commands(media_file, media_info, resolution, codec, output_fi if codec == "h264": encoder = "libx264" - ext = "mp4" + # ext = "mp4" elif codec in ["h265", "hevc"]: encoder = "libx265" - ext = "mp4" + # ext = "mp4" elif codec == "vp9": encoder = "libvpx-vp9" - ext = "webm" + # ext = "webm" else: return False diff --git a/files/models.py b/files/models.py index 554c972..1fbdbc2 100644 --- a/files/models.py +++ b/files/models.py @@ -537,7 +537,7 @@ class Media(models.Model): "-y", tf, ] - ret = helpers.run_command(command) + helpers.run_command(command) if os.path.exists(tf) and helpers.get_file_type(tf) == "image": with open(tf, "rb") as f: @@ -657,7 +657,6 @@ class Media(models.Model): """Property used on serializers""" ret = {} - chunks_ret = {} if self.media_type not in ["video"]: return ret diff --git a/files/tasks.py b/files/tasks.py index 8985dbd..6b7d066 100644 --- a/files/tasks.py +++ b/files/tasks.py @@ -391,7 +391,7 @@ def produce_sprite_from_video(friendly_token): tmpdirname, output_name, ) - ret = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True) + subprocess.run(cmd, stdout=subprocess.PIPE, shell=True) if os.path.exists(output_name) and get_file_type(output_name) == "image": with open(output_name, "rb") as f: myfile = File(f) @@ -432,11 +432,11 @@ def create_hls(friendly_token): output_dir = os.path.join(settings.HLS_DIR, p + produce_friendly_token()) files = " ".join([f.media_file.path for f in encodings if f.media_file]) cmd = "{0} --segment-duration=4 --output-dir={1} {2}".format(settings.MP4HLS_COMMAND, output_dir, files) - ret = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True) + subprocess.run(cmd, stdout=subprocess.PIPE, shell=True) if existing_output_dir: # override content with -T ! cmd = "cp -rT {0} {1}".format(output_dir, existing_output_dir) - ret = subprocess.run(cmd, stdout=subprocess.PIPE, shell=True) + subprocess.run(cmd, stdout=subprocess.PIPE, shell=True) shutil.rmtree(output_dir) output_dir = existing_output_dir pp = os.path.join(output_dir, "master.m3u8") @@ -626,7 +626,7 @@ def save_user_action(user_or_session, friendly_token=None, action="watch", extra rating_category_id=rating_category, score=score, ) - except Exception as exc: + except Exception: # TODO: more specific handling, for errors in score, or # rating_category? return False diff --git a/files/views.py b/files/views.py index 41dcd6c..021c991 100644 --- a/files/views.py +++ b/files/views.py @@ -210,8 +210,6 @@ def embed_media(request): if not media: return HttpResponseRedirect("/") - user_or_session = get_user_or_session(request) - context = {} context["media"] = friendly_token return render(request, "cms/embed.html", context) diff --git a/setup.cfg b/setup.cfg index e02d407..5422bc9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ [flake8] exclude = .git,*migrations* max-line-length = 119 -ignore=F401,F403,W503,E711,E302,E201,E501,E303,E231,F841,E722 +ignore=F401,F403,E501,W503