heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
saksham1115 2016-08-02 21:31:59 +00:00
parent 067b1b071a
commit a14f4edc99
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/plugins/subtitles/tools.py
View File

@ -25,7 +25,7 @@ def open_subtitle(path):
subtitle_public_filepath = get_path(path) subtitle_public_filepath = get_path(path)
with mg_globals.public_store.get_file( with mg_globals.public_store.get_file(
subtitle_public_filepath, 'rb') as subtitle_public_file: subtitle_public_filepath, 'rb') as subtitle_public_file:
text = subtitle_public_file.read().decode('utf-8') text = subtitle_public_file.read().decode('utf-8','ignore')
return text return text
def save_subtitle(path,text): def save_subtitle(path,text):

4
mediagoblin/plugins/subtitles/views.py
View File

@ -46,7 +46,7 @@ UNSAFE_MIMETYPES = [
@require_active_login @require_active_login
def edit_subtitles(request, media): def edit_subtitles(request, media):
allowed_extensions = ['aqt','gsub','jss','sub','ttxt','pjs','psb', allowed_extensions = ['aqt','gsub','jss','sub','ttxt','pjs','psb',
'rt','smi','stl','ssf','srt','ssa','ass','usf','vtt','lrc'] 'rt','smi','rst','stl','ssf','srt','ssa','ass','usf','vtt','lrc']
form = forms.EditSubtitlesForm(request.form) form = forms.EditSubtitlesForm(request.form)
# Add any subtitles # Add any subtitles
@ -69,7 +69,7 @@ def edit_subtitles(request, media):
return redirect(request, return redirect(request,
location=media.url_for_self(request.urlgen)) location=media.url_for_self(request.urlgen))
elif filepath.split('.')[:-1] not in allowed_extensions : elif filepath.split('.')[-1] not in allowed_extensions :
messages.add_message( messages.add_message(
request, request,
messages.ERROR, messages.ERROR,