Moves methods from class to functional

lbry_comment_server/database.py

@@ -6,6 +6,53 @@ import time
 from lbry_comment_server.conf import *
 
 
+def obtain_connection(filepath: str = None, row_factory: bool = True):
+    filepath = filepath if filepath else database_dir
+    connection = sqlite3.connect(filepath)
+    if row_factory:
+        connection.row_factory = sqlite3.Row
+    return connection
+
+
+def generate_schema(conn: sqlite3.Connection, filepath: str = None):
+    filepath = filepath if filepath else schema_dir
+    with open(filepath, 'r') as ddl_file:
+        conn.executescript(ddl_file.read())
+
+
+def create_backup(conn: sqlite3.Connection, filepath: str = None):
+    filepath = filepath if filepath else backup_dir
+    with sqlite3.connect(filepath) as back:
+        conn.backup(back)
+
+
+def get_claim_comments(conn: sqlite3.Connection, claim_id: str, parent_id: str = None,
+                       page: int = 1, page_size: int = 50, top_level=False):
+    if top_level:
+        return [dict(row) for row in conn.execute(
+            """ SELECT * 
+                FROM COMMENTS_ON_CLAIMS 
+                WHERE claim_id LIKE ? AND parent_id IS NULL
+                LIMIT ? OFFSET ? """,
+            (claim_id, page_size, page_size*(page - 1))
+        )]
+    elif parent_id is None:
+        return [dict(row) for row in conn.execute(
+            """ SELECT * 
+                FROM COMMENTS_ON_CLAIMS WHERE claim_id LIKE ? 
+                LIMIT ? OFFSET ? """,
+            (claim_id, page_size, page_size*(page - 1))
+        )]
+    else:
+        return [dict(row) for row in conn.execute(
+            """ SELECT *
+                FROM COMMENTS_ON_CLAIMS 
+                WHERE claim_id LIKE ? AND parent_id = ?
+                LIMIT ? OFFSET ? """,
+            (claim_id, parent_id, page_size, page_size*(page - 1))
+        )]
+
+
 def validate_input(**kwargs):
     assert 0 < len(kwargs['comment']) <= 2000
     assert re.fullmatch(
@@ -14,77 +61,28 @@ def validate_input(**kwargs):
     )
     if 'channel_name' in kwargs:
         assert re.fullmatch(
-            '^@{1}(?:(?![\x00-\x08\x0b\x0c\x0e-\x1f\x23-\x26'
+            '^@(?:(?![\x00-\x08\x0b\x0c\x0e-\x1f\x23-\x26'
             '\x2f\x3a\x3d\x3f-\x40\uFFFE-\U0000FFFF]).){1,255}$',
             kwargs['channel_name']
         )
 
 
