SinTan1729/chhoto-url
SinTan1729/chhoto-url
1
0
Fork 0
mirror of https://github.com/SinTan1729/chhoto-url synced 2025-04-28 11:56:52 -05:00
Code Issues Releases Activity

chg: Properly validate error types

Browse source
This commit is contained in:
Sayantan Santra 2025-04-21 22:20:11 -05:00
parent 21f76f2962
commit c23fcdc9bd
Signed by: SinTan1729
GPG key ID: 0538DD402EA50898
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actix/src/database.rs
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com> // SPDX-FileCopyrightText: 2023 Sayantan Santra <sayantan.santra689@gmail.com>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
use rusqlite::Connection; use rusqlite::{Connection, Error};
use serde::Serialize; use serde::Serialize;
// Struct for encoding a DB row // Struct for encoding a DB row
@ -67,12 +67,11 @@ pub fn add_hit(shortlink: &str, db: &Connection) {
} }
// Insert a new link // Insert a new link
pub fn add_link(shortlink: String, longlink: String, db: &Connection) -> bool { pub fn add_link(shortlink: String, longlink: String, db: &Connection) -> Result<usize, Error> {
db.execute( db.execute(
"INSERT INTO urls (long_url, short_url, hits) VALUES (?1, ?2, ?3)", "INSERT INTO urls (long_url, short_url, hits) VALUES (?1, ?2, ?3)",
(longlink, shortlink, 0), (longlink, shortlink, 0),
) )
.is_ok()
} }
// Delete and existing link // Delete and existing link

14
actix/src/utils.rs
View file

@ -128,10 +128,16 @@ pub fn add_link(req: String, db: &Connection) -> (bool, String) {
} }
if validate_link(chunks.shortlink.as_str()) { if validate_link(chunks.shortlink.as_str()) {
if database::add_link(chunks.shortlink.clone(), chunks.longlink, db) { match database::add_link(chunks.shortlink.clone(), chunks.longlink, db) {
(true, chunks.shortlink) Ok(_) => (true, chunks.shortlink),
} else { Err(error) => {
(false, String::from("Short URL is already in use!")) if error.to_string() == "UNIQUE constraint failed: urls.short_url" {
(false, String::from("Short URL is already in use!"))
} else {
// This should be super rare
(false, String::from("Something went wrong!"))
}
}
} }
} else { } else {
(false, String::from("Short URL is not valid!")) (false, String::from("Short URL is not valid!"))