From bcffe6a683560b89f5b40c8bcc883a38393e2b63 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 6 Mar 2022 12:42:59 +0000 Subject: [PATCH] if gallery path doesn't exists, show empty gallery --- fet2020/gallery/utils.py | 5 ++++- fet2020/gallery/views.py | 28 +++++++++++++++------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/fet2020/gallery/utils.py b/fet2020/gallery/utils.py index ce378274..466163df 100644 --- a/fet2020/gallery/utils.py +++ b/fet2020/gallery/utils.py @@ -47,7 +47,10 @@ def get_image_list(folder_name): def get_folder_list(): - return next(os.walk(settings.MEDIA_ROOT + "/" + gallery_path))[1] + if os.path.exists(settings.MEDIA_ROOT + "/" + gallery_path): + return next(os.walk(settings.MEDIA_ROOT + "/" + gallery_path))[1] + + return None def create_thumbs(folder_path): diff --git a/fet2020/gallery/views.py b/fet2020/gallery/views.py index d56276fd..155bec23 100644 --- a/fet2020/gallery/views.py +++ b/fet2020/gallery/views.py @@ -40,20 +40,22 @@ def index(request): album.status = Album.DRAFT if request.user.is_authenticated: - for folder in get_folder_list(): - if not Album.objects.filter(folder_name=folder): - album = Album( - title=folder, - slug=slugify(folder), - folder_name=folder, - event_date=None, - ) + folders = get_folder_list() + if folders: + for folder in folders: + if not Album.objects.filter(folder_name=folder): + album = Album( + title=folder, + slug=slugify(folder), + folder_name=folder, + event_date=None, + ) - img_list = get_image_list(album.folder_name) - if img_list: - value = randint(0, len(img_list) - 1) - album.thumbnail = img_list[value]["thumb_url"] - albums.append(album) + img_list = get_image_list(album.folder_name) + if img_list: + value = randint(0, len(img_list) - 1) + album.thumbnail = img_list[value]["thumb_url"] + albums.append(album) context = { "albums": albums,