Utilize pylint como linter y corregi la mayoria de los errores
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
import os
|
||||
import random
|
||||
|
||||
from flask import Flask, Blueprint, flash, request, redirect, url_for, current_app, render_template, \
|
||||
send_from_directory, g
|
||||
from flask import Blueprint, flash, request, redirect, url_for
|
||||
from flask import current_app, render_template, g
|
||||
|
||||
from werkzeug.utils import secure_filename
|
||||
from werkzeug.exceptions import abort
|
||||
from files.models import db, File, Category, User, FileType
|
||||
from files.models import db, File, Category, FileType
|
||||
|
||||
from files.auth import admin_required
|
||||
|
||||
@@ -17,20 +17,23 @@ bp.add_url_rule('/uploads/<path:filename>', 'uploaded_file', build_only=True)
|
||||
def _get_extension(filename):
|
||||
return filename.rsplit('.', 1)[1].lower()
|
||||
|
||||
|
||||
def _get_name(filename):
|
||||
return filename.rsplit('.', 1)[0].lower()
|
||||
|
||||
|
||||
def _get_path_in_upload(filename):
|
||||
return os.path.join(current_app.config['UPLOAD_FOLDER'], filename)
|
||||
|
||||
|
||||
|
||||
def _get_unused_name(filename):
|
||||
if os.path.exists(_get_path_in_upload(filename)):
|
||||
filename = f'{_get_name(filename)}{random.randint(0,9)}.{_get_extension(filename)}'
|
||||
filename = '{}{}.{}'.format(
|
||||
_get_name(filename),
|
||||
random.randint(0, 9),
|
||||
_get_extension(filename))
|
||||
return _get_unused_name(filename)
|
||||
else:
|
||||
return filename
|
||||
return filename
|
||||
|
||||
|
||||
def _save_file(file, private, category, file_type):
|
||||
@@ -45,18 +48,20 @@ def _save_file(file, private, category, file_type):
|
||||
abort(500)
|
||||
|
||||
file.save(_get_path_in_upload(filename))
|
||||
f = File(filename, is_private, category.id, file_type.id)
|
||||
db_file = File(filename, is_private, category.id, file_type.id)
|
||||
|
||||
db.session.add(f)
|
||||
db.session.add(db_file)
|
||||
db.session.commit()
|
||||
|
||||
return f
|
||||
return db_file
|
||||
|
||||
|
||||
def _rename_file(file, new_name):
|
||||
new_name = secure_filename(_get_unused_name(new_name))
|
||||
|
||||
os.rename(_get_path_in_upload(file.filename), _get_path_in_upload(new_name))
|
||||
os.rename(
|
||||
_get_path_in_upload(file.filename),
|
||||
_get_path_in_upload(new_name))
|
||||
file.filename = new_name
|
||||
|
||||
db.session.commit()
|
||||
@@ -85,8 +90,8 @@ def upload_file():
|
||||
if 'file' not in request.files:
|
||||
flash('No file part')
|
||||
return redirect(request.url)
|
||||
else:
|
||||
file = request.files['file']
|
||||
|
||||
file = request.files['file']
|
||||
|
||||
if 'private' not in request.form:
|
||||
private = None
|
||||
@@ -119,34 +124,42 @@ def upload_file():
|
||||
_save_file(file, private, category, file_type)
|
||||
return redirect(url_for('files.index'))
|
||||
|
||||
return render_template('files/upload.html', categories=Category.query.all(), file_types=FileType.query.all())
|
||||
return render_template(
|
||||
'files/upload.html',
|
||||
categories=Category.query.all(),
|
||||
file_types=FileType.query.all())
|
||||
|
||||
|
||||
@bp.route('/preview/<int:id>')
|
||||
def preview_file(id):
|
||||
file = File.query.get(id)
|
||||
@bp.route('/preview/<int:file_id>')
|
||||
def preview_file(file_id):
|
||||
file = File.query.get(file_id)
|
||||
categories = Category.query.all()
|
||||
file_types = FileType.query.all()
|
||||
|
||||
|
||||
if file.type.name == 'Code':
|
||||
try:
|
||||
content = open(_get_path_in_upload(file.filename), 'r').read()
|
||||
except:
|
||||
except IOError:
|
||||
flash('Error: file is binary, can\'t be displayed')
|
||||
content = 'Error'
|
||||
else:
|
||||
content = ''
|
||||
|
||||
if (file.private == 1 and g.user is not None) or (file.private == 0):
|
||||
return render_template('files/preview.html', file=file, categories=categories, file_types=file_types, content=content)
|
||||
else:
|
||||
return abort(404)
|
||||
return render_template(
|
||||
'files/preview.html',
|
||||
file=file,
|
||||
categories=categories,
|
||||
file_types=file_types,
|
||||
content=content)
|
||||
|
||||
return abort(404)
|
||||
|
||||
|
||||
@bp.route('/rename/<int:id>', methods=['POST'])
|
||||
@bp.route('/rename/<int:file_id>', methods=['POST'])
|
||||
@admin_required
|
||||
def rename_file(id):
|
||||
file = File.query.get(id)
|
||||
def rename_file(file_id):
|
||||
file = File.query.get(file_id)
|
||||
|
||||
new_name = request.form['new_name'].lower()
|
||||
extension = file.filename.rsplit('.', 1)[1].lower()
|
||||
@@ -161,11 +174,11 @@ def rename_file(id):
|
||||
return redirect(url_for('files.preview_file', id=file.id))
|
||||
|
||||
|
||||
@bp.route('/recategorize/<int:id>', methods=['POST'])
|
||||
@bp.route('/recategorize/<int:file_id>', methods=['POST'])
|
||||
@admin_required
|
||||
def recategorize(id):
|
||||
file = File.query.get(id)
|
||||
|
||||
def recategorize(file_id):
|
||||
file = File.query.get(file_id)
|
||||
|
||||
if 'new_category' not in request.form:
|
||||
flash('No category selected')
|
||||
return redirect(request.url)
|
||||
@@ -174,18 +187,18 @@ def recategorize(id):
|
||||
if new_category is None:
|
||||
flash('The category selected won\'t exists')
|
||||
return redirect(request.url)
|
||||
|
||||
|
||||
file.category_id = new_category.id
|
||||
db.session.commit()
|
||||
|
||||
return redirect(url_for('files.preview_file', id=file.id))
|
||||
|
||||
|
||||
@bp.route('/retype/<int:id>', methods=['POST'])
|
||||
|
||||
@bp.route('/retype/<int:file_id>', methods=['POST'])
|
||||
@admin_required
|
||||
def retype(id):
|
||||
file = File.query.get(id)
|
||||
|
||||
def retype(file_id):
|
||||
file = File.query.get(file_id)
|
||||
|
||||
if 'new_type' not in request.form:
|
||||
flash('No type selected')
|
||||
return redirect(request.url)
|
||||
@@ -194,15 +207,16 @@ def retype(id):
|
||||
if new_type is None:
|
||||
flash('The file type selected won\'t exists')
|
||||
return redirect(request.url)
|
||||
|
||||
file.file_type_id= new_type.id
|
||||
|
||||
file.file_type_id = new_type.id
|
||||
db.session.commit()
|
||||
|
||||
return redirect(url_for('files.preview_file', id=file.id))
|
||||
|
||||
@bp.route('/delete/<int:id>', methods=['POST'])
|
||||
|
||||
@bp.route('/delete/<int:file_id>', methods=['POST'])
|
||||
@admin_required
|
||||
def delete_file(id):
|
||||
file = File.query.get(id)
|
||||
def delete_file(file_id):
|
||||
file = File.query.get(file_id)
|
||||
_delete_file(file)
|
||||
return redirect(url_for('index'))
|
||||
|
||||
Reference in New Issue
Block a user