Save new area icons to image.db

Author: bubelov

docs/rpc/area-methods.md

@@ -166,33 +166,38 @@ Removes a tag from an area.
 
 ### set_area_icon
 
-Sets an icon for an area.
+Sets the square icon for an area. The `id` parameter accepts either the numeric area id or its alias.
 
-**Required Admin Action**: `area_admin`
-
-#### Request
+#### Example
 
 ```json
 {
-  "jsonrpc": "2.0",
-  "method": "set_area_icon",
-  "params": {
-    "area_id": 123,
-    "icon_url": "https://example.com/icon.png"
-  },
-  "id": 1
+  "id": 123,
+  "icon_base64": "iVBORw0KGgoAAAANSUhEUgAA...<truncated base64 payload>...AAAElFTkSuQmCC",
+  "icon_ext": "png"
 }
 ```
 
-#### Response
+##### Params
+
+| Field | Type | Description |
+| --- | --- | --- |
+| `id` | integer \| string | Area id or alias |
+| `icon_base64` | string | Standard base64 encoding of the icon bytes |
+| `icon_ext` | string | File extension without the leading dot (e.g. `png`, `svg`) |
+
+#### Result
 
 ```json
 {
-  "jsonrpc": "2.0",
-  "result": {
-    "success": true
+  "id": 123,
+  "tags": {
+    "icon:square": "https://static.btcmap.org/images/areas/123.png",
+    "name": "City Center"
   },
-  "id": 1
+  "created_at": "2024-01-15T12:34:56Z",
+  "updated_at": "2024-06-30T08:00:00Z",
+  "deleted_at": null
 }
 ```
 

src/rpc/generate_area_icons.rs

@@ -156,7 +156,7 @@ pub async fn run(main_pool: &Pool, image_pool: &ImagePool) -> Result<Res> {
     })
 }
 
-fn decode_dimensions(bytes: &[u8]) -> Option<(u32, u32)> {
+pub fn decode_dimensions(bytes: &[u8]) -> Option<(u32, u32)> {
     if looks_like_svg(bytes) {
         return svg_dimensions(bytes);
     }

src/rpc/handler.rs

@@ -477,7 +477,7 @@ pub async fn handle(
         ),
         RpcMethod::SetAreaIcon => RpcResponse::from(
             req.id.clone(),
-            super::set_area_icon::run(params(req.params)?, &main_pool).await?,
+            super::set_area_icon::run(params(req.params)?, &main_pool, &image_pool).await?,
         ),
         RpcMethod::RemoveArea => RpcResponse::from(
             req.id.clone(),

src/rpc/set_area_icon.rs

@@ -1,5 +1,5 @@
 use crate::{
-    db::{self, main::area::schema::Area},
+    db::{self, image::ImagePool, main::area::schema::Area},
     Result,
 };
 use base64::prelude::*;
@@ -41,7 +41,7 @@ impl From<Area> for Res {
     }
 }
 
-pub async fn run(params: Params, pool: &Pool) -> Result<Res> {
+pub async fn run(params: Params, pool: &Pool, image_pool: &ImagePool) -> Result<Res> {
     let area = db::main::area::queries::select_by_id_or_alias(&params.id, pool).await?;
     let file_name = format!("{}.{}", area.id, params.icon_ext);
     let bytes = BASE64_STANDARD.decode(params.icon_base64)?;
@@ -54,6 +54,49 @@ pub async fn run(params: Params, pool: &Pool) -> Result<Res> {
         ))?;
     file.write_all(&bytes)?;
     file.flush()?;
+
+    let dims = actix_web::web::block({
+        let bytes = bytes.clone();
+        move || super::generate_area_icons::decode_dimensions(&bytes)
+    })
+    .await?;
+
+    if let Some((width, height)) = dims {
+        let bytes_len = bytes.len() as i64;
+        let existing =
+            db::image::area::queries::select_by_area_id_and_type(area.id, "square", image_pool)
+                .await?;
+
+        if let Some(existing) = &existing {
+            if existing.image_data == bytes {
+                // already in sync, skip DB write
+            } else {
+                db::image::area::queries::delete(existing.id, image_pool).await?;
+                db::image::area::queries::insert(
+                    area.id,
+                    "square",
+                    bytes,
+                    width as i64,
+                    height as i64,
+                    bytes_len,
+                    image_pool,
+                )
+                .await?;
+            }
+        } else {
+            db::image::area::queries::insert(
+                area.id,
+                "square",
+                bytes,
+                width as i64,
+                height as i64,
+                bytes_len,
+                image_pool,
+            )
+            .await?;
+        }
+    }
+
     let url = format!("https://static.btcmap.org/images/areas/{file_name}");
     let patch_set = Map::from_iter([("icon:square".into(), url.into())]);
     let area = db::main::area::queries::patch_tags(area.id, patch_set, pool).await?;