diff options
Diffstat (limited to 'mediagoblin/plugins/subtitles')
| -rw-r--r-- | mediagoblin/plugins/subtitles/models.py | 5 | ||||
| -rw-r--r-- | mediagoblin/plugins/subtitles/views.py | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mediagoblin/plugins/subtitles/models.py b/mediagoblin/plugins/subtitles/models.py index f71fb173..eb78147c 100644 --- a/mediagoblin/plugins/subtitles/models.py +++ b/mediagoblin/plugins/subtitles/models.py @@ -13,11 +13,12 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. + from sqlalchemy import Column, Integer, Unicode, ForeignKey from sqlalchemy.orm import relationship -from mediagoblin.db.models import User -from mediagoblin.db.base import Base,MediaEntry +from mediagoblin.db.base import Base, MediaEntry + class MediaSubtitleFile(Base): __tablename__ = "core__subtitle_files" diff --git a/mediagoblin/plugins/subtitles/views.py b/mediagoblin/plugins/subtitles/views.py index 75090ea0..9b05e535 100644 --- a/mediagoblin/plugins/subtitles/views.py +++ b/mediagoblin/plugins/subtitles/views.py @@ -16,24 +16,20 @@ from datetime import datetime -from itsdangerous import BadSignature -from werkzeug.exceptions import Forbidden from werkzeug.utils import secure_filename from mediagoblin import messages from mediagoblin import mg_globals from mediagoblin.plugins.subtitles import forms -from mediagoblin.decorators import (require_active_login, active_user_from_url, +from mediagoblin.decorators import (require_active_login, get_media_entry_by_id, user_may_delete_media) -from mediagoblin.tools.metadata import (compact_and_validate, DEFAULT_CHECKER, - DEFAULT_SCHEMA) from mediagoblin.tools.response import (render_to_response, - redirect, redirect_obj, render_404) + redirect) import mimetypes -from mediagoblin.plugins.subtitles.tools import open_subtitle,save_subtitle +from mediagoblin.plugins.subtitles.tools import open_subtitle, save_subtitle UNSAFE_MIMETYPES = [ 'text/html', |