From 4e4619fbe00dd016002da5eb1c1f27c032df6fad Mon Sep 17 00:00:00 2001
From: io <gie9ohbeixah@paperboats.net>
Date: Mon, 26 Jul 2021 06:24:26 +0000
Subject: [PATCH] markov.py: fix queries to reflect schema changes
---
generators/markov.py | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/generators/markov.py b/generators/markov.py
index d603163..ae7e76f 100644
--- a/generators/markov.py
+++ b/generators/markov.py
@@ -8,16 +8,34 @@ def make_sentence(cfg):
def test_sentence_input(self, sentence):
return True # all sentences are valid <3
- db = sqlite3.connect("toots.db")
+ db = sqlite3.connect(cfg.get("db_path", "posts.db"))
db.text_factory = str
c = db.cursor()
if cfg['learn_from_cw']:
ignored_cws_query_params = "(" + ",".join("?" * len(cfg["ignored_cws"])) + ")"
- toots = c.execute(f"SELECT content FROM `toots` WHERE cw IS NULL OR CW NOT IN {ignored_cws_query_params} ORDER BY RANDOM() LIMIT 10000", cfg["ignored_cws"]).fetchall()
+ toots = c.execute(
+ f"""
+ SELECT content
+ FROM posts
+ WHERE
+ summary IS NULL
+ OR summary NOT IN {ignored_cws_query_params}
+ ORDER BY RANDOM() LIMIT 10000
+ """,
+ cfg["ignored_cws"],
+ ).fetchall()
else:
- toots = c.execute("SELECT content FROM `toots` WHERE cw IS NULL ORDER BY RANDOM() LIMIT 10000").fetchall()
+ toots = c.execute(
+ """
+ SELECT content
+ FROM posts
+ WHERE summary IS NULL
+ ORDER BY RANDOM()
+ LIMIT 10000
+ """,
+ ).fetchall()
- if len(toots) == 0:
+ if not toots:
raise ValueError("Database is empty! Try running main.py.")
nlt = markovify.NewlineText if cfg['overlap_ratio_enabled'] else nlt_fixed