WIP refactor resource

Author: joepio

browser/data-browser/src/routes/NewResource/NewRoute.tsx

@@ -52,8 +52,8 @@ function NewResourceSelector() {
     (files: string[]) => {
       toast.success(`Uploaded ${files.length} files.`);
 
-      if (parentSubject) {
-        navigate(constructOpenURL(parentSubject));
+      if (calculatedParent) {
+        navigate(constructOpenURL(calculatedParent));
       }
     },
     [parentSubject, navigate],
@@ -64,10 +64,10 @@ function NewResourceSelector() {
       <StyledForm>
         <h1>
           Create new resource{' '}
-          {parentSubject && (
+          {calculatedParent && (
             <>
               {`under `}
-              <ResourceInline subject={parentSubject} />
+              <ResourceInline subject={calculatedParent} />
             </>
           )}
         </h1>

lib/src/db.rs

@@ -454,9 +454,13 @@ impl Storelike for Db {
         for_agent: &ForAgent,
     ) -> AtomicResult<Resource> {
         let url_span = tracing::span!(tracing::Level::TRACE, "URL parse").entered();
+
+        println!("subject: {subject}");
+
         // This might add a trailing slash
         let url = url::Url::parse(subject)?;
 
+        println!("url: {url}");
         let mut removed_query_params = {
             let mut url_altered = url.clone();
             url_altered.set_query(None);

lib/src/resources.rs

@@ -414,7 +414,7 @@ impl Resource {
         property_url: String,
         value: &str,
         store: &impl Storelike,
-    ) -> AtomicResult<()> {
+    ) -> AtomicResult<&mut Self> {
         let fullprop = store.get_property(&property_url).map_err(|e| {
             format!(
                 "Failed setting propval for '{}' because property '{}' could not be found. {}",
@@ -425,7 +425,7 @@ impl Resource {
         })?;
         let val = Value::new(value, &fullprop.data_type)?;
         self.set_propval_unsafe(property_url, val);
-        Ok(())
+        Ok(self)
     }
 
     /// Inserts a Property/Value combination.
@@ -507,9 +507,10 @@ impl Resource {
     /// Changes the subject of the Resource.
     /// Does not 'move' the Resource
     /// See https://github.com/atomicdata-dev/atomic-server/issues/44
-    pub fn set_subject(&mut self, url: String) {
+    pub fn set_subject(&mut self, url: String) -> &mut Self {
         self.commit.set_subject(url.clone());
         self.subject = url;
+        self
     }
 
     /// Converts Resource to JSON-AD string.

lib/src/storelike.rs

@@ -204,14 +204,14 @@ pub trait Storelike: Sized {
     fn handle_not_found(
         &self,
         subject: &str,
-        error: AtomicError,
+        _error: AtomicError,
         for_agent: Option<&Agent>,
     ) -> AtomicResult<Resource> {
         if let Some(self_url) = self.get_self_url() {
             if subject.starts_with(&self_url) {
                 return Err(AtomicError::not_found(format!(
-                    "Failed to retrieve locally: '{}'. {}",
-                    subject, error
+                    "Failed to retrieve locally: '{}'",
+                    subject
                 )));
             }
         }

server/src/handlers/upload.rs

@@ -80,17 +80,18 @@ pub async fn upload_handler(
         let download_url = format!("{}/download/{}", store.get_server_url(), subject_path);
 
         let mut resource = atomic_lib::Resource::new_instance(urls::FILE, store)?;
-        resource.set_subject(new_subject);
-        resource.set_propval_string(urls::PARENT.into(), &query.parent, store)?;
-        resource.set_propval_string(urls::INTERNAL_ID.into(), &file_id, store)?;
-        resource.set_propval(urls::FILESIZE.into(), Value::Integer(byte_count), store)?;
-        resource.set_propval_string(
-            urls::MIMETYPE.into(),
-            &guess_mime_for_filename(filename),
-            store,
-        )?;
-        resource.set_propval_string(urls::FILENAME.into(), filename, store)?;
-        resource.set_propval_string(urls::DOWNLOAD_URL.into(), &download_url, store)?;
+        resource
+            .set_subject(new_subject)
+            .set_propval_string(urls::PARENT.into(), &query.parent, store)?
+            .set_propval_string(urls::INTERNAL_ID.into(), &file_id, store)?
+            .set_propval(urls::FILESIZE.into(), Value::Integer(byte_count), store)?
+            .set_propval_string(
+                urls::MIMETYPE.into(),
+                &guess_mime_for_filename(filename),
+                store,
+            )?
+            .set_propval_string(urls::FILENAME.into(), filename, store)?
+            .set_propval_string(urls::DOWNLOAD_URL.into(), &download_url, store)?;
         commit_responses.push(resource.save(store)?);
         created_resources.push(resource);
     }