Working unified index.

src/filters.rs

@@ -7,17 +7,17 @@ pub fn search(db: Pool) -> impl Filter<Extract = impl Reply, Error = Rejection>
     search_image(db.clone())
         .or(search_hashes(db.clone()))
         .or(stream_search_image(db.clone()))
-        // .or(search_file(db))
+        .or(search_file(db))
 }
 
-// pub fn search_file(db: Pool) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
+pub fn search_file(db: Pool) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
-//     warp::path("file")
+    warp::path("file")
-//         .and(warp::get())
+        .and(warp::get())
-//         .and(warp::query::<FileSearchOpts>())
+        .and(warp::query::<FileSearchOpts>())
-//         .and(with_pool(db))
+        .and(with_pool(db))
-//         .and(with_api_key())
+        .and(with_api_key())
-//         .and_then(handlers::search_file)
+        .and_then(handlers::search_file)
-// }
+}
 
 pub fn search_image(db: Pool) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
     warp::path("image")

src/handlers.rs

@@ -206,68 +206,72 @@ pub async fn search_hashes(
     Ok(warp::reply::json(&matches))
 }
 
-// pub async fn search_file(
+pub async fn search_file(
-//     opts: FileSearchOpts,
+    opts: FileSearchOpts,
-//     db: Pool,
+    db: Pool,
-//     api_key: String,
+    api_key: String,
-// ) -> Result<impl Reply, Rejection> {
+) -> Result<impl Reply, Rejection> {
-//     let db = db.get().await.map_err(map_bb8_err)?;
+    let db = db.get().await.map_err(map_bb8_err)?;
 
-//     rate_limit!(&api_key, &db, name_limit, "file");
+    rate_limit!(&api_key, &db, name_limit, "file");
 
-//     let (filter, val): (&'static str, &(dyn tokio_postgres::types::ToSql + Sync)) =
+    let (filter, val): (&'static str, &(dyn tokio_postgres::types::ToSql + Sync)) =
-//         if let Some(ref id) = opts.id {
+        if let Some(ref id) = opts.id {
-//             ("file_id = $1", id)
+            ("file_id = $1", id)
-//         } else if let Some(ref name) = opts.name {
+        } else if let Some(ref name) = opts.name {
-//             ("lower(filename) = lower($1)", name)
+            ("lower(filename) = lower($1)", name)
-//         } else if let Some(ref url) = opts.url {
+        } else if let Some(ref url) = opts.url {
-//             ("lower(url) = lower($1)", url)
+            ("lower(url) = lower($1)", url)
-//         } else {
+        } else {
-//             return Err(warp::reject::custom(Error::InvalidData));
+            return Err(warp::reject::custom(Error::InvalidData));
-//         };
+        };
 
-//     debug!("Searching for {:?}", opts);
+    debug!("Searching for {:?}", opts);
 
-//     let query = format!(
+    let query = format!(
-//         "SELECT
+        "SELECT
-//             submission.id,
+            submission.id,
-//             submission.url,
+            submission.url,
-//             submission.filename,
+            submission.filename,
-//             submission.file_id,
+            submission.file_id,
-//             artist.name
+            artist.name,
-//         FROM
+            hashes.id hash_id
-//             submission
+        FROM
-//         JOIN artist
+            submission
-//             ON artist.id = submission.artist_id
+        JOIN artist
-//         WHERE
+            ON artist.id = submission.artist_id
-//             {}
+        JOIN hashes
-//         LIMIT 10",
+            ON hashes.furaffinity_id = submission.id
-//         filter
+        WHERE
-//     );
+            {}
+        LIMIT 10",
+        filter
+    );
 
-//     let matches: Vec<_> = db
+    let matches: Vec<_> = db
-//         .query::<str>(&*query, &[val])
+        .query::<str>(&*query, &[val])
-//         .await
+        .await
-//         .map_err(map_postgres_err)?
+        .map_err(map_postgres_err)?
-//         .into_iter()
+        .into_iter()
-//         .map(|row| File {
+        .map(|row| File {
-//             id: row.get::<&str, i32>("id") as i64,
+            id: row.get("hash_id"),
-//             id_str: row.get::<&str, i32>("id").to_string(),
+            site_id: row.get::<&str, i32>("id") as i64,
-//             url: row.get("url"),
+            site_id_str: row.get::<&str, i32>("id").to_string(),
-//             filename: row.get("filename"),
+            url: row.get("url"),
-//             artists: row
+            filename: row.get("filename"),
-//                 .get::<&str, Option<String>>("name")
+            artists: row
-//                 .map(|artist| vec![artist]),
+                .get::<&str, Option<String>>("name")
-//             distance: None,
+                .map(|artist| vec![artist]),
-//             hash: None,
+            distance: None,
-//             site_info: Some(SiteInfo::FurAffinity(FurAffinityFile {
+            hash: None,
-//                 file_id: row.get("file_id"),
+            site_info: Some(SiteInfo::FurAffinity(FurAffinityFile {
-//             })),
+                file_id: row.get("file_id"),
-//         })
+            })),
-//         .collect();
+        })
+        .collect();
 
-//     Ok(warp::reply::json(&matches))
+    Ok(warp::reply::json(&matches))
-// }
+}
 
 pub async fn handle_rejection(err: Rejection) -> Result<impl Reply, std::convert::Infallible> {
     info!("Had rejection: {:?}", err);

src/models.rs

@@ -59,6 +59,12 @@ pub fn image_query_sync(
     distance: i64,
     hash: Option<Vec<u8>>,
 ) -> tokio::sync::mpsc::Receiver<Result<Vec<File>, tokio_postgres::Error>> {
+    log::trace!(
+        "Running image query on {} hashes with distance {}",
+        hashes.len(),
+        distance
+    );
+
     let (mut tx, rx) = tokio::sync::mpsc::channel(1);
 
     tokio::spawn(async move {
@@ -71,7 +77,7 @@ pub fn image_query_sync(
         let mut hash_where_clause = Vec::with_capacity(hashes.len());
         for (idx, hash) in hashes.iter().enumerate() {
             params.push(hash);
-            hash_where_clause.push(format!(" hash <@ (${}, $1)", idx + 2));
+            hash_where_clause.push(format!(" hashes.hash <@ (${}, $1)", idx + 2));
         }
         let hash_where_clause = hash_where_clause.join(" OR ");
 

src/types.rs

@@ -25,7 +25,7 @@ pub enum RateLimit {
 /// A general type for every file.
 #[derive(Debug, Default, Serialize)]
 pub struct File {
-    pub id: i64,
+    pub id: i32,
 
     pub site_id: i64,
     pub site_id_str: String,