diff --git a/debian/control b/debian/control index 5fe4dc6..0de36fe 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,22 @@ Source: swh-loader-tar Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-nose, python3-setuptools, python3-swh.core (>= 0.0.14~), python3-swh.scheduler, - python3-swh.storage (>= 0.0.31~), - python3-swh.loader.dir (>= 0.0.22~), + python3-swh.storage (>= 0.0.76~), + python3-swh.loader.dir (>= 0.0.23~), python3-vcversioner Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DLDTAR/ Package: python3-swh.loader.tar Architecture: all Depends: ${misc:Depends}, ${python3:Depends} Description: Software Heritage Tarball Loader diff --git a/requirements.txt b/requirements.txt index cfc0175..bd9617b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ # Add here external Python modules dependencies, one per line. Module names # should match https://pypi.python.org/pypi names. For the full spec or # dependency lines, see https://pip.readthedocs.org/en/1.1/requirements.html vcversioner swh.core >= 0.0.14 swh.scheduler -swh.storage >= 0.0.31 -swh.loader.dir >= 0.0.22 +swh.storage >= 0.0.76 +swh.loader.dir >= 0.0.23 retrying diff --git a/swh/loader/tar/loader.py b/swh/loader/tar/loader.py index 9ef1376..88a9f9b 100644 --- a/swh/loader/tar/loader.py +++ b/swh/loader/tar/loader.py @@ -1,130 +1,130 @@ # Copyright (C) 2015-2016 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # 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 import shutil from swh.core import hashutil from swh.loader.dir import loader from swh.loader.tar import tarball, utils class TarLoader(loader.DirLoader): """A tarball loader. """ - CONFIG_BASE_FILENAME = 'loader/tar.ini' + CONFIG_BASE_FILENAME = 'loader/tar' ADDITIONAL_CONFIG = { 'extraction_dir': ('string', '/tmp') } def __init__(self): super().__init__(logging_class='swh.loader.tar.TarLoader') def load(self, tarpath, origin, visit, revision, release, occurrences): """ Load a tarball in backend. This will: - uncompress locally the tarballs in a temporary location - process the content of the tarballs to persist on swh storage - clean up the temporary location - write an entry in fetch_history to mark the loading tarball end Args: - tarpath: path to the tarball to uncompress - origin: Dictionary origin - url: url origin we fetched - type: type of the origin - visit: Numbered visit - revision: Dictionary of information needed, keys are: - author_name: revision's author name - author_email: revision's author email - author_date: timestamp (e.g. 1444054085) - author_offset: date offset e.g. -0220, +0100 - committer_name: revision's committer name - committer_email: revision's committer email - committer_date: timestamp - committer_offset: date offset e.g. -0220, +0100 - type: type of revision dir, tar - message: synthetic message for the revision - release: Dictionary of information needed, keys are: - name: release name - date: release timestamp (e.g. 1444054085) - offset: release date offset e.g. -0220, +0100 - author_name: release author's name - author_email: release author's email - comment: release's comment message - occurrences: List of occurrence dictionary. Information needed, keys are: - branch: occurrence's branch name - authority_id: authority id (e.g. 1 for swh) - validity: validity date (e.g. 2015-01-01 00:00:00+00) """ # Prepare the extraction path extraction_dir = self.config['extraction_dir'] os.makedirs(extraction_dir, 0o755, exist_ok=True) dir_path = tempfile.mkdtemp(prefix='swh.loader.tar-', dir=extraction_dir) # add checksums in revision artifact = utils.convert_to_hex(hashutil.hashfile(tarpath)) artifact['name'] = os.path.basename(tarpath) try: self.log.info('Uncompress %s to %s' % (tarpath, dir_path)) nature = tarball.uncompress(tarpath, dir_path) artifact['archive_type'] = nature artifact['length'] = os.path.getsize(tarpath) revision['metadata'] = { 'original_artifact': [artifact], } return super().load( dir_path, origin, visit, revision, release, occurrences) finally: shutil.rmtree(dir_path) def prepare_and_load(self, tarpath, origin, revision, release, occurrences): """ Prepare origin, fetch_origin, origin_visit Then load a tarball 'tarpath'. Then close origin_visit, fetch_history First: - creates an origin if it does not exist - creates a fetch_history entry - creates an origin_visit - Then loads the tarball """ if 'type' not in origin: # let the type flow if present origin['type'] = 'tar' self.origin_id = self.storage.origin_add_one(origin) origin['id'] = self.origin_id date_visit = datetime.datetime.now(tz=datetime.timezone.utc) origin_visit = self.storage.origin_visit_add(origin['id'], date_visit) visit = origin_visit['visit'] fetch_history_id = self.open_fetch_history() try: self.load(tarpath, origin, visit, revision, release, occurrences) self.close_fetch_history_success(fetch_history_id) self.storage.origin_visit_update( self.origin_id, origin_visit['visit'], status='full') except: self.close_fetch_history_failure(fetch_history_id) self.storage.origin_visit_update( self.origin_id, origin_visit['visit'], status='partial') raise