Added the feature for deleting the subtitle

3 files changed, 39 insertions, 13 deletions

diff --git a/mediagoblin/plugins/custom_subtitles/__init__.py b/mediagoblin/plugins/custom_subtitles/__init__.py
index c50e1762..f2adc47b 100644
--- a/mediagoblin/plugins/custom_subtitles/__init__.py
+++ b/mediagoblin/plugins/custom_subtitles/__init__.py
@@ -28,7 +28,10 @@ def setup_plugin():
          'mediagoblin.plugins.custom_subtitles.views:custom_subtitles'),
         ('mediagoblin.plugins.custom_subtitles.subtitles',
          '/u/<string:user>/m/<int:media_id>/subtitles/',
-         'mediagoblin.plugins.custom_subtitles.views:edit_subtitles')]
+         'mediagoblin.plugins.custom_subtitles.views:edit_subtitles'),
+        ('mediagoblin.plugins.custom_subtitles.delete_subtitles',
+         '/u/<string:user>/m/<int:media_id>/delete/<string:path>',
+         'mediagoblin.plugins.custom_subtitles.views:delete_subtitles')]
 
     pluginapi.register_routes(routes)
 
diff --git a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html
index 177ae728..e1975c75 100644
--- a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html
+++ b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html
@@ -35,9 +35,14 @@
     <div class="form_box edit_box">
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
+        {% set delete_url = request.urlgen('mediagoblin.plugins.custom_subtitles.delete_subtitles',
+                                   user= media.get_actor.username,
+                                   media_id=media.id,
+                                   path=path) %}
+        <a class="button_action button_warning" href="{{ delete_url }}">{% trans %}Delete Subtitle{% endtrans %}</a>
         <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
 	{{ csrf_token }}
       </div>
     </div>
   </form>
-{% endblock %} 
+{% endblock %}
\ No newline at end of file
diff --git a/mediagoblin/plugins/custom_subtitles/views.py b/mediagoblin/plugins/custom_subtitles/views.py
index e647df59..fdda5b37 100644
--- a/mediagoblin/plugins/custom_subtitles/views.py
+++ b/mediagoblin/plugins/custom_subtitles/views.py
@@ -35,7 +35,7 @@ from mediagoblin.tools.response import (render_to_response,
 
 import mimetypes
 
-from mediagoblin.plugins.custom_subtitles.tools import open_subtitle,save_subtitle
+from mediagoblin.plugins.custom_subtitles.tools import open_subtitle,save_subtitle,get_path
 
 UNSAFE_MIMETYPES = [
         'text/html',
@@ -121,18 +121,36 @@ def custom_subtitles(request,media,path=None):
          "media": media,
          "form": form })
 
-    """delete_container = None
-                index = 0
-                for subtitle in media.subtitle_files:
-                    if subtitle["name"] == "Two And A Half Men S02E02.srt":
-                        delete_container = index
-                    index += 1
-                print media.subtitle_files.pop(delete_container)
-                media.save()"""
-        
     return render_to_response(
         request,
         "mediagoblin/plugins/custom_subtitles/custom_subtitles.html",
         {"path": path,
          "media": media,
-         "form": form })
\ No newline at end of file
+         "form": form })
+
+
+@require_active_login
+@get_media_entry_by_id
+@user_may_delete_media
+@path_subtitle
+def delete_subtitles(request,media,path=None):
+
+    path = get_path(path)
+    mg_globals.public_store.delete_file(path)
+    delete_container = None
+    index = 0
+    for subtitle in media.subtitle_files:
+        if str(subtitle["filepath"]) == str(path):
+            delete_container = index
+            index += 1
+            media.subtitle_files.pop(delete_container)
+            media.save()
+            break
+
+    messages.add_message(
+        request,
+        messages.SUCCESS,
+        ("Subtitle file deleted!!!"))
+
+    return redirect(request,
+                        location=media.url_for_self(request.urlgen))
\ No newline at end of file