skrd/flask-files
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utilize pylint como linter y corregi la mayoria de los errores

Browse Source
This commit is contained in:
Daniel Cortes
2019-03-12 17:11:44 -03:00
parent b4b654c62f
commit 3b5008f9ed
10 changed files with 697 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
files/__init__.py
View File

@@ -1,14 +1,15 @@
import os
from flask import Flask, render_template
from werkzeug import SharedDataMiddleware
from werkzeug.wsgi import SharedDataMiddleware
def create_app():
app = Flask(__name__, instance_relative_config=True)
app.config.from_mapping(
SQLALCHEMY_DATABASE_URI="sqlite:///{}".format(os.path.join(app.instance_path, 'files.sqlite')),
SQLALCHEMY_DATABASE_URI="sqlite:///{}".format(
os.path.join(app.instance_path, 'files.sqlite')),
SQLALCHEMY_TRACK_MODIFICATIONS=False,
USERNAME='dev',
PASSWORD='secret',
@@ -17,7 +18,8 @@ def create_app():
)
app.config.from_pyfile('config.py')
app.wsgi_app = SharedDataMiddleware(app.wsgi_app, {'/uploads': app.config['UPLOAD_FOLDER']})
app.wsgi_app = SharedDataMiddleware(
app.wsgi_app, {'/uploads': app.config['UPLOAD_FOLDER']})
try:
os.makedirs(app.instance_path)
@@ -33,6 +35,9 @@ def create_app():
from files import auth
app.register_blueprint(auth.bp)
from files import admin
app.register_blueprint(admin.bp)
from files import categories
app.register_blueprint(categories.bp)

4
files/about.py
View File

@@ -23,8 +23,8 @@ def about():
if error is not None:
flash(error)
else:
m = Message(name, email, message)
db.session.add(m)
save_message = Message(name, email, message)
db.session.add(save_message)
db.session.commit()
return redirect(url_for('about.thanks'))

11
files/admin.py Normal file
View File

@@ -0,0 +1,11 @@
from flask import Flask, Blueprint, flash, request, redirect, url_for
from flask import current_app, render_template, jsonify
from files.auth import admin_required
from files.models import Category, db
bp = Blueprint('admin', __name__, url_prefix='/admin')
@bp.route('/')
def index():
return render_template('admin/index.html')

7
files/auth.py
View File

@@ -1,11 +1,12 @@
import functools
from files.models import db, User
from werkzeug.exceptions import abort
from werkzeug.security import check_password_hash
from flask import Blueprint, request, flash, render_template, session, g, redirect, url_for
from flask import Blueprint, request, flash, render_template, session, g
from flask import redirect, url_for
from files.models import User
bp = Blueprint('auth', __name__, url_prefix='/auth')

18
files/categories.py
View File

@@ -1,4 +1,5 @@
from flask import Flask, Blueprint, flash, request, redirect, url_for, current_app, render_template, jsonify
from flask import Blueprint, flash, request, redirect, url_for
from flask import render_template
from files.auth import admin_required
from files.models import Category, db
@@ -24,19 +25,22 @@ def create():
if error is not None:
flash(error)
else:
c = Category(name)
db.session.add(c)
category = Category(name)
db.session.add(category)
db.session.commit()
return redirect(url_for('categories.index'))
return render_template('categories/create.html')
@bp.route('<int:id>')
def view(id):
category = Category.query.get(id)
@bp.route('<int:category_id>')
def view(category_id):
category = Category.query.get(category_id)
files = category.files
return render_template('categories/view.html', category=category, files=files)
return render_template(
'categories/view.html',
category=category,
files=files)
@bp.route('/<int:id>/update')

18
files/commands.py
View File

@@ -1,5 +1,5 @@
import click
import os
import click
from flask import current_app
from flask.cli import with_appcontext
@@ -18,8 +18,8 @@ def generate_admin():
username = current_app.config['USERNAME']
password = current_app.config['PASSWORD']
u = User(username, generate_password_hash(password))
db.session.add(u)
user = User(username, generate_password_hash(password))
db.session.add(user)
db.session.commit()
@@ -41,10 +41,14 @@ def add_files():
default_file_type = FileType.query.filter_by(name='Default').first()
added = 0
for f in existing_files:
search = File.query.filter_by(filename=f).first()
for existing_file in existing_files:
search = File.query.filter_by(filename=existing_file).first()
if search is None:
file = File(f, 0, default_category.id, default_file_type.id)
file = File(
existing_file,
0,
default_category.id,
default_file_type.id)
db.session.add(file)
added += 1
db.session.commit()
@@ -86,7 +90,7 @@ def add_files_command():
Generates the rows in the database for the files currently uploaded
They all will have default privacy, so, public
"""
added_size= add_files()
added_size = add_files()
click.echo(f'added {added_size} files')

94
files/files.py
View File

@@ -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'))

23
files/models.py
View File

@@ -1,6 +1,7 @@
from flask_sqlalchemy import SQLAlchemy
from datetime import datetime
from flask_sqlalchemy import SQLAlchemy
db = SQLAlchemy()
@@ -40,14 +41,25 @@ class File(db.Model):
id = db.Column(db.Integer, primary_key=True)
filename = db.Column(db.String, nullable=False)
private = db.Column(db.Integer, nullable=False)
category_id = db.Column(db.Integer, db.ForeignKey('categories.id'), nullable=False)
file_type_id = db.Column(db.Integer, db.ForeignKey('file_types.id'), nullable=False)
category_id = db.Column(
db.Integer,
db.ForeignKey('categories.id'),
nullable=False)
file_type_id = db.Column(
db.Integer,
db.ForeignKey('file_types.id'),
nullable=False)
def __init__(self, filename=None, private=None, category_id=None, file_type_id=None):
def __init__(
self,
filename=None,
private=None,
category_id=None,
file_type_id=None):
self.filename = filename
self.private = private
self.category_id = category_id
self.file_type_id = file_type_id
self.file_type_id = file_type_id
def __repr__(self):
return f'<File name:{self.filename}>'
@@ -65,6 +77,7 @@ class Category(db.Model):
def __repr__(self):
return f'<Category name:{self.name}>'
class FileType(db.Model):
__tablename__ = 'file_types'
id = db.Column(db.Integer, primary_key=True)

7
files/templates/admin/index.html Normal file
View File

@@ -0,0 +1,7 @@
{% extends 'base.html' %}
{% block title %}admin{% endblock %}
{% block content %}
<h4>Hi!</h4>
{% endblock %}