From 5a7f7287160560f5b84c56eda65f1aef7af35867 Mon Sep 17 00:00:00 2001 From: Colin Lee Date: Fri, 18 Jan 2019 16:04:56 -0600 Subject: [PATCH] Handle blocklists without a type set --- shavar/views/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/shavar/views/__init__.py b/shavar/views/__init__.py index edc23bb..9572cf6 100644 --- a/shavar/views/__init__.py +++ b/shavar/views/__init__.py @@ -112,7 +112,14 @@ def downloads_view(request): % list_info.name) annotate_request(request, "shavar.downloads.unknown.list", 1) continue - provider, type_, format_ = list_info.name.split('-', 2) + if len(list_info.name.split('-', 2)) == 3: + provider, type_, format_ = list_info.name.split('-', 2) + else: + provider, format_ = list_info.name.split('-', 1) + try: + type_ + except NameError: + type_ = "none" if not provider or not type_ or not format_: s = 'Unknown list format for "%s"; ignoring' % list_info.name logger.error(s)