From 8733294f13e7c224059ceb880038d2ae2d721ae7 Mon Sep 17 00:00:00 2001 From: katboi01 Date: Fri, 17 Jan 2025 14:12:47 +0100 Subject: [PATCH] constrained download mode for accounts list --- modules/Archive/database.py | 5 +++-- modules/Archive/databaseController.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/Archive/database.py b/modules/Archive/database.py index e719615..432812a 100644 --- a/modules/Archive/database.py +++ b/modules/Archive/database.py @@ -62,9 +62,10 @@ class Database: SUM(IIF(x_posts.action_taken = 2, 1, 0)) as deleted, SUM(IIF(x_posts.action_taken = 3, 1, 0)) as hidden, SUM(IIF(x_post_details.id is NULL, 1, 0)) as invalid -FROM x_posts - LEFT JOIN accounts on accounts.id = x_posts.account_id +FROM accounts + LEFT JOIN x_posts on accounts.id = x_posts.account_id LEFT JOIN x_post_details on x_post_details.id = x_posts.id +WHERE accounts.download_mode != 4 GROUP BY account_id ORDER BY x_handle''' return self.db.run_query(query) diff --git a/modules/Archive/databaseController.py b/modules/Archive/databaseController.py index b37ce16..a0f0009 100644 --- a/modules/Archive/databaseController.py +++ b/modules/Archive/databaseController.py @@ -27,19 +27,21 @@ class DatabaseController: return result > 0 except Exception as e: self.conn.rollback() - print(e) + print(command, e) return False def run_commands(self, commands): + last_command = "" try: for command in commands: + last_command = command self.cursor.execute(command) result = self.cursor.rowcount self.conn.commit() return result > 0 except Exception as e: self.conn.rollback() - print(e) + print(last_command, e) return False def close(self):