SinTan1729/chhoto-url
SinTan1729/chhoto-url
1
0
Fork 0
mirror of https://github.com/SinTan1729/chhoto-url synced 2025-02-05 13:52:33 -06:00
Code Issues Releases Activity

fix: Only pull hits when needed

Browse source
This commit is contained in:
Sayantan Santra 2025-01-09 00:21:05 +05:30
parent 2b9fafe440
commit a60853fd21
Signed by: SinTan1729
GPG key ID: 0538DD402EA50898
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
actix/src/database.rs
View file

@ -13,9 +13,14 @@ pub struct DBRow {
} }
// Find a single URL // Find a single URL
pub fn find_url(shortlink: &str, db: &Connection) -> (Option<String>, Option<i64>) { pub fn find_url(shortlink: &str, db: &Connection, needhits: bool) -> (Option<String>, Option<i64>) {
let query = if needhits {
"SELECT long_url,hits FROM urls WHERE short_url = ?1"
} else {
"SELECT long_url FROM urls WHERE short_url = ?1"
};
let mut statement = db let mut statement = db
.prepare_cached("SELECT long_url,hits FROM urls WHERE short_url = ?1") .prepare_cached(query)
.expect("Error preparing SQL statement for find_url."); .expect("Error preparing SQL statement for find_url.");
let longlink = statement let longlink = statement

4
actix/src/services.rs
View file

@ -137,7 +137,7 @@ pub async fn getall(
pub async fn expand(req: String, data: web::Data<AppState>, http: HttpRequest) -> HttpResponse { pub async fn expand(req: String, data: web::Data<AppState>, http: HttpRequest) -> HttpResponse {
let result = utils::is_api_ok(http); let result = utils::is_api_ok(http);
if result.success { if result.success {
let linkinfo = utils::get_longurl(req, &data.db); let linkinfo = utils::get_longurl(req, &data.db, true);
if let Some(longlink) = linkinfo.0 { if let Some(longlink) = linkinfo.0 {
let body = LinkInfo { let body = LinkInfo {
success: true, success: true,
@ -192,7 +192,7 @@ pub async fn link_handler(
data: web::Data<AppState>, data: web::Data<AppState>,
) -> impl Responder { ) -> impl Responder {
let shortlink_str = shortlink.to_string(); let shortlink_str = shortlink.to_string();
if let Some(longlink) = utils::get_longurl(shortlink_str, &data.db).0 { if let Some(longlink) = utils::get_longurl(shortlink_str, &data.db, false).0 {
let redirect_method = env::var("redirect_method").unwrap_or(String::from("PERMANENT")); let redirect_method = env::var("redirect_method").unwrap_or(String::from("PERMANENT"));
database::add_hit(shortlink.as_str(), &data.db); database::add_hit(shortlink.as_str(), &data.db);
if redirect_method == "TEMPORARY" { if redirect_method == "TEMPORARY" {

6
actix/src/utils.rs
View file

@ -80,9 +80,9 @@ pub fn is_api_ok(http: HttpRequest) -> Response {
} }
// Request the DB for searching an URL // Request the DB for searching an URL
pub fn get_longurl(shortlink: String, db: &Connection) -> (Option<String>, Option<i64>) { pub fn get_longurl(shortlink: String, db: &Connection, needhits: bool) -> (Option<String>, Option<i64>) {
if validate_link(&shortlink) { if validate_link(&shortlink) {
database::find_url(shortlink.as_str(), db) database::find_url(shortlink.as_str(), db, needhits)
} else { } else {
(None, None) (None, None)
} }
@ -124,7 +124,7 @@ pub fn add_link(req: String, db: &Connection) -> (bool, String) {
} }
if validate_link(chunks.shortlink.as_str()) if validate_link(chunks.shortlink.as_str())
&& get_longurl(chunks.shortlink.clone(), db).0.is_none() && get_longurl(chunks.shortlink.clone(), db, false).0.is_none()
{ {
( (
database::add_link(chunks.shortlink.clone(), chunks.longlink, db), database::add_link(chunks.shortlink.clone(), chunks.longlink, db),