aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit
diff options
context:
space:
mode:
authorsaksham1115 <saksham115@gmail.com>2016-07-16 00:19:53 +0000
committersaksham1115 <saksham115@gmail.com>2016-07-19 17:29:25 +0000
commit6a3fe50e8fde11f952df671446e13091369cebc3 (patch)
tree3917ac8a634b92c98affbd9ae33902bcceeff84d /mediagoblin/edit
parent3af2d38d29c33de32b7578e4f01197f33b0b20e9 (diff)
downloadmediagoblin-6a3fe50e8fde11f952df671446e13091369cebc3.tar.lz
mediagoblin-6a3fe50e8fde11f952df671446e13091369cebc3.tar.xz
mediagoblin-6a3fe50e8fde11f952df671446e13091369cebc3.zip
Removed almost all of the code from core
Diffstat (limited to 'mediagoblin/edit')
-rw-r--r--mediagoblin/edit/forms.py12
-rw-r--r--mediagoblin/edit/routing.py4
-rw-r--r--mediagoblin/edit/views.py82
3 files changed, 2 insertions, 96 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 7208593b..83e83c3c 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -78,12 +78,6 @@ class EditProfileForm(wtforms.Form):
location = wtforms.StringField(_('Hometown'))
-class CustomizeSubtitlesForm(wtforms.Form):
- subtitle = wtforms.TextAreaField(
- _('Subtitle'),
- [wtforms.validators.Optional()],
- description=_(""))
-
class EditAccountForm(wtforms.Form):
wants_comment_notification = wtforms.BooleanField(
@@ -106,12 +100,6 @@ class EditAttachmentsForm(wtforms.Form):
attachment_file = wtforms.FileField(
'File')
-class EditSubtitlesForm(wtforms.Form):
- subtitle_language = wtforms.StringField(
- 'Language')
- subtitle_file = wtforms.FileField(
- 'File')
-
class EditCollectionForm(wtforms.Form):
title = wtforms.StringField(
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index ec776bd9..d3ae5465 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -29,6 +29,4 @@ add_route('mediagoblin.edit.verify_email', '/edit/verify_email/',
add_route('mediagoblin.edit.email', '/edit/email/',
'mediagoblin.edit.views:change_email')
add_route('mediagoblin.edit.deauthorize_applications', '/edit/deauthorize/',
- 'mediagoblin.edit.views:deauthorize_applications')
-add_route('mediagoblin.edit.custom_subtitles', '/c_s/<string:path>/edit/',
- 'mediagoblin.edit.views:custom_subtitles')
+ 'mediagoblin.edit.views:deauthorize_applications') \ No newline at end of file
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index eb9334e9..17e37c50 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -181,65 +181,6 @@ def edit_attachments(request, media):
else:
raise Forbidden("Attachments are disabled")
-@get_media_entry_by_id
-@user_may_delete_media
-@require_active_login
-def edit_subtitles(request, media):
- if mg_globals.app_config['allow_subtitles']:
- form = forms.EditSubtitlesForm(request.form)
-
- # Add any subtitles
- if 'subtitle_file' in request.files \
- and request.files['subtitle_file']:
- if mimetypes.guess_type(
- request.files['subtitle_file'].filename)[0] in \
- UNSAFE_MIMETYPES:
- public_filename = secure_filename('{0}.notsafe'.format(
- request.files['subtitle_file'].filename))
- else:
- public_filename = secure_filename(
- request.files['subtitle_file'].filename)
-
- subtitle_public_filepath \
- = mg_globals.public_store.get_unique_filepath(
- ['media_entries', six.text_type(media.id), 'subtitle',
- public_filename])
-
- subtitle_public_file = mg_globals.public_store.get_file(
- subtitle_public_filepath, 'wb')
-
- try:
- subtitle_public_file.write(
- request.files['subtitle_file'].stream.read())
- finally:
- request.files['subtitle_file'].stream.close()
-
- media.subtitle_files.append(dict(
- name=form.subtitle_language.data \
- or request.files['subtitle_file'].filename,
- filepath=subtitle_public_filepath,
- created=datetime.utcnow(),
- ))
-
- media.save()
-
- messages.add_message(
- request,
- messages.SUCCESS,
- _("You added the subttile %s!") %
- (form.subtitle_language.data or
- request.files['subtitle_file'].filename))
-
- return redirect(request,
- location=media.url_for_self(request.urlgen))
- return render_to_response(
- request,
- 'mediagoblin/edit/subtitles.html',
- {'media': media,
- 'form': form})
- else:
- raise Forbidden("Subtitles are disabled")
-
@require_active_login
def legacy_edit_profile(request):
"""redirect the old /edit/profile/?username=USER to /u/USER/edit/"""
@@ -578,25 +519,4 @@ def edit_metadata(request, media):
request,
'mediagoblin/edit/metadata.html',
{'form':form,
- 'media':media})
-
-
-from mediagoblin.tools.subtitles import open_subtitle,save_subtitle
-
-@require_active_login
-@get_media_entry_by_id
-@user_may_delete_media
-@path_subtitle
-def custom_subtitles(request,media,path=None):
- text = open_subtitle(path)
- form = forms.CustomizeSubtitlesForm(request.form,
- subtitle=text)
- if request.method == 'POST' and form.validate():
- subtitle_data = form.subtitle.data
- save_subtitle(path,subtitle_data)
-
- return render_to_response(
- request,
- "mediagoblin/edit/custom_subtitles.html",
- {"path": path,
- "form": form }) \ No newline at end of file
+ 'media':media}) \ No newline at end of file