Browse Source

Run autoformatter

Getty Ritter 4 years ago
parent
commit
5c6ca83230
6 changed files with 56 additions and 51 deletions
  1. 1 1
      lc/config.py
  2. 1 1
      lc/main.py
  3. 25 25
      lc/model.py
  4. 2 0
      lc/requests.py
  5. 13 10
      lc/routes.py
  6. 14 14
      tests/model.py

+ 1 - 1
lc/config.py

@@ -2,4 +2,4 @@ import os
 
 import playhouse.sqlite_ext
 
-DB=playhouse.sqlite_ext.SqliteExtDatabase(None)
+DB = playhouse.sqlite_ext.SqliteExtDatabase(None)

+ 1 - 1
lc/main.py

@@ -3,5 +3,5 @@ import os
 import lc.config
 import lc.routes
 
-lc.config.DB.init(os.getenv('DB_LOC', 'test.db'))
+lc.config.DB.init(os.getenv("DB_LOC", "test.db"))
 app = lc.routes.app

+ 25 - 25
lc/model.py

@@ -4,22 +4,25 @@ import peewee
 import lc.config
 import lc.requests as r
 
+
 class Model(peewee.Model):
     class Meta:
         database = lc.config.DB
 
+
 # TODO: figure out authorization for users (oauth? passwd?)
 class User(Model):
-    '''
+    """
     A user! you know tf this is about
-    '''
+    """
+
     name = peewee.TextField()
 
 
 class Link(Model):
-    '''
+    """
     A link as stored in the database
-    '''
+    """
 
     url = peewee.TextField()
     name = peewee.TextField()
@@ -29,10 +32,10 @@ class Link(Model):
     # is the field entirely private?
     private = peewee.BooleanField()
     # owned by
-    user = peewee.ForeignKeyField(User, backref='all_links')
+    user = peewee.ForeignKeyField(User, backref="all_links")
 
     @staticmethod
-    def from_request(user: User, link: r.Link) -> 'Link':
+    def from_request(user: User, link: r.Link) -> "Link":
         l = Link.create(
             url=link.url,
             name=link.name,
@@ -44,44 +47,40 @@ class Link(Model):
         for tag_name in link.tags:
             t = Tag.find_tag(tag_name)
             HasTag.create(
-                link=l,
-                tag=t,
+                link=l, tag=t,
             )
         return l
 
 
 class Tag(Model):
-    '''
+    """
     A tag. This just indicates that a user has used this tag at some point.
-    '''
+    """
+
     name = peewee.TextField()
-    parent = peewee.ForeignKeyField('self', null=True, backref='children')
-    user = peewee.ForeignKeyField(User, backref='tags')
+    parent = peewee.ForeignKeyField("self", null=True, backref="children")
+    user = peewee.ForeignKeyField(User, backref="tags")
 
     @staticmethod
     def find_tag(user: User, tag_name: str):
-        if (t := Tag.get_or_none(name=tag_name, user=user)):
+        if (t := Tag.get_or_none(name=tag_name, user=user)) :
             return t
 
         parent = None
-        if '/' in tag_name:
-            parent_name = tag_name[:tag_name.rindex('/')]
+        if "/" in tag_name:
+            parent_name = tag_name[: tag_name.rindex("/")]
             parent = Tag.find_tag(user, parent_name)
 
-        return Tag.create(
-            name=tag_name,
-            parent=parent,
-            user=user,
-        )
-
+        return Tag.create(name=tag_name, parent=parent, user=user,)
 
 
 class HasTag(Model):
