diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be2933..05b7a09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are: The versions coincide with releases on pip. ## [0.0.x](https://github.com/rseng/rse/tree/master) (0.0.x) + - allow custom import for csv and google-sheet (0.0.47) - support for csv import (0.0.46) - ensure Google scraper skips malformed rows, etc (0.0.45) - Logging bugs and adding export/import docs (0.0.44) diff --git a/rse/main/scrapers/csv.py b/rse/main/scrapers/csv.py index ba1deba..ee74f54 100644 --- a/rse/main/scrapers/csv.py +++ b/rse/main/scrapers/csv.py @@ -107,19 +107,11 @@ def create(self, database=None, config_file=None, update=False): uid = result["url"].split("//")[-1] # If a repository is added that isn't represented - try: - repo = get_parser(uid) - data = repo.get_metadata() - - # Empty or malformed repository - if not data: - bot.warning(f"Skipping malformed entry {uid}") - continue - result = update_nonempty(result, data) - - # Or as custom entry - except NotImplementedError: - # Base UID based on title + repo = get_parser(uid) + data = repo.get_metadata() or {} + + # Empty or malformed repository + if not data and repo.name == "custom": repo = CustomParser(result["title"]) repo.set_metadata( title=result["title"], @@ -127,6 +119,11 @@ def create(self, database=None, config_file=None, update=False): description=result["description"], ) + elif not data: + bot.warning(f"Skipping malformed entry {uid}") + continue + result = update_nonempty(result, data) + # Add results that don't exist exists = client.exists(repo.uid) if not exists: diff --git a/rse/version.py b/rse/version.py index 3672cd6..cf87527 100644 --- a/rse/version.py +++ b/rse/version.py @@ -9,7 +9,7 @@ """ -__version__ = "0.0.46" +__version__ = "0.0.47" AUTHOR = "Vanessa Sochat" AUTHOR_EMAIL = "vsoch@users.noreply.github.io" NAME = "rse"