-class DatabaseConnection:
+def _insert_channel(conn: sqlite3.Connection, channel_name: str, channel_id: str):
-    def obtain_connection(self):
+    with conn:
-        self.connection = sqlite3.connect(self.filepath)
+        conn.execute(
-        if self.row_factory:
-            self.connection.row_factory = sqlite3.Row
-    
-    def __init__(self, filepath: str, row_factory: bool = True):
-        self.filepath = filepath
-        self.row_factory = row_factory
-        self.connection = None
-
-    def generate_schema(self, filepath: str):
-        with open(filepath, 'r') as ddl_file:
-            self.connection.executescript(ddl_file.read())
-
-    def create_backup(self):
-        with sqlite3.connect(backup_dir) as back:
-            self.connection.backup(back)
-
-    def get_claim_comments(self, claim_id: str,
-                           parent_id: str = None,
-                           page: int = 1,
-                           page_size: int = 50,
-                           top_level: bool = False, **kwargs):
-        if top_level:
-            curs = self.connection.execute(
-                """ SELECT * 
-                    FROM COMMENTS_ON_CLAIMS 
-                    WHERE claim_id LIKE ? AND parent_id IS NULL
-                    LIMIT ? OFFSET ? """,
-                (claim_id, page_size, page_size*(page - 1))
-            )
-        elif parent_id is None:
-            curs = self.connection.execute(
-                """ SELECT * 
-                    FROM COMMENTS_ON_CLAIMS WHERE claim_id LIKE ? 
-                    LIMIT ? OFFSET ? """,
-                (claim_id, page_size, page_size*(page - 1))
-            )
-        else:
-            curs = self.connection.execute(
-                """ SELECT *
-                    FROM COMMENTS_ON_CLAIMS 
-                    WHERE claim_id LIKE ? AND parent_id = ?
-                    LIMIT ? OFFSET ? """,
-                (claim_id, parent_id, page_size, page_size*(page - 1))
-            )
-        return [dict(row) for row in curs.fetchall()]
-
-    def _insert_channel(self, channel_name, channel_id):
-        with self.connection:
-            self.connection.execute(
             'INSERT INTO CHANNEL(ClaimId, Name)  VALUES (?, ?)',
             (channel_id, channel_name)
         )
 
-    def _insert_comment(self, claim_id: str = None, comment: str = None,
+
-                        channel_id: str = None, signature: str = None,
+def _insert_comment(conn: sqlite3.Connection, claim_id: str = None, comment: str = None,
-                        parent_id: str = None, **kwargs):
+                    channel_id: str = None, signature: str = None, parent_id: str = None) -> str:
     timestamp = time.time_ns()
     comment_prehash = ':'.join((claim_id, comment, str(timestamp),))
     comment_prehash = bytes(comment_prehash.encode('utf-8'))
     comment_id = nacl.hash.sha256(comment_prehash).decode('utf-8')
-        with self.connection:
+    with conn:
-            self.connection.execute(
+        conn.execute(
             """
             INSERT INTO COMMENT(CommentId, LbryClaimId, ChannelId, Body, 
                                             ParentId, Signature, Timestamp) 
@@ -94,7 +92,8 @@ class DatabaseConnection:
         )
     return comment_id
 
-    def create_comment(self, comment: str, claim_id: str, **kwargs) -> typing.Union[dict, None]:
+
+def create_comment(conn: sqlite3.Connection, comment: str, claim_id: str, **kwargs) -> typing.Union[dict, None]:
     channel_id = kwargs.pop('channel_id', '')
     channel_name = kwargs.pop('channel_name', '')
     if channel_id or channel_name:
@@ -105,24 +104,22 @@ class DatabaseConnection:
                 channel_id=channel_id,
                 channel_name=channel_name,
             )
-                self._insert_channel(channel_name, channel_id)
+            _insert_channel(conn, channel_name, channel_id)
         except AssertionError:
             return None
     else:
         channel_id = anonymous['channel_id']
-        comcast_id = self._insert_comment(
+    comment_id = _insert_comment(
-            comment=comment,
+        conn=conn, comment=comment, claim_id=claim_id, channel_id=channel_id, **kwargs
-            claim_id=claim_id,
-            channel_id=channel_id,
-            **kwargs
     )
-        curry = self.connection.execute(
+    curry = conn.execute(
-            'SELECT * FROM COMMENTS_ON_CLAIMS WHERE comment_id = ?', (comcast_id,)
+        'SELECT * FROM COMMENTS_ON_CLAIMS WHERE comment_id = ?', (comment_id,)
     )
     thing = curry.fetchone()
     return dict(thing) if thing else None
 
-    def get_comment_ids(self, claim_id: str, parent_id: str = None, page=1, page_size=50):
+
+def get_comment_ids(conn: sqlite3.Connection, claim_id: str, parent_id: str = None, page=1, page_size=50):
     """ Just return a list of the comment IDs that are associated with the given claim_id.
     If get_all is specified then it returns all the IDs, otherwise only the IDs at that level.
     if parent_id is left null then it only returns the top level comments.
@@ -131,24 +128,25 @@ class DatabaseConnection:
         get_all XOR (page_size + page)
     """
     if parent_id is None:
-            curs = self.connection.execute("""
+        curs = conn.execute("""
                 SELECT comment_id FROM COMMENTS_ON_CLAIMS
                 WHERE claim_id LIKE ? AND parent_id IS NULL LIMIT ? OFFSET ?
             """, (claim_id, page_size, page_size*abs(page - 1),)
                                        )
     else:
-            curs = self.connection.execute("""
+        curs = conn.execute("""
                 SELECT comment_id FROM COMMENTS_ON_CLAIMS
                 WHERE claim_id LIKE ? AND parent_id LIKE ? LIMIT ? OFFSET ?
             """, (claim_id, parent_id, page_size, page_size * abs(page - 1),)
                                        )
     return [tuple(row)[0] for row in curs.fetchall()]
 
-    def get_comments_by_id(self, comment_ids: list) -> typing.Union[list, None]:
+
+def get_comments_by_id(conn, comment_ids: list) -> typing.Union[list, None]:
     """ Returns a list containing the comment data associated with each ID within the list"""
     # format the input, under the assumption that the
     placeholders = ', '.join('?' for _ in comment_ids)
-        return [dict(row) for row in self.connection.execute(
+    return [dict(row) for row in conn.execute(
         f'SELECT * FROM COMMENTS_ON_CLAIMS WHERE comment_id IN ({placeholders})',
         tuple(comment_ids)
     )]