Finalize simple migration

* Maintain relationships when migrating
* Transfer LDP-NRs and related metadata

lakesuperior/migrator.py

@@ -208,19 +208,19 @@ class Migrator:
             bin_resp = requests.get('{}/fcr:content'.format(uri))
             bin_resp.raise_for_status()
             data = bin_resp.content
+            provided_imr = gr.resource(URIRef(iuri))
             mimetype = bin_resp.headers.get('content-type')
+            self.rsrc_api.create_or_replace(
+                    uid, mimetype=mimetype, provided_imr=provided_imr,
+                    stream=BytesIO(data))
         else:
             mimetype = 'text/turtle'
-
-        # Store the resource, so when we recurse, a resource referring back
-        # to this resource will skip it as already existing and avoid an
-        # infinite loop.
-        # @TODO This can be improved by creating a resource API method for
-        # creating a resource from an RDFLib graph. Here we had to deserialize
-        # the RDF data to gather information but have to pass the original
-        # serialized stream, which has to be deserialized again in the model.
-        self.rsrc_api.create_or_replace(
-                uid, mimetype=mimetype, stream=BytesIO(data))
+            # @TODO This can be improved by creating a resource API method for
+            # creating a resource from an RDFLib graph. Here we had to deserialize
+            # the RDF data to gather information but have to pass the original
+            # serialized stream, which has to be deserialized again in the model.
+            self.rsrc_api.create_or_replace(
+                    uid, mimetype=mimetype, stream=BytesIO(data))
 
         self._ct += 1
         if self._ct % 10 ==0:
@@ -233,7 +233,7 @@ class Migrator:
             if (
                     isinstance(obj, URIRef)
                     and obj.startswith(iuri)
-                    and not self.rsrc_api.exists(uid) # Avoid ∞
+                    and not self.rsrc_api.exists(uid) # Avoid ∞ loop
                     and pred not in self.ignored_preds):
                 self._crawl(uid)
 

lakesuperior/model/ldp_factory.py

@@ -78,7 +78,7 @@ class LdpFactory:
 
 
     @staticmethod
-    def from_provided(uid, mimetype, stream=None, **kwargs):
+    def from_provided(uid, mimetype, stream=None, provided_imr=None, **kwargs):
         '''
         Determine LDP type from request content.
 
@@ -90,6 +90,7 @@ class LdpFactory:
         @param **kwargs Arguments passed to the LDP class constructor.
         '''
         uri = nsc['fcres'][uid]
+        disable_checks = rdfly.config.get('disable_checks', False)
 
         if not stream:
             # Create empty LDPC.
@@ -117,22 +118,26 @@ class LdpFactory:
 
             inst = cls(uid, provided_imr=provided_imr, **kwargs)
 
-            # Make sure we are not updating an LDP-RS with an LDP-NR.
-            if inst.is_stored and LDP_NR_TYPE in inst.ldp_types:
-                raise IncompatibleLdpTypeError(uid, mimetype)
+            if not disable_checks:
+                # Make sure we are not updating an LDP-RS with an LDP-NR.
+                if inst.is_stored and LDP_NR_TYPE in inst.ldp_types:
+                    raise IncompatibleLdpTypeError(uid, mimetype)
 
-            if kwargs.get('handling', 'strict') != 'none':
-                inst._check_mgd_terms(inst.provided_imr.graph)
+                if kwargs.get('handling', 'strict') != 'none':
+                    inst._check_mgd_terms(inst.provided_imr.graph)
 
         else:
             # Create a LDP-NR and equip it with the binary file provided.
-            provided_imr = Resource(Graph(), uri)
+            # The IMR can also be provided for additional metadata.
+            if not provided_imr:
+                provided_imr = Resource(Graph(), uri)
             inst = LdpNr(uid, stream=stream, mimetype=mimetype,
                     provided_imr=provided_imr, **kwargs)
 
-            # Make sure we are not updating an LDP-NR with an LDP-RS.
-            if inst.is_stored and LDP_RS_TYPE in inst.ldp_types:
-                raise IncompatibleLdpTypeError(uid, mimetype)
+            if not disable_checks:
+                # Make sure we are not updating an LDP-NR with an LDP-RS.
+                if inst.is_stored and LDP_RS_TYPE in inst.ldp_types:
+                    raise IncompatibleLdpTypeError(uid, mimetype)
 
         logger.info('Creating resource of type: {}'.format(
                 inst.__class__.__name__))

lakesuperior/model/ldpr.py

@@ -368,8 +368,11 @@ class Ldpr(metaclass=ABCMeta):
                     set(self.provided_imr.graph)
                     | self._containment_rel(create))
         else:
-            remove_trp = set()
-            add_trp = self.provided_imr.graph
+            try:
+                remove_trp = set(self.imr.graph)
+            except ResourceNotExistsError:
+                remove_trp = set()
+            add_trp = set(self.provided_imr.graph)
             ev_type = None
 
         self._modify_rsrc(ev_type, remove_trp, add_trp)