diginaut/digimarks
1
0
Fork 0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-06 22:05:09 +01:00
Code Issues Releases Wiki Activity

Bye bye flask-peewee

Browse Source
This commit is contained in:
Michiel Scholten
2018-03-02 21:10:24 +01:00
parent bd808a9e1d
commit 5f131b15ef
4 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
digimarks.py
View File

@@ -6,6 +6,14 @@ import hashlib
import os import os
import shutil import shutil
import sys import sys
import bs4
import requests
from flask import (Flask, abort, jsonify, redirect, render_template, request,
url_for)
from peewee import * # noqa
from werkzeug.contrib.atom import AtomFeed
try: try:
# Python 3 # Python 3
from urllib.parse import urljoin, urlparse, urlunparse from urllib.parse import urljoin, urlparse, urlunparse
@@ -13,13 +21,6 @@ except ImportError:
# Python 2 # Python 2
from urlparse import urljoin, urlparse, urlunparse from urlparse import urljoin, urlparse, urlunparse
import bs4
import requests
from flask import (Flask, abort, jsonify, redirect, render_template, request,
url_for)
from flask_peewee.db import Database
from peewee import * # noqa
from werkzeug.contrib.atom import AtomFeed
DEFAULT_THEME = 'green' DEFAULT_THEME = 'green'
themes = { themes = {
@@ -150,7 +151,7 @@ DATABASE = {
# create our flask app and a database wrapper # create our flask app and a database wrapper
app = Flask(__name__) app = Flask(__name__)
app.config.from_object(__name__) app.config.from_object(__name__)
db = Database(app) database = SqliteDatabase(os.path.join(APP_ROOT, 'bookmarks.db'))
# set custom url for the app, for example '/bookmarks' # set custom url for the app, for example '/bookmarks'
try: try:
@@ -215,7 +216,12 @@ def file_type(filename):
return "no match" return "no match"
class User(db.Model): class BaseModel(Model):
class Meta:
database = database
class User(BaseModel):
""" User account """ """ User account """
username = CharField() username = CharField()
key = CharField() key = CharField()
@@ -228,7 +234,7 @@ class User(db.Model):
return self.key return self.key
class Bookmark(db.Model): class Bookmark(BaseModel):
""" Bookmark instance, connected to User """ """ Bookmark instance, connected to User """
# Foreign key to User # Foreign key to User
userkey = CharField() userkey = CharField()
@@ -369,7 +375,7 @@ class Bookmark(db.Model):
return result return result
class PublicTag(db.Model): class PublicTag(BaseModel):
""" Publicly shared tag """ """ Publicly shared tag """
tagkey = CharField() tagkey = CharField()
userkey = CharField() userkey = CharField()

7
requirements-dev.txt
View File

@@ -10,12 +10,11 @@ bs4==0.0.1
certifi==2018.1.18 # via requests certifi==2018.1.18 # via requests
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
click==6.7 # via flask click==6.7 # via flask
flask-peewee==3.0.0
flask==0.12.2 flask==0.12.2
idna==2.6 # via requests idna==2.6 # via requests
isort==4.3.4 # via pylint isort==4.3.4 # via pylint
itsdangerous==0.24 # via flask itsdangerous==0.24 # via flask
jinja2==2.10 # via flask, flask-peewee jinja2==2.10 # via flask
lazy-object-proxy==1.3.1 # via astroid lazy-object-proxy==1.3.1 # via astroid
markupsafe==1.0 # via jinja2 markupsafe==1.0 # via jinja2
mccabe==0.6.1 # via pylint mccabe==0.6.1 # via pylint
@@ -24,7 +23,5 @@ pylint==1.8.2
requests==2.18.4 requests==2.18.4
six==1.11.0 # via astroid, pylint six==1.11.0 # via astroid, pylint
urllib3==1.22 # via requests urllib3==1.22 # via requests
werkzeug==0.14.1 # via flask, flask-peewee werkzeug==0.14.1 # via flask
wrapt==1.10.11 # via astroid wrapt==1.10.11 # via astroid
wtf-peewee==3.0.0 # via flask-peewee
wtforms==2.1 # via flask-peewee, wtf-peewee

1
requirements.in
View File

@@ -1,5 +1,4 @@
flask flask
peewee peewee
flask-peewee
bs4 bs4
requests requests

9
requirements.txt
View File

@@ -9,15 +9,12 @@ bs4==0.0.1
certifi==2018.1.18 # via requests certifi==2018.1.18 # via requests
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
click==6.7 # via flask click==6.7 # via flask
flask-peewee==0.6.7
flask==0.12.2 flask==0.12.2
idna==2.6 # via requests idna==2.6 # via requests
itsdangerous==0.24 # via flask itsdangerous==0.24 # via flask
jinja2==2.10 # via flask, flask-peewee jinja2==2.10 # via flask
markupsafe==1.0 # via jinja2 markupsafe==1.0 # via jinja2
peewee==2.10.2 peewee==3.1.2
requests==2.18.4 requests==2.18.4
urllib3==1.22 # via requests urllib3==1.22 # via requests
werkzeug==0.14.1 # via flask, flask-peewee werkzeug==0.14.1 # via flask
wtf-peewee==0.2.6 # via flask-peewee
wtforms==2.1 # via flask-peewee, wtf-peewee