From fcbbe08ebacaa71d6e121d7d90b0364acf455db3 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 10 Aug 2018 12:54:27 +0000 Subject: [PATCH] Removed video url import from youtube, which is not needed any more given the /api/meeting/session/video/url API endpoint. This also prevents duplicate video URLs. - Legacy-Id: 15424 --- ietf/api/tests.py | 3 +- ietf/meeting/views.py | 3 +- ietf/secr/proceedings/proc_utils.py | 48 ----------------------------- ietf/secr/proceedings/tests.py | 45 --------------------------- 4 files changed, 2 insertions(+), 97 deletions(-) diff --git a/ietf/api/tests.py b/ietf/api/tests.py index a92ba7927..c03fe18cc 100644 --- a/ietf/api/tests.py +++ b/ietf/api/tests.py @@ -35,8 +35,7 @@ class CustomApiTestCase(TestCase): # Using mock to patch the import functions in ietf.meeting.views, where # api_import_recordings() are using them: @patch('ietf.meeting.views.import_audio_files') - @patch('ietf.meeting.views.import_youtube_video_urls') - def test_notify_meeting_import_audio_files(self, mock_import_youtube, mock_import_audio): + def test_notify_meeting_import_audio_files(self, mock_import_audio): meeting = make_meeting_test_data() client = Client(Accept='application/json') # try invalid method GET diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 66cb22566..8ff00c4db 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -61,7 +61,7 @@ from ietf.meeting.helpers import send_interim_announcement_request from ietf.meeting.utils import finalize from ietf.secr.proceedings.utils import handle_upload_file from ietf.secr.proceedings.proc_utils import (get_progress_stats, post_process, import_audio_files, - import_youtube_video_urls, create_recording) + create_recording) from ietf.utils.decorators import require_api_key from ietf.utils.mail import send_mail_message, send_mail_text from ietf.utils.pipe import pipe @@ -2183,7 +2183,6 @@ def api_import_recordings(request, number): if request.method == 'POST': meeting = get_meeting(number) import_audio_files(meeting) - import_youtube_video_urls(meeting) return HttpResponse(status=201) else: return HttpResponse(status=405) diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py index 75f67af96..6423ca9cb 100644 --- a/ietf/secr/proceedings/proc_utils.py +++ b/ietf/secr/proceedings/proc_utils.py @@ -4,7 +4,6 @@ proc_utils.py This module contains all the functions for generating static proceedings pages ''' import datetime -import httplib2 import os import re import subprocess @@ -12,7 +11,6 @@ from urllib import urlencode import debug # pyflakes:ignore -from apiclient.discovery import build from django.conf import settings from django.core.exceptions import ObjectDoesNotExist @@ -27,52 +25,6 @@ AUDIO_FILE_RE = re.compile(r'ietf(?P[\d]+)-(?P.*)-(?P