Do not check for self._downloader being None in several places
authorRicardo Garcia <sarbalap+freshmeat@gmail.com>
Thu, 22 Jul 2010 18:27:35 +0000 (20:27 +0200)
committerRicardo Garcia <sarbalap+freshmeat@gmail.com>
Sun, 31 Oct 2010 10:28:29 +0000 (11:28 +0100)
youtube-dl

index 49c07ae6209d010b109b1a25aad17d1b70037201..8c22081f86bf8ffde1efa436258b670a02399f16 100755 (executable)
@@ -1043,8 +1043,7 @@ class MetacafeIE(InfoExtractor):
                        return
 
                # At this point we have a new video
-               if self._downloader is not None:
-                       self._downloader.increment_downloads()
+               self._downloader.increment_downloads()
 
                simple_title = mobj.group(2).decode('utf-8')
                video_extension = 'flv'
@@ -1136,8 +1135,7 @@ class DailymotionIE(InfoExtractor):
                        return
 
                # At this point we have a new video
-               if self._downloader is not None:
-                       self._downloader.increment_downloads()
+               self._downloader.increment_downloads()
                video_id = mobj.group(1)
 
                simple_title = mobj.group(2).decode('utf-8')
@@ -1224,8 +1222,7 @@ class GoogleIE(InfoExtractor):
                        return
 
                # At this point we have a new video
-               if self._downloader is not None:
-                       self._downloader.increment_downloads()
+               self._downloader.increment_downloads()
                video_id = mobj.group(1)
 
                video_extension = 'mp4'
@@ -1335,8 +1332,7 @@ class PhotobucketIE(InfoExtractor):
                        return
 
                # At this point we have a new video
-               if self._downloader is not None:
-                       self._downloader.increment_downloads()
+               self._downloader.increment_downloads()
                video_id = mobj.group(1)
 
                video_extension = 'flv'
@@ -1420,8 +1416,7 @@ class YahooIE(InfoExtractor):
                        return
 
                # At this point we have a new video
-               if self._downloader is not None and new_video:
-                       self._downloader.increment_downloads()
+               self._downloader.increment_downloads()
                video_id = mobj.group(2)
                video_extension = 'flv'
 
@@ -1568,8 +1563,7 @@ class GenericIE(InfoExtractor):
 
        def _real_extract(self, url):
                # At this point we have a new video
-               if self._downloader is not None:
-                       self._downloader.increment_downloads()
+               self._downloader.increment_downloads()
 
                video_id = url.split('/')[-1]
                request = urllib2.Request(url)