Skip to content

Commit 6548240

Browse files
Separate app (core) views/models of application
1 parent 9412baa commit 6548240

File tree

7 files changed

+32
-26
lines changed

7 files changed

+32
-26
lines changed

db_create.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from tvseries.core import app, db
1+
from tvseries import app, db
22

33
db.app = app
44
db.create_all()

manage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from flask_script import Manager
2-
from tvseries.core import app
2+
from tvseries import app
33

44
manager = Manager(app)
55

tvseries/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
app = Flask(__name__)
55
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///tvseries.sqlite3'
66
db = SQLAlchemy(app)
7+
8+
from tvseries.core import views # noqa

tvseries/core/__init__.py

Whitespace-only changes.

tvseries/core/models.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
from tvseries import db
2+
3+
4+
class TVSerie(db.Model):
5+
__table_args__ = {'sqlite_autoincrement': True}
6+
id = db.Column(db.BigInteger().with_variant(db.Integer, "sqlite"),
7+
nullable=False, unique=True,
8+
autoincrement=True, primary_key=True)
9+
name = db.Column(db.String(50), unique=True, nullable=False)
10+
description = db.Column(db.Text, nullable=True)
11+
episodies_number = db.Column(db.Integer, nullable=False, default=1)
12+
author = db.Column(db.String(50), nullable=False)
13+
14+
def __repr__(self):
15+
if self.description:
16+
self.description = "{0}...".format(self.description[0:10])
17+
18+
return ("TVSerie(id={!r}, name={!r}, "
19+
"description={!r}, episodies_number={!r})").format(
20+
self.id, self.name,
21+
self.description,
22+
self.episodies_number)
Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import os
2-
32
from random import choice
4-
from flask import render_template, request, redirect, url_for
3+
4+
from flask import render_template, url_for, redirect, request
55

66
from tvseries import app, db
7+
from tvseries.core.models import TVSerie
8+
# ou ....
9+
# from .models import TVSerie
710

811

912
@app.route('/')
@@ -31,24 +34,3 @@ def add():
3134
return redirect('/')
3235

3336
return render_template('add.html')
34-
35-
36-
class TVSerie(db.Model):
37-
__table_args__ = {'sqlite_autoincrement': True}
38-
id = db.Column(db.BigInteger().with_variant(db.Integer, "sqlite"),
39-
nullable=False, unique=True,
40-
autoincrement=True, primary_key=True)
41-
name = db.Column(db.String(50), unique=True, nullable=False)
42-
description = db.Column(db.Text, nullable=True)
43-
episodies_number = db.Column(db.Integer, nullable=False, default=1)
44-
author = db.Column(db.String(50), nullable=False)
45-
46-
def __repr__(self):
47-
if self.description:
48-
self.description = "{0}...".format(self.description[0:10])
49-
50-
return ("TVSerie(id={!r}, name={!r}, "
51-
"description={!r}, episodies_number={!r})").format(
52-
self.id, self.name,
53-
self.description,
54-
self.episodies_number)

tvseries/tests/test_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22

3-
from tvseries.core import TVSerie
3+
from tvseries.core.models import TVSerie
44

55

66
@pytest.mark.usefixtures('client_class')

0 commit comments

Comments
 (0)