-    '''
+    """
     Establishes that a link is tagged with a given tag.
-    '''
-    link = peewee.ForeignKeyField(Link, backref='tags')
-    tag = peewee.ForeignKeyField(Tag, backref='models')
+    """
+
+    link = peewee.ForeignKeyField(Link, backref="tags")
+    tag = peewee.ForeignKeyField(Tag, backref="models")
 
 
 MODELS = [
@@ -91,5 +90,6 @@ MODELS = [
     HasTag,
 ]
 
+
 def create_tables():
     lc.config.DB.create_tables(MODELS, safe=True)

+ 2 - 0
lc/requests.py

@@ -2,11 +2,13 @@ from dataclasses import dataclass
 from dataclasses_json import dataclass_json
 from typing import List
 
+
 @dataclass_json
 @dataclass
 class User:
     name: str
 
+
 @dataclass_json
 @dataclass
 class Link:

+ 13 - 10
lc/routes.py

@@ -4,33 +4,36 @@ import pystache
 
 import lc.model as m
 
-LOADER = pystache.loader.Loader(
-    extension='mustache',
-    search_dirs=['templates'],
-)
+LOADER = pystache.loader.Loader(extension="mustache", search_dirs=["templates"],)
 
 app = flask.Flask(__name__)
 
-@app.route('/')
+
+@app.route("/")
 def index():
     pass
 
-@app.route('/u', methods=['POST'])
+
+@app.route("/u", methods=["POST"])
 def create_user(user):
     pass
 
-@app.route('/u/<string:user>', methods=['GET', 'POST'])
+
+@app.route("/u/<string:user>", methods=["GET", "POST"])
 def get_user(user):
     pass
 
-@app.route('/u/<string:user>/l', methods=['POST'])
+
+@app.route("/u/<string:user>/l", methods=["POST"])
 def create_link(user):
     pass
 
-@app.route('/u/<string:user>/l/<string:link>', methods=['GET', 'POST'])
+
+@app.route("/u/<string:user>/l/<string:link>", methods=["GET", "POST"])
 def link(user):
     pass
 
-@app.route('/u/<string:user>/t/<path:tag>')
+
+@app.route("/u/<string:user>/t/<path:tag>")
 def get_tagged_links(user, tag):
     pass

+ 14 - 14
tests/model.py

@@ -2,20 +2,21 @@ import lc.config as c
 import lc.model as m
 import tempfile
 
+
 class TestDB:
     def setup_method(self, _):
-        c.DB.init(':memory:')
+        c.DB.init(":memory:")
         c.DB.create_tables(m.MODELS)
 
     def test_create_user(self):
-        name = 'gdritter'
+        name = "gdritter"
         u = m.User.create(name=name)
 
         # it should be the only thing in the db
         all_users = m.User.select()
         assert len(all_users) == 1
-        assert(all_users[0].id == u.id)
-        assert(all_users[0].name == name)
+        assert all_users[0].id == u.id
+        assert all_users[0].name == name
 
         # we should be able to find it with the given name, too
         named_user = m.User.get(m.User.name == name)
@@ -23,8 +24,8 @@ class TestDB:
         assert named_user.name == name
 
     def test_find_tag(self):
-        tag_name = 'food'
-        u = m.User.create(name='gdritter')
+        tag_name = "food"
+        u = m.User.create(name="gdritter")
         t = m.Tag.find_tag(u, tag_name)
 
         # we should be able to find the tag with the given name
@@ -36,8 +37,8 @@ class TestDB:
         assert t.id == t2.id
 
     def test_find_hierarchy(self):
-        u = m.User.create(name='gdritter')
-        t = m.Tag.find_tag(u, 'food/bread/rye')
+        u = m.User.create(name="gdritter")
+        t = m.Tag.find_tag(u, "food/bread/rye")
 
         # this should have created three DB rows: for 'food', for
         # 'food/bread', and for 'food/bread/rye':
@@ -45,12 +46,12 @@ class TestDB:
 
         # searching for a prefix of the tag should yield the same
         # parent tag
-        assert t.parent.id == m.Tag.get(name='food/bread').id
-        assert t.parent.parent.id == m.Tag.get(name='food').id
+        assert t.parent.id == m.Tag.get(name="food/bread").id
+        assert t.parent.parent.id == m.Tag.get(name="food").id
 
         # creating a new hierarchical tag with a shared prefix should
         # only create the new child tag
-        t2 = m.Tag.find_tag(u, 'food/bread/baguette')
+        t2 = m.Tag.find_tag(u, "food/bread/baguette")
         print([t.name for t in m.Tag.select()])
 
         assert len(m.Tag.select()) == 4
@@ -60,9 +61,8 @@ class TestDB:
 
         # trying to get a hierarchical tag should result in the same
         # one already entered
-        assert t.id == m.Tag.get(name='food/bread/rye').id
-        assert t2.id == m.Tag.get(name='food/bread/baguette').id
-
+        assert t.id == m.Tag.get(name="food/bread/rye").id
+        assert t2.id == m.Tag.get(name="food/bread/baguette").id
 
     def teardown_method(self, _):
         c.DB.close()