From c358dad2d1185a632abd2474ec6332ab7298ac0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Fri, 20 Jun 2014 19:14:38 +0200 Subject: [PATCH] [Web] Check for None URL in Youtube/Flickr parsing --- mygpo/data/flickr.py | 2 ++ mygpo/data/youtube.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/mygpo/data/flickr.py b/mygpo/data/flickr.py index 9506b005..11cbce40 100644 --- a/mygpo/data/flickr.py +++ b/mygpo/data/flickr.py @@ -49,6 +49,8 @@ def get_photo_id(url): def is_flickr_image(url): + if url is None: + return False return re.search('flickr\.com.*\.(jpg|jpeg|png|gif)', url) def get_display_photo(url, label='Medium'): diff --git a/mygpo/data/youtube.py b/mygpo/data/youtube.py index 6fd25e31..2efbcf72 100644 --- a/mygpo/data/youtube.py +++ b/mygpo/data/youtube.py @@ -26,6 +26,9 @@ def is_video_link(url): return (get_youtube_id(url) is not None) def get_youtube_id(url): + if url is None: + return None + r = re.compile('http://(?:[a-z]+\.)?youtube\.com/v/(.*)\.swf', re.IGNORECASE).match(url) if r is not None: return r.group(1) -- 2.11.4.GIT