diff --git a/bookwyrm/importers/calibre_import.py b/bookwyrm/importers/calibre_import.py index b9eb3da7d..7395e2f7b 100644 --- a/bookwyrm/importers/calibre_import.py +++ b/bookwyrm/importers/calibre_import.py @@ -15,8 +15,8 @@ class CalibreImporter(Importer): row_mappings_guesses = [] for field, mapping in self.row_mappings_guesses: - if field in ('date_added',): - row_mappings_guesses.append((field, mapping + ['timestamp'])) + if field in ("date_added",): + row_mappings_guesses.append((field, mapping + ["timestamp"])) else: row_mappings_guesses.append((field, mapping)) diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 7ebac0e19..556f133f9 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -175,7 +175,10 @@ class ImportItem(models.Model): def date_added(self): """when the book was added to this dataset""" if self.normalized_data.get("date_added"): - parsed_date_added = dateutil.parser.parse(self.normalized_data.get("date_added")) + parsed_date_added = dateutil.parser.parse( + self.normalized_data.get("date_added") + ) + if timezone.is_aware(parsed_date_added): # Keep timezone if import already had one return parsed_date_added