Update

Add FTS (Full-Text-Search)
Better server starter

FTS/initializer.py

@@ -0,0 +1,9 @@
+import sqlite3
+
+def Initializer_Virtual_Table():
+    conn = sqlite3.connect('./database/search-index.db')
+
+    conn.execute('''CREATE VIRTUAL TABLE IF NOT EXISTS information_fts
+                 USING FTS5(site_id, link, title, text, description, keywords, shorttext, added)''')
+
+    conn.close()

FTS/update.py

@@ -0,0 +1,12 @@
+import sqlite3
+
+def Update_Virtual_Table():
+    conn = sqlite3.connect('./database/search-index.db')
+
+    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()

adpn.py

@@ -1,8 +1,13 @@
+from datetime import datetime
 import os
 import shutil
 import sqlite3
+import subprocess
+from FTS.initializer import Initializer_Virtual_Table
+from FTS.update import Update_Virtual_Table
 from account.userid import get_user_id
 from account.username import get_username
+from initializer.database import Initializer_Database
 from log.write import log, sys_log
 from account.loader import account_database_loader
 from account.reliability import get_user_reliability
@@ -99,6 +104,7 @@ def change_reliability_by_user_id(user_id, new_reliability):
 
 if reliability is None:
     print("Account does not exist.")
+    exit()
 elif reliability >= 4:
     print('Logged in successfully.')
 else:
@@ -110,10 +116,22 @@ def change_reliability_by_user_id(user_id, new_reliability):
 
     if command == "exit":
         exit()
+    elif command == "start":
+        yn = input('Do you want to start the server including: Search, Account [y/n]: ')
+        if (yn != 'n'):
+                Initializer_Database()
+                Initializer_Virtual_Table()
+                Update_Virtual_Table()
+                subprocess.call("start server1", shell=True)
+                subprocess.call("start server2", shell=True)
+                print('The server has been started successfully.')
+                sys_log('Start Server', str(datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
     elif command == "check":
         compare_databases()
     elif command == "sync":
         synchronization_databases()
+    elif command == "sync-fts":
+        Update_Virtual_Table()
     elif command == "log":
         with open('log.txt', 'r') as file:
             for line in file:

log.txt

@@ -0,0 +1,7 @@
+SYS: Loaded: users-account.db
+SYS: Initializer Database: search-index.db
+SYS: Initializer Censorship Database: censorship.db
+SYS: Create Users Account Database: users-account.db
+SYS: Start Server: 2024-02-08 18:24:56
+SYS: Loaded: users-account.db
+SYS: Loaded: search-index.db

main.py

@@ -1,12 +1,8 @@
 import streamlit as st
 import time
-
 from initializer.loader import database_loader
 from manager.manager import *
 from search.index import Search_Data
-from initializer.database import Initializer_Database
-
-Initializer_Database()
 
 conn = database_loader()
 

search/index.py

@@ -4,9 +4,8 @@
 def Search_Data(conn, keyword):
     cursor = conn.cursor()
 
-    cursor.execute('''SELECT * FROM information
-                      WHERE title LIKE ? OR text LIKE ? OR description LIKE ? OR keywords LIKE ? OR shorttext LIKE ?''', 
-                      ('%' + keyword + '%', '%' + keyword + '%', '%' + keyword + '%', '%' + keyword + '%', '%' + keyword + '%'))
+    cursor.execute('''SELECT * FROM information_fts
+                  WHERE information_fts MATCH ?''', (keyword,))
 
     rows = cursor.fetchall()
     conn.close()