Add s3 to DESY spider instead of FTP #284
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michamos
reviewed
Sep 7, 2020
hepcrawl/spiders/desy_spider.py
Outdated
| self.logger.error("Cannot connect to s3.", exc) | ||
| raise | ||
| return connections | ||
| def get_s3_url_for_key(self, key, bucket=None, expire=86400): |
There was a problem hiding this comment.
actually it looks like this method is not used at all. Could you check?
There was a problem hiding this comment.
Yeah, you are right. It's leftover from processing additional files I did at first.
| ) | ||
| def crawl_s3_bucket(self): | ||
| input_bucket = self.s3_resource.Bucket(self.s3_input_bucket) | ||
| existing_files = os.listdir(self.destination_folder) |
There was a problem hiding this comment.
I would forget about the local files handling, it's not needed if you move the source files to a different bucket.
There was a problem hiding this comment.
I would prefer to leave local part of spider intact, as it's not part of this task.
hepcrawl/spiders/desy_spider.py
Outdated
| url=response.url | ||
| ) | ||
| self.logger.info('Got %d hep records' % len(parsed_items)) | ||
|
|
||
| if self.s3_enabled: | ||
| s3_file = response.meta['s3_file'] | ||
| self.logger.info("Moving {file} to {processed} bucket and deleting {file} from {incoming} bucket.".format( |
There was a problem hiding this comment.
Suggested change
| self.logger.info("Moving {file} to {processed} bucket and deleting {file} from {incoming} bucket.".format( | |
| self.logger.info("Moving {file} from {incoming} bucket to {processed} bucket.".format( |
pazembrz
force-pushed
the
#1243-add-s3-support--to-desy-spider
branch
from
dc669ea to
adaaed8
Compare
pazembrz
force-pushed
the
#1243-add-s3-support--to-desy-spider
branch
from
adaaed8 to
6c78cd2
Compare
michamos
approved these changes
Sep 9, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently all additional files for record are intentionally ignored. (After discussion with Micha)
ref:inspirehep/inspirehep#1245