From 3f7bb2267bbc4b4044ad0fca04b51b9f7dbc8a39 Mon Sep 17 00:00:00 2001 From: yggverse Date: Mon, 15 Jul 2024 06:47:42 +0300 Subject: [PATCH] Revert "change db namespaces" This reverts commit 531d4d7735aaae221872cf708eda9b14deb86a2d. --- src/Entity/Browser/Container/Page/Content.php | 2 +- .../Browser/History/Container/Content.php | 2 +- .../History/Container/Navbar/Delete.php | 2 +- src/Model/Database.php | 26 +++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Entity/Browser/Container/Page/Content.php b/src/Entity/Browser/Container/Page/Content.php index d1022383..c52e1a14 100644 --- a/src/Entity/Browser/Container/Page/Content.php +++ b/src/Entity/Browser/Container/Page/Content.php @@ -92,7 +92,7 @@ class Content ); // Update history in database - $this->page->container->browser->database->renewBrowserPageHistory( + $this->page->container->browser->database->renewHistory( $address->get(), // @TODO title ); diff --git a/src/Entity/Browser/History/Container/Content.php b/src/Entity/Browser/History/Container/Content.php index 283414ab..a1e835df 100644 --- a/src/Entity/Browser/History/Container/Content.php +++ b/src/Entity/Browser/History/Container/Content.php @@ -74,7 +74,7 @@ class Content { $this->table->data->clear(); - if ($records = $this->container->history->browser->database->findBrowserPageHistory($filter)) + if ($records = $this->container->history->browser->database->findHistory($filter)) { foreach ($records as $record) { diff --git a/src/Entity/Browser/History/Container/Navbar/Delete.php b/src/Entity/Browser/History/Container/Navbar/Delete.php index f228f675..15fefcd0 100644 --- a/src/Entity/Browser/History/Container/Navbar/Delete.php +++ b/src/Entity/Browser/History/Container/Navbar/Delete.php @@ -14,7 +14,7 @@ class Delete extends \Yggverse\Yoda\Abstract\Entity\Browser\History\Container\Na { if ($id = $this->navbar->container->content->table->getSelectedId()) { - $this->navbar->container->history->browser->database->deleteBrowserPageHistory( + $this->navbar->container->history->browser->database->deleteHistory( $id ); } diff --git a/src/Model/Database.php b/src/Model/Database.php index 72807fb6..dff1f6cd 100644 --- a/src/Model/Database.php +++ b/src/Model/Database.php @@ -34,7 +34,7 @@ class Database ); $this->_database->query(' - CREATE TABLE IF NOT EXISTS "browser_page_history" + CREATE TABLE IF NOT EXISTS "history" ( "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "time" INTEGER NOT NULL, @@ -44,13 +44,13 @@ class Database '); } - public function addBrowserPageHistory( + public function addHistory( string $url, ?string $title = null ): int { $query = $this->_database->prepare( - 'INSERT INTO `browser_page_history` (`time`, `url`, `title`) VALUES (:time, :url, :title)' + 'INSERT INTO `history` (`time`, `url`, `title`) VALUES (:time, :url, :title)' ); $query->execute( @@ -64,7 +64,7 @@ class Database return (int) $this->_database->lastInsertId(); } - public function findBrowserPageHistory( + public function findHistory( string $value = '', int $start = 0, int $limit = 1000 @@ -72,7 +72,7 @@ class Database { $query = $this->_database->prepare( sprintf( - 'SELECT * FROM `browser_page_history` + 'SELECT * FROM `history` WHERE `url` LIKE :value OR `title` LIKE :value ORDER BY `id` DESC LIMIT %d,%d', @@ -93,13 +93,13 @@ class Database return $query->fetchAll(); } - public function deleteBrowserPageHistory( + public function deleteHistory( int $id ): int { $query = $this->_database->query( sprintf( - 'DELETE FROM `browser_page_history` WHERE `id` = %d', + 'DELETE FROM `history` WHERE `id` = %d', $id ) ); @@ -107,13 +107,13 @@ class Database return $query->rowCount(); } - public function cleanBrowserPageHistory( + public function cleanHistory( int $timeout = 0 ): int { $query = $this->_database->query( sprintf( - 'DELETE FROM `browser_page_history` WHERE `time` + %d < %d', + 'DELETE FROM `history` WHERE `time` + %d < %d', $timeout, time() ) @@ -123,14 +123,14 @@ class Database return $query->rowCount(); } - public function renewBrowserPageHistory( + public function renewHistory( string $url, ?string $title = null ): void { // Find same records match URL $query = $this->_database->prepare( - 'SELECT * FROM `browser_page_history` WHERE `url` LIKE :url' + 'SELECT * FROM `history` WHERE `url` LIKE :url' ); $query->execute( @@ -142,13 +142,13 @@ class Database // Drop previous records foreach ($query->fetchAll() as $record) { - $this->deleteBrowserPageHistory( + $this->deleteHistory( $record->id ); } // Add new record - $this->addBrowserPageHistory( + $this->addHistory( $url, $title );