YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-01-28 20:14:13 +00:00
Code Issues Projects Releases Wiki Activity

delegate result handle to the transaction initiator

Browse Source
This commit is contained in:
yggverse 2024-10-07 21:10:12 +03:00
parent a1f2d57b6d
commit 47e2bc4617
6 changed files with 186 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app.rs
View File

@ -120,7 +120,11 @@ impl App {
match Database::records(&transaction) {
Ok(records) => {
for record in records {
browser.restore(&transaction, &record.id);
if let Err(e) =
browser.restore(&transaction, &record.id)
{
todo!("{e}")
}
}
}
Err(e) => todo!("{e}"),
@ -158,7 +162,11 @@ impl App {
match Database::delete(&transaction, &record.id) {
Ok(_) => {
// Delegate clean action to childs
browser.clean(&transaction, &record.id);
if let Err(e) =
browser.clean(&transaction, &record.id)
{
todo!("{e}")
}
}
Err(e) => todo!("{e}"),
}
@ -168,10 +176,12 @@ impl App {
match Database::add(&transaction) {
Ok(_) => {
// Delegate save action to childs
browser.save(
if let Err(e) = browser.save(
&transaction,
&Database::last_insert_id(&transaction),
);
) {
todo!("{e}")
}
}
Err(e) => todo!("{e}"),
}

80
src/app/browser.rs
View File

@ -191,54 +191,84 @@ impl Browser {
}
// Actions
pub fn clean(&self, tx: &Transaction, app_id: &i64) {
match Database::records(tx, app_id) {
pub fn clean(&self, transaction: &Transaction, app_id: &i64) -> Result<(), String> {
match Database::records(transaction, app_id) {
Ok(records) => {
for record in records {
match Database::delete(tx, &record.id) {
match Database::delete(transaction, &record.id) {
Ok(_) => {
// Delegate clean action to childs
// @TODO
// self.header.clean(record.id);
self.window.clean(tx, &record.id);
self.widget.clean(tx, &record.id);
if let Err(e) = self.window.clean(transaction, &record.id) {
return Err(e.to_string());
}
if let Err(e) = self.widget.clean(transaction, &record.id) {
return Err(e.to_string());
}
/* @TODO
if let Err(e) = self.header.clean(transaction, &record.id) {
return Err(e.to_string());
} */
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn restore(&self, tx: &Transaction, app_id: &i64) {
match Database::records(tx, app_id) {
pub fn restore(&self, transaction: &Transaction, app_id: &i64) -> Result<(), String> {
match Database::records(transaction, app_id) {
Ok(records) => {
for record in records {
// Delegate restore action to childs
// @TODO
// self.header.restore(record.id);
self.window.restore(tx, &record.id);
self.widget.restore(tx, &record.id);
if let Err(e) = self.widget.restore(transaction, &record.id) {
return Err(e.to_string());
}
if let Err(e) = self.window.restore(transaction, &record.id) {
return Err(e.to_string());
}
/* @TODO
if let Err(e) = self.header.restore(transaction, &record.id) {
return Err(e.to_string());
} */
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn save(&self, tx: &Transaction, app_id: &i64) {
match Database::add(tx, app_id) {
pub fn save(&self, transaction: &Transaction, app_id: &i64) -> Result<(), String> {
match Database::add(transaction, app_id) {
Ok(_) => {
// Delegate save action to childs
let id = Database::last_insert_id(tx);
let id = Database::last_insert_id(transaction);
// @TODO
// self.header.save(id);
self.window.save(tx, &id);
self.widget.save(tx, &id);
// Delegate save action to childs
if let Err(e) = self.widget.save(transaction, &id) {
return Err(e.to_string());
}
if let Err(e) = self.window.save(transaction, &id) {
return Err(e.to_string());
}
/* @TODO
if let Err(e) = self.header.save(transaction, &id) {
return Err(e.to_string());
} */
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
// Getters

30
src/app/browser/widget.rs
View File

@ -31,25 +31,27 @@ impl Widget {
}
// Actions
pub fn clean(&self, tx: &Transaction, app_browser_id: &i64) {
match Database::records(tx, app_browser_id) {
pub fn clean(&self, transaction: &Transaction, app_browser_id: &i64) -> Result<(), String> {
match Database::records(transaction, app_browser_id) {
Ok(records) => {
for record in records {
match Database::delete(tx, &record.id) {
match Database::delete(transaction, &record.id) {
Ok(_) => {
// Delegate clean action to childs
// nothing yet..
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn restore(&self, tx: &Transaction, app_browser_id: &i64) {
match Database::records(tx, app_browser_id) {
pub fn restore(&self, transaction: &Transaction, app_browser_id: &i64) -> Result<(), String> {
match Database::records(transaction, app_browser_id) {
Ok(records) => {
for record in records {
// Restore widget
@ -61,13 +63,15 @@ impl Widget {
// nothing yet..
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn save(&self, tx: &Transaction, app_browser_id: &i64) {
pub fn save(&self, transaction: &Transaction, app_browser_id: &i64) -> Result<(), String> {
match Database::add(
tx,
transaction,
app_browser_id,
&self.gobject.default_width(),
&self.gobject.default_height(),
@ -75,11 +79,13 @@ impl Widget {
) {
Ok(_) => {
// Delegate save action to childs
// let id = self.database.last_insert_id(tx);
// let id = self.database.last_insert_id(transaction);
// nothing yet..
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
// Getters

43
src/app/browser/window.rs
View File

@ -80,43 +80,58 @@ impl Window {
self.tab.update();
}
pub fn clean(&self, tx: &Transaction, app_browser_id: &i64) {
match Database::records(tx, app_browser_id) {
pub fn clean(&self, transaction: &Transaction, app_browser_id: &i64) -> Result<(), String> {
match Database::records(transaction, app_browser_id) {
Ok(records) => {
for record in records {
match Database::delete(tx, &record.id) {
match Database::delete(transaction, &record.id) {
Ok(_) => {
// Delegate clean action to childs
self.tab.clean(tx, &record.id);
if let Err(e) = self.tab.clean(transaction, &record.id) {
return Err(e.to_string());
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn restore(&self, tx: &Transaction, app_browser_id: &i64) {
match Database::records(tx, app_browser_id) {
pub fn restore(&self, transaction: &Transaction, app_browser_id: &i64) -> Result<(), String> {
match Database::records(transaction, app_browser_id) {
Ok(records) => {
for record in records {
// Delegate restore action to childs
self.tab.restore(tx, &record.id);
if let Err(e) = self.tab.restore(transaction, &record.id) {
return Err(e.to_string());
}
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn save(&self, tx: &Transaction, app_browser_id: &i64) {
match Database::add(tx, app_browser_id) {
pub fn save(&self, transaction: &Transaction, app_browser_id: &i64) -> Result<(), String> {
match Database::add(transaction, app_browser_id) {
Ok(_) => {
// Delegate save action to childs
self.tab.save(tx, &Database::last_insert_id(tx));
if let Err(e) = self
.tab
.save(transaction, &Database::last_insert_id(transaction))
{
return Err(e.to_string());
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
// Getters

58
src/app/browser/window/tab.rs
View File

@ -213,46 +213,66 @@ impl Tab {
}
}
pub fn clean(&self, tx: &Transaction, app_browser_window_id: &i64) {
match Database::records(tx, app_browser_window_id) {
pub fn clean(
&self,
transaction: &Transaction,
app_browser_window_id: &i64,
) -> Result<(), String> {
match Database::records(transaction, app_browser_window_id) {
Ok(records) => {
for record in records {
match Database::delete(tx, &record.id) {
match Database::delete(transaction, &record.id) {
Ok(_) => {
// Delegate clean action to childs
for (_, item) in self.index.borrow().iter() {
item.label.clean(tx, &record.id);
// @TODO item.page.clean(tx, &record.id);
if let Err(e) = item.label.clean(transaction, &record.id) {
return Err(e.to_string());
}
// @TODO item.page.clean(transaction, &record.id);
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn restore(&self, tx: &Transaction, app_browser_window_id: &i64) {
match Database::records(tx, app_browser_window_id) {
pub fn restore(
&self,
transaction: &Transaction,
app_browser_window_id: &i64,
) -> Result<(), String> {
match Database::records(transaction, app_browser_window_id) {
Ok(records) => {
for record in records {
let item = self.append(None, record.is_current);
// Delegate restore action to childs
item.label.restore(tx, &record.id);
// item.page.restore(tx, record.id);
if let Err(e) = item.label.restore(transaction, &record.id) {
return Err(e.to_string());
}
// item.page.restore(transaction, record.id);
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn save(&self, tx: &Transaction, app_browser_window_id: &i64) {
pub fn save(
&self,
transaction: &Transaction,
app_browser_window_id: &i64,
) -> Result<(), String> {
let mut page_number = 0;
for (_, item) in self.index.borrow().iter() {
match Database::add(
tx,
transaction,
app_browser_window_id,
&match self.widget.gobject().current_page() {
Some(number) => number == page_number,
@ -261,18 +281,22 @@ impl Tab {
) {
Ok(_) => {
// Delegate save action to childs
let id = Database::last_insert_id(tx);
let id = Database::last_insert_id(transaction);
item.label.save(tx, &id);
if let Err(e) = item.label.save(transaction, &id) {
return Err(e.to_string());
}
// @TODO
// item.page.save()
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
page_number += 1;
}
Ok(())
}
// Getters

40
src/app/browser/window/tab/label.rs
View File

@ -35,25 +35,35 @@ impl Label {
}
// Actions
pub fn clean(&self, tx: &Transaction, app_browser_window_tab_id: &i64) {
match Database::records(tx, app_browser_window_tab_id) {
pub fn clean(
&self,
transaction: &Transaction,
app_browser_window_tab_id: &i64,
) -> Result<(), String> {
match Database::records(transaction, app_browser_window_tab_id) {
Ok(records) => {
for record in records {
match Database::delete(tx, &record.id) {
match Database::delete(transaction, &record.id) {
Ok(_) => {
// Delegate clean action to childs
// nothing yet..
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn restore(&self, tx: &Transaction, app_browser_window_tab_id: &i64) {
match Database::records(tx, app_browser_window_tab_id) {
pub fn restore(
&self,
transaction: &Transaction,
app_browser_window_tab_id: &i64,
) -> Result<(), String> {
match Database::records(transaction, app_browser_window_tab_id) {
Ok(records) => {
for record in records {
self.pin(record.is_pinned);
@ -62,18 +72,26 @@ impl Label {
// nothing yet..
}
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn save(&self, tx: &Transaction, app_browser_window_tab_id: &i64) {
match Database::add(tx, app_browser_window_tab_id, &self.is_pinned()) {
pub fn save(
&self,
transaction: &Transaction,
app_browser_window_tab_id: &i64,
) -> Result<(), String> {
match Database::add(transaction, app_browser_window_tab_id, &self.is_pinned()) {
Ok(_) => {
// Delegate save action to childs
// nothing yet..
}
Err(e) => todo!("{e}"),
Err(e) => return Err(e.to_string()),
}
Ok(())
}
pub fn update(&self, title: Option<&GString>) {