Rebased

Author: joepio

lib/src/db.rs

@@ -14,11 +14,10 @@ use std::{
 };
 
 use tracing::instrument;
-use url::Url;
 
 use crate::{
-    atoms::IndexAtom,
     atomic_url::AtomicUrl,
+    atoms::IndexAtom,
     commit::CommitResponse,
     db::val_prop_sub_index::find_in_val_prop_sub_index,
     endpoints::{default_endpoints, Endpoint},
@@ -102,7 +101,7 @@ impl Db {
             reference_index,
             query_index,
             prop_val_sub_index,
-            server_url,
+            server_url: AtomicUrl::try_from(server_url)?,
             watched_queries,
             endpoints: default_endpoints(),
             on_commit: None,
@@ -191,15 +190,17 @@ impl Db {
     }
 
     fn map_sled_item_to_resource(
-        &self,
         item: Result<(sled::IVec, sled::IVec), sled::Error>,
         self_url: String,
         include_external: bool,
     ) -> Option<Resource> {
         let (subject, resource_bin) = item.expect(DB_CORRUPT_MSG);
         let subject: String = String::from_utf8_lossy(&subject).to_string();
 
-        if !include_external && self.is_external_subject(&subject).ok()? {
+        // if !include_external && self.is_external_subject(&subject).ok()? {
+        //     return None;
+        // }
+        if !include_external && !subject.starts_with(&self_url) {
             return None;
         }
 
@@ -517,10 +518,11 @@ impl Storelike for Db {
     ) -> Box<dyn std::iter::Iterator<Item = Resource>> {
         let self_url = self
             .get_self_url()
-            .expect("No self URL set, is required in DB");
+            .expect("No self URL set, is required in DB")
+            .to_string();
 
         let result = self.resources.into_iter().filter_map(move |item| {
-            Db::map_sled_item_to_resource(self, item, self_url.to_string(), include_external)
+            Db::map_sled_item_to_resource(item, self_url.clone(), include_external)
         });
 
         Box::new(result)

lib/src/db/test.rs

@@ -1,4 +1,4 @@
-use crate::{urls, Value};
+use crate::{atomic_url::Routes, urls, Value};
 
 use super::*;
 use ntest::timeout;

lib/src/store.rs

@@ -2,14 +2,9 @@
 //! This provides many methods for finding, changing, serializing and parsing Atomic Data.
 
 use crate::storelike::QueryResult;
-use crate::Value;
-use crate::{atoms::Atom, storelike::Storelike};
-use crate::{
-    atomic_url::AtomicUrl,
-    atoms::Atom,
-    storelike::{ResourceCollection, Storelike},
-};
+use crate::{atomic_url::AtomicUrl, storelike::Storelike};
 use crate::{errors::AtomicResult, Resource};
+use crate::{Atom, Value};
 use std::{collections::HashMap, sync::Arc, sync::Mutex};
 
 /// The in-memory store of data, containing the Resources, Properties and Classes

server/app_assets/dist/index.js

@@ -4,11 +4,12 @@ use actix_web::cookie::Cookie;
 use actix_web::http::header::{HeaderMap, HeaderValue};
 use actix_web::http::Uri;
 use atomic_lib::authentication::AuthValues;
+use atomic_lib::Storelike;
 use percent_encoding::percent_decode_str;
 use std::str::FromStr;
 
 use crate::errors::{AppErrorType, AtomicServerError};
-use crate::{appstate::AppState, content_types::ContentType, errors::AtomicServerResult};
+use crate::{appstate::AppState, errors::AtomicServerResult};
 
 /// Returns the authentication headers from the request
 #[tracing::instrument(skip_all)]
@@ -140,24 +141,6 @@ pub fn get_client_agent(
     Ok(Some(for_agent))
 }
 
-/// Finds the extension
-pub fn try_extension(path: &str) -> Option<(ContentType, &str)> {
-    let items: Vec<&str> = path.split('.').collect();
-    if items.len() == 2 {
-        let path = items[0];
-        let content_type = match items[1] {
-            "json" => ContentType::Json,
-            "jsonld" => ContentType::JsonLd,
-            "jsonad" => ContentType::JsonAd,
-            "html" => ContentType::Html,
-            "ttl" => ContentType::Turtle,
-            _ => return None,
-        };
-        return Some((content_type, path));
-    }
-    None
-}
-
 fn session_cookie_from_header(header: &HeaderValue) -> Option<String> {
     let cookies: Vec<&str> = header.to_str().ok()?.split(';').collect();
 

server/app_assets/dist/index.js.map

@@ -114,6 +114,7 @@ pub fn get_schema_fields(appstate: &SearchState) -> AtomicServerResult<Fields> {
 }
 
 /// Indexes all resources from the store to search.
+/// Skips Commits.
 /// At this moment does not remove existing index.
 pub fn add_all_resources(search_state: &SearchState, store: &Db) -> AtomicServerResult<()> {
     let resources = store