[niepce] library: fix get_folder() to select on path
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] library: fix get_folder() to select on path
- Date: Sun, 7 Oct 2018 03:28:25 +0000 (UTC)
commit ba551d112b07569e404b468f4d08c76fc630e43f
Author: Hubert Figuière <hub figuiere net>
Date: Sat Oct 6 23:13:47 2018 -0400
library: fix get_folder() to select on path
src/engine/db/library.rs | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/src/engine/db/library.rs b/src/engine/db/library.rs
index 0970389..f1aaaf4 100644
--- a/src/engine/db/library.rs
+++ b/src/engine/db/library.rs
@@ -379,17 +379,25 @@ impl Library {
}
pub fn get_folder(&self, folder: &str) -> Option<LibFolder> {
- let foldername = try_opt!(Self::leaf_name_for_pathname(folder));
let conn = try_opt!(self.dbconn.as_ref());
- let sql = format!(
- "SELECT {} FROM {} WHERE path=:1",
- LibFolder::read_db_columns(),
- LibFolder::read_db_tables()
- );
+ let sql = format!("SELECT {} FROM {} WHERE path=:1",
+ LibFolder::read_db_columns(),
+ LibFolder::read_db_tables()
+ );
let mut stmt = try_opt!(conn.prepare(&sql).ok());
- let mut rows = try_opt!(stmt.query(&[&foldername]).ok());
- let row = try_opt!(try_opt!(rows.next()).ok());
- return Some(LibFolder::read_from(&row));
+ let mut rows = try_opt!(stmt.query(&[&folder]).ok());
+ match rows.next() {
+ None => {
+ None
+ },
+ Some(Err(err)) => {
+ err_out!("Error {:?}", err);
+ None
+ },
+ Some(Ok(row)) => {
+ Some(LibFolder::read_from(&row))
+ }
+ }
}
pub fn get_all_folders(&self) -> Option<Vec<LibFolder>> {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]