Creates handles for server contact

lbry_comment_server/database.py

@@ -8,7 +8,6 @@ from lbry_comment_server.settings import config
 
 
 def obtain_connection(filepath: str = None, row_factory: bool = True):
-    filepath = filepath if filepath else config['PATH']['DATABASE']
     connection = sqlite3.connect(filepath)
     if row_factory:
         connection.row_factory = sqlite3.Row

lbry_comment_server/handles.py

@@ -1,9 +1,13 @@
 import json
+import sqlite3
 import asyncio
 from aiojobs.aiohttp import atomic
 from aiohttp import web
-from lbry_comment_server import create_comment, get_claim_comments
+from lbry_comment_server.database import obtain_connection
-from lbry_comment_server import  get_comments_by_id, get_comment_ids
+from lbry_comment_server.settings import config
+from lbry_comment_server import get_claim_comments
+from lbry_comment_server import get_comments_by_id, get_comment_ids
+import lbry_comment_server.writes as writes
 
 ERRORS = {
     'INVALID_PARAMS': {'code': -32602, 'message': 'Invalid parameters'},
@@ -12,25 +16,28 @@ ERRORS = {
 }
 
 
-def ping():
+def ping(*args):
     return 'pong'
 
 
-@atomic
+def handle_get_comment_ids(app, **kwargs):
-async def handle_create_comment(**kwargs):
+    with obtain_connection(app['db_path']) as conn:
-    pass
+        return get_comment_ids(conn, **kwargs)
 
 
-def handle_get_comment_ids(**kwargs):
+def handle_get_claim_comments(app, **kwargs):
-    pass
+    with obtain_connection(app['db_path']) as conn:
+        return get_claim_comments(conn, **kwargs)
 
 
-def handle_get_claim_comments(**kwargs):
+def handle_get_comments_by_id(app, **kwargs):
-    pass
+    with obtain_connection(app['db_path']) as conn:
+        return get_comments_by_id(conn, **kwargs)
 
 
-def handle_get_comments_by_id(**kwargs):
+async def handle_create_comment(scheduler, **kwargs):
-    pass
+    job = await scheduler.spawn(writes.write_comment(**kwargs))
+    return await job.wait()
 
 
 METHODS = {
@@ -42,16 +49,16 @@ METHODS = {
 }
 
 
-def process_json(body: dict) -> dict:
+async def process_json(app, body: dict) -> dict:
     response = {'jsonrpc': '2.0', 'id': body['id']}
     if body['method'] in METHODS:
         method = body['method']
         params = body.get('params', {})
         try:
-            if method in self.__db_methods:
+            if asyncio.iscoroutinefunction(METHODS[method]):
-                result = self.db_conn.__getattribute__(method).__call__(**params)
+                result = await METHODS[method](app['comment_scheduler'], **params)
             else:
-                result = self.methods[method](self, **params)
+                result = METHODS[method](app, **params)
             response['result'] = result
         except TypeError as te:
             print(te)
@@ -61,14 +68,17 @@ def process_json(body: dict) -> dict:
     return response
 
 
-async def api_endpoint(request):
+@atomic
+async def api_endpoint(request: web.Request):
     try:
         body = await request.json()
         if type(body) is list or type(body) is dict:
             if type(body) is list:
-                return web.json_response([process_json(part) for part in body])
+                return web.json_response(
+                    [await process_json(request.app, part) for part in body]
+                )
             else:
-                return web.json_response(process_json(body))
+                return web.json_response(await process_json(request.app, body))
         else:
             return web.json_response({'error': ERRORS['UNKNOWN']})
     except json.decoder.JSONDecodeError as jde:

lbry_comment_server/writes.py

@@ -0,0 +1,34 @@
+import aiojobs
+import atexit
+from asyncio import coroutine
+import lbry_comment_server.database as db
+
+
+# DatabaseWriter should be instantiated on startup
+class DatabaseWriter(object):
+    _writer = None
+
+    def __init__(self, db_file):
+        if not DatabaseWriter._writer:
+            self.conn = db.obtain_connection(db_file)
+            DatabaseWriter._writer = self
+            atexit.register(self.cleanup)
+        else:
+            raise TypeError('Database Writer already exists!')
+
+    def cleanup(self):
+        DatabaseWriter._writer = None
+        self.conn.close()
+
+    @property
+    def connection(self):
+        return self.conn
+
+
+async def create_comment_scheduler():
+    return await aiojobs.create_scheduler(limit=1, pending_limit=0)
+
+
+async def write_comment(**comment):
+    with DatabaseWriter._writer.connection as conn:
+        return await coroutine(db.create_comment)(conn, **comment)