aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/edit/views.py7
-rw-r--r--mediagoblin/tools/subtitles.py20
2 files changed, 22 insertions, 5 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 33643bf8..ff5c0881 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -580,13 +580,14 @@ def edit_metadata(request, media):
'media':media})
-from mediagoblin.tools.subtitles import get_path
+from mediagoblin.tools.subtitles import open_subtitle
@require_active_login
@path_subtitle
def custom_subtitles(request,path=None):
- form = forms.CustomizeSubtitlesForm(request.form)
- path = get_path(path)
+ text = open_subtitle(path)
+ form = forms.CustomizeSubtitlesForm(request.form,
+ subtitle=text)
return render_to_response(
request,
"mediagoblin/edit/custom_subtitles.html",
diff --git a/mediagoblin/tools/subtitles.py b/mediagoblin/tools/subtitles.py
index 7002cdfc..bfb4a7ea 100644
--- a/mediagoblin/tools/subtitles.py
+++ b/mediagoblin/tools/subtitles.py
@@ -1,4 +1,4 @@
-import ast
+import ast,os
def get_path(path):
"""
@@ -7,4 +7,20 @@ def get_path(path):
to
x = ["A", "B", "C", "D"]
"""
- return ast.literal_eval(path) \ No newline at end of file
+ return ast.literal_eval(path)
+
+def open_subtitle(path):
+ temp = ['user_dev','media','public']
+ path = list(get_path(path))
+ file_path = os.path.abspath(__file__).split('/') # Path of current file as dictionary
+ """
+ Creating the absolute path for the subtitle file
+ """
+ subtitle_path = file_path[:-3] + temp + path
+ subtitle_path = "/" + os.path.join(*subtitle_path)
+ """
+ Opening the file using the absolute path
+ """
+ subtitle = open(subtitle_path,"r")
+ text = subtitle.read()
+ return text \ No newline at end of file