add delete endpoint and add Dockerfile

Author: demondave

.github/workflows/publish.yaml

@@ -0,0 +1,67 @@
+name: Create and publish a Docker image
+
+on:
+  push:
+    branches: ['main']
+  schedule:
+    - cron: "0 0 3 * *"
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker Image Update Checker
+        id: check
+        uses: lucacome/docker-image-update-checker@v1
+        if: github.event_name != 'push'
+        with:
+          base-image: alpine
+          image: greencode-hackathon/${{ env.IMAGE_NAME }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        if: github.event_name == 'push' || steps.check.outputs.needs-updating == 'true'
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        if: github.event_name == 'push' || steps.check.outputs.needs-updating == 'true'
+        with:
+          images: |
+            ghcr.io/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        if: github.event_name == 'push' || steps.check.outputs.needs-updating == 'true'
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -1,3 +1,4 @@
 /target
 .vscode
 .idea
+*.zst

Dockerfile

@@ -0,0 +1,19 @@
+FROM rust:alpine as builder
+
+WORKDIR /cdn-api
+
+COPY . .
+
+RUN apk add musl-dev
+
+RUN cargo build --release
+
+FROM alpine:latest
+
+WORKDIR /cdn-api
+
+RUN apk add ffmpeg
+
+COPY --from=builder /cdn-api/target/release/cdn-api .
+
+CMD ["./cdn-api"]

src/api/media.rs

@@ -1,11 +1,11 @@
 use actix_multipart::Multipart;
 use actix_web::{
-    get, post,
+    delete, get, post,
     web::{scope, Data, Path},
     HttpRequest, HttpResponse, Scope,
 };
 use futures::StreamExt;
-use log::error;
+use log::{error, info};
 use uuid::Uuid;
 
 use crate::storage::service::{Format, StorageService};
@@ -18,6 +18,7 @@ pub fn routes() -> Scope {
         .service(get_metadata)
         .service(get_media)
         .service(insert_media)
+        .service(delete_media)
 }
 
 #[get("/{uuid}/metadata")]
@@ -60,6 +61,8 @@ pub async fn insert_media(
     storage: Data<&'static StorageService>,
     mut payload: Multipart,
 ) -> HttpResponse {
+    let mut metadatas = Vec::new();
+
     while let Some(item) = payload.next().await {
         let field = match item {
             Ok(f) => f,
@@ -84,10 +87,39 @@ pub async fn insert_media(
             continue;
         };
 
-        if let Err(e) = storage.insert(field, format).await {
-            error!("{}", e);
+        match storage.insert(field, format).await {
+            Ok(m) => {
+                metadatas.push(m);
+            }
+            Err(e) => {
+                error!("{}", e);
+                continue;
+            }
         }
     }
 
-    HttpResponse::Ok().finish()
+    for metadata in &metadatas {
+        info!("Inserted media with uuid '{}'", metadata.uuid)
+    }
+
+    HttpResponse::Ok().json(&metadatas)
+}
+
+#[delete("/{uuid}")]
+pub async fn delete_media(
+    storage: Data<&'static StorageService>,
+    uuid: Path<Uuid>,
+) -> HttpResponse {
+    let uuid = uuid.into_inner();
+
+    match storage.remove(uuid).await {
+        Ok(m) => {
+            info!("Deleted media with uuid '{}'", uuid);
+            HttpResponse::Ok().json(&m)
+        }
+        Err(e) => {
+            error!("Couldn't delete '{}'", e);
+            HttpResponse::NotFound().finish()
+        }
+    }
 }

src/storage/media.rs

@@ -2,6 +2,7 @@ use std::path::{Path, PathBuf};
 
 use chrono::{DateTime, Utc};
 use serde::Serialize;
+use uuid::Uuid;
 
 #[derive(Clone)]
 pub struct Media {
@@ -27,6 +28,7 @@ pub enum MediaType {
 
 #[derive(Clone, Serialize)]
 pub struct MediaMetadata {
+    pub uuid: Uuid,
     pub media_type: MediaType,
     pub modified: DateTime<Utc>,
 }

src/storage/service.rs

@@ -67,6 +67,7 @@ impl StorageService {
             let media = match extension.as_str() {
                 "webp" => {
                     let metadata = MediaMetadata {
+                        uuid,
                         media_type: MediaType::Image,
                         modified,
                     };
@@ -78,6 +79,7 @@ impl StorageService {
                 }
                 "webm" => {
                     let metadata = MediaMetadata {
+                        uuid,
                         media_type: MediaType::Video,
                         modified,
                     };
@@ -117,7 +119,28 @@ impl StorageService {
         self.media.read().unwrap().len()
     }
 
-    pub async fn insert(&self, mut field: Field, format: Format) -> anyhow::Result<()> {
+    pub async fn remove(&self, uuid: Uuid) -> anyhow::Result<MediaMetadata> {
+        let mut lock = self.media.write().unwrap();
+
+        let metadata;
+
+        match lock.get(&uuid) {
+            Some(m) => {
+                let path = m.path.clone();
+
+                tokio::fs::remove_file(path).await?;
+
+                metadata = lock.remove(&uuid).unwrap().metadata;
+            }
+            None => {
+                bail!("Media with uuid '{}' doesn't exist", uuid);
+            }
+        }
+
+        Ok(metadata)
+    }
+
+    pub async fn insert(&self, mut field: Field, format: Format) -> anyhow::Result<MediaMetadata> {
         let uuid = Uuid::new_v4();
 
         // TEMPORARY
@@ -150,6 +173,9 @@ impl StorageService {
 
         let output = command.output().unwrap();
 
+        // Remove the temporary file to save space
+        tokio::fs::remove_file(&temporary).await?;
+
         if !output.status.success() {
             bail!(
                 "Couldn't convert '{}' to '{}'",
@@ -159,20 +185,21 @@ impl StorageService {
         }
 
         let metadata = MediaMetadata {
+            uuid,
             media_type: MediaType::Image,
             modified: Utc::now(),
         };
 
         let media = Media {
             path: persistent,
-            metadata,
+            metadata: metadata.clone(),
         };
 
         let mut lock = self.media.write().unwrap();
 
         lock.insert(uuid, media);
 
-        Ok(())
+        Ok(metadata)
     }
 }