Fix build errors.

scpwiki · Sep 18, 2024 · 6ba1e87 · 6ba1e87
1 parent 4ba1c34
commit 6ba1e87
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/deepwell/src/endpoints/file.rs b/deepwell/src/endpoints/file.rs
@@ -25,7 +25,7 @@ use crate::services::blob::BlobService;
 use crate::services::file::{
     DeleteFile, DeleteFileOutput, EditFile, EditFileOutput, GetBlobOutput,
     GetFileDetails, GetFileOutput, MoveFile, MoveFileOutput, RestoreFile,
-    RestoreFileOutput,
+    RestoreFileOutput, StartFileUploadOutput,
 };
 use crate::services::Result;
 use crate::web::{Bytes, FileDetails};
@@ -82,7 +82,7 @@ pub async fn file_get(
 pub async fn file_upload(
     ctx: &ServiceContext<'_>,
     params: Params<'static>,
-) -> Result<UploadFileOutput> {
+) -> Result<StartFileUploadOutput> {
     // FIXME file upload endpoint
     /*
     let input: UploadFile = params.parse()?;

diff --git a/deepwell/src/services/blob/service.rs b/deepwell/src/services/blob/service.rs
@@ -140,6 +140,7 @@ impl BlobService {
                 hash: EMPTY_BLOB_HASH,
                 mime: str!(EMPTY_BLOB_MIME),
                 size: 0,
+                created: false,
             });
         }
 

diff --git a/deepwell/src/services/file/service.rs b/deepwell/src/services/file/service.rs
@@ -28,7 +28,7 @@ use crate::services::blob::{FinalizeBlobUploadOutput, EMPTY_BLOB_HASH, EMPTY_BLO
 use crate::services::file_revision::{
     CreateFileRevision, CreateFileRevisionBody, CreateFirstFileRevision,
     CreatePendingFileRevision, CreateResurrectionFileRevision,
-    CreateTombstoneFileRevision, FileBlob,
+    CreateTombstoneFileRevision, FileBlob, FinishFileRevisionUpload,
 };
 use crate::services::filter::{FilterClass, FilterType};
 use crate::services::{BlobService, FileRevisionService, FilterService};
@@ -147,7 +147,7 @@ impl FileService {
         // This gets the data from BlobService and then deletes the row.
         FileRevisionService::finish_upload(
             ctx,
-            FinishUploadFile {
+            FinishFileRevisionUpload {
                 site_id,
                 page_id,
                 file_id,

diff --git a/deepwell/src/services/file/structs.rs b/deepwell/src/services/file/structs.rs
@@ -20,7 +20,8 @@
 
 use crate::models::sea_orm_active_enums::FileRevisionType;
 use crate::services::file_revision::{
-    CreateFileRevisionOutput, CreateFirstFileRevisionOutput, FinishFileRevisionUploadOutput,
+    CreateFileRevisionOutput, CreateFirstFileRevisionOutput,
+    FinishFileRevisionUploadOutput,
 };
 use crate::web::{Bytes, FileDetails, ProvidedValue, Reference};
 use serde_json::Value as JsonValue;
@@ -67,6 +68,8 @@ pub struct UploadFileEdit {
 
 pub type UploadFileEditOutput = CreateFileRevisionOutput;
 
+pub type FinishUploadFileEdit = FinishUploadFile;
+
 #[derive(Deserialize, Debug, Clone)]
 pub struct GetFile<'a> {
     pub site_id: i64,

diff --git a/deepwell/src/services/file_revision/service.rs b/deepwell/src/services/file_revision/service.rs
@@ -24,7 +24,7 @@ use crate::models::file_revision::{
 };
 use crate::services::blob::{FinalizeBlobUploadOutput, EMPTY_BLOB_HASH, EMPTY_BLOB_MIME};
 use crate::services::{BlobService, OutdateService, PageService};
-use crate::web::FetchDirection;
+use crate::web::{Bytes, FetchDirection};
 use once_cell::sync::Lazy;
 use std::num::NonZeroI32;
 

diff --git a/deepwell/src/services/file_revision/structs.rs b/deepwell/src/services/file_revision/structs.rs
@@ -21,7 +21,7 @@
 use super::prelude::*;
 use crate::hash::BlobHash;
 use crate::services::page_revision::PageRevisionCountOutput;
-use crate::web::FetchDirection;
+use crate::web::{Bytes, FetchDirection};
 
 #[derive(Debug, Clone)]
 pub struct CreateFileRevision {
@@ -131,11 +131,11 @@ pub struct FinishFileRevisionUpload {
     pub pending_blob_id: i64,
 }
 
-#[derive(Serialize, Debug, Copy, Clone)]
+#[derive(Serialize, Debug, Clone)]
 pub struct FinishFileRevisionUploadOutput {
     pub file_id: i64,
     pub file_revision_id: i64,
-    pub s3_hash: Bytes,
+    pub s3_hash: Bytes<'static>,
     pub mime_hint: String,
     pub size_hint: i64,
     pub created: bool,