diff --git a/PKG-INFO b/PKG-INFO index da7ca93abd90b68293d66357fbe4da903f1ad35b..1b74163f22a267359d5ba067d4a1628e1ad627a0 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: swh.deposit -Version: 0.0.50 +Version: 0.0.51 Summary: Software Heritage Deposit Server Home-page: https://forge.softwareheritage.org/source/swh-deposit/ Author: Software Heritage developers diff --git a/debian/control b/debian/control index 9e5a868e7d1c54fa7956aa7588fd398ddd1b8124..4d986c114e1bf74078b55992bc702b35e99229fe 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Build-Depends: debhelper (>= 9), python3-vcversioner, python3-swh.core (>= 0.0.36~), python3-swh.model (>= 0.0.21~), - python3-swh.loader.core (>= 0.0.30~), - python3-swh.loader.tar (>= 0.0.34~), + python3-swh.loader.core (>= 0.0.32~), + python3-swh.loader.tar (>= 0.0.35~), python3-swh.scheduler (>= 0.0.19~), python3-django, python3-click, @@ -49,8 +49,8 @@ Architecture: all Depends: python3-swh.deposit.client (= ${binary:Version}), python3-swh.core (>= 0.0.36~), python3-swh.model (>= 0.0.21~), - python3-swh.loader.core (>= 0.0.30~), - python3-swh.loader.tar (>= 0.0.34~), + python3-swh.loader.core (>= 0.0.32~), + python3-swh.loader.tar (>= 0.0.35~), python3-swh.scheduler (>= 0.0.19~), ${misc:Depends}, ${python3:Depends} Description: Software Heritage Deposit Loader diff --git a/requirements-swh.txt b/requirements-swh.txt index e141980de1f06233ef178cb5ed9e2019ef055c25..4a51cbcf6d60bbadd8dcea5ec86f0a3ae3fce489 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core >= 0.0.36 -swh.loader.tar >= 0.0.34 -swh.loader.core >= 0.0.30 +swh.loader.tar >= 0.0.35 +swh.loader.core >= 0.0.32 swh.scheduler >= 0.0.19 swh.model >= 0.0.21 diff --git a/swh.deposit.egg-info/PKG-INFO b/swh.deposit.egg-info/PKG-INFO index da7ca93abd90b68293d66357fbe4da903f1ad35b..1b74163f22a267359d5ba067d4a1628e1ad627a0 100644 --- a/swh.deposit.egg-info/PKG-INFO +++ b/swh.deposit.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: swh.deposit -Version: 0.0.50 +Version: 0.0.51 Summary: Software Heritage Deposit Server Home-page: https://forge.softwareheritage.org/source/swh-deposit/ Author: Software Heritage developers diff --git a/swh.deposit.egg-info/requires.txt b/swh.deposit.egg-info/requires.txt index c3cf6f231ce9a6f02bec2a739a5e193f3a5e5a56..dcc067a0efd86a52d40b87902d5fd9ef2f82d89a 100644 --- a/swh.deposit.egg-info/requires.txt +++ b/swh.deposit.egg-info/requires.txt @@ -4,8 +4,8 @@ djangorestframework djangorestframework-xml lxml swh.core>=0.0.36 -swh.loader.core>=0.0.30 -swh.loader.tar>=0.0.34 +swh.loader.core>=0.0.32 +swh.loader.tar>=0.0.35 swh.model>=0.0.21 swh.scheduler>=0.0.19 vcversioner diff --git a/swh/deposit/loader/loader.py b/swh/deposit/loader/loader.py index 3763a2e14460c82611284514a86346fb7605c6d1..5e1601b23a5d0c7cf95c8b6366a03af7a7b0118c 100644 --- a/swh/deposit/loader/loader.py +++ b/swh/deposit/loader/loader.py @@ -3,7 +3,6 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information -import datetime import os import tempfile @@ -48,6 +47,12 @@ class DepositLoader(loader.TarLoader): deposit_meta_url=deposit_meta_url, deposit_update_url=deposit_update_url) + def prepare_origin_visit(self, *, deposit_meta_url, **kwargs): + self.metadata = self.client.metadata_get( + deposit_meta_url, log=self.log) + self.origin = self.metadata['origin'] + self.visit_date = None + def prepare(self, *, archive_url, deposit_meta_url, deposit_update_url): """Prepare the loading by first retrieving the deposit's raw archive content. @@ -62,18 +67,14 @@ class DepositLoader(loader.TarLoader): archive = self.client.archive_get( archive_url, archive_path, log=self.log) - metadata = self.client.metadata_get( - deposit_meta_url, log=self.log) - origin = metadata['origin'] - visit_date = datetime.datetime.now(tz=datetime.timezone.utc) + metadata = self.metadata revision = metadata['revision'] branch_name = metadata['branch_name'] self.origin_metadata = metadata['origin_metadata'] self.prepare_metadata() super().prepare(tar_path=archive, - origin=origin, - visit_date=visit_date, + origin=self.origin, revision=revision, branch_name=branch_name) diff --git a/version.txt b/version.txt index 23f6a1c0dce5965abfcece9c1654880c74c2de29..f548cb09a648eb2812930fda7f77456f07ec2fc7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.50-0-gcd80d1c \ No newline at end of file +v0.0.51-0-g735b248 \ No newline at end of file