diff --git a/FTS/initializer.py b/FTS/initializer.py index 938c661..abc6aa3 100644 --- a/FTS/initializer.py +++ b/FTS/initializer.py @@ -1,5 +1,7 @@ import sqlite3 +from log.write import sys_log + def Initializer_Virtual_Table(): conn = sqlite3.connect('./database/search-index.db') @@ -7,3 +9,5 @@ def Initializer_Virtual_Table(): USING FTS5(site_id, link, title, text, description, keywords, shorttext, added)''') conn.close() + + sys_log("Initializer Virtual Table", "search-index.db") diff --git a/FTS/update.py b/FTS/update.py index 8774bbd..2976e1d 100644 --- a/FTS/update.py +++ b/FTS/update.py @@ -1,12 +1,12 @@ import sqlite3 -def Update_Virtual_Table(): - conn = sqlite3.connect('./database/search-index.db') +from log.write import sys_log +def Update_Virtual_Table(conn): conn.execute('DELETE FROM information_fts') conn.execute('''INSERT INTO information_fts(site_id, link, title, text, description, keywords, shorttext, added) SELECT site_id, link, title, text, description, keywords, shorttext, added FROM information''') conn.commit() - conn.close() + sys_log("Update Virtual Table", "search-index.db") diff --git a/adpn.py b/adpn.py index 4f077cd..7b8f5db 100644 --- a/adpn.py +++ b/adpn.py @@ -9,6 +9,7 @@ from account.username import get_username from atmt import ATMT_STRT from initializer.database import Initializer_Database +from initializer.loader import database_loader from log.write import log, sys_log from account.loader import account_database_loader from account.reliability import get_user_reliability @@ -134,8 +135,11 @@ def change_reliability_by_user_id(user_id, new_reliability): compare_databases() elif command == "sync": synchronization_databases() + print("Successful data synchronization.") elif command == "sync-fts": - Update_Virtual_Table() + vt_conn = database_loader() + Update_Virtual_Table(vt_conn) + print("Successful data synchronization.") elif command == "log": with open('log.txt', 'r') as file: for line in file: diff --git a/manager/manager.py b/manager/manager.py index 1242a77..fac576e 100644 --- a/manager/manager.py +++ b/manager/manager.py @@ -7,6 +7,7 @@ from manager.edit import edit_data from manager.insert import insert_data from manager.remove import remove_data +from FTS.update import Update_Virtual_Table def manager_insert_data(conn, username, password, link, title, text, description, keywords, shorttext): account_conn = account_database_loader() @@ -29,6 +30,8 @@ def manager_insert_data(conn, username, password, link, title, text, description cursor.close() account_conn.close() + Update_Virtual_Table(conn) + def manager_edit_data(conn, username, password, site_id, link, title, text, description, keywords, shorttext): account_conn = account_database_loader() cursor = account_conn.cursor() @@ -50,6 +53,8 @@ def manager_edit_data(conn, username, password, site_id, link, title, text, desc cursor.close() account_conn.close() + Update_Virtual_Table(conn) + def manager_remove_data(conn, username, password, site_id): account_conn = account_database_loader() cursor = account_conn.cursor() @@ -66,3 +71,5 @@ def manager_remove_data(conn, username, password, site_id): account_conn.close() cursor.close() + + Update_Virtual_Table(conn)