فهرست منبع

Remove video_result helper method

Calling it was more complex then actually including the type in the video info
Philipp Hagemeister 12 سال پیش
والد
کامیت
690e872c51
3فایلهای تغییر یافته به همراه4 افزوده شده و 7 حذف شده
  1. 2 1
      youtube_dl/extractor/archiveorg.py
  2. 0 5
      youtube_dl/extractor/common.py
  3. 2 1
      youtube_dl/extractor/dreisat.py

+ 2 - 1
youtube_dl/extractor/archiveorg.py

@@ -48,6 +48,7 @@ class ArchiveOrgIE(InfoExtractor):
         formats.sort(key=lambda fdata: fdata['file_size'])
         formats.sort(key=lambda fdata: fdata['file_size'])
 
 
         info = {
         info = {
+            '_type': 'video',
             'id': video_id,
             'id': video_id,
             'title': title,
             'title': title,
             'formats': formats,
             'formats': formats,
@@ -63,4 +64,4 @@ class ArchiveOrgIE(InfoExtractor):
         info['url'] = formats[-1]['url']
         info['url'] = formats[-1]['url']
         info['ext'] = determine_ext(formats[-1]['url'])
         info['ext'] = determine_ext(formats[-1]['url'])
 
 
-        return self.video_result(info)
+        return info

+ 0 - 5
youtube_dl/extractor/common.py

@@ -169,11 +169,6 @@ class InfoExtractor(object):
         self.to_screen(u'Logging in')
         self.to_screen(u'Logging in')
 
 
     #Methods for following #608
     #Methods for following #608
-    #They set the correct value of the '_type' key
-    def video_result(self, video_info):
-        """Returns a video"""
-        video_info['_type'] = 'video'
-        return video_info
     def url_result(self, url, ie=None):
     def url_result(self, url, ie=None):
         """Returns a url that points to a page that should be processed"""
         """Returns a url that points to a page that should be processed"""
         #TODO: ie should be the class used for getting the info
         #TODO: ie should be the class used for getting the info

+ 2 - 1
youtube_dl/extractor/dreisat.py

@@ -67,6 +67,7 @@ class DreiSatIE(InfoExtractor):
         formats.sort(key=_sortkey)
         formats.sort(key=_sortkey)
 
 
         info = {
         info = {
+            '_type': 'video',
             'id': video_id,
             'id': video_id,
             'title': video_title,
             'title': video_title,
             'formats': formats,
             'formats': formats,
@@ -81,4 +82,4 @@ class DreiSatIE(InfoExtractor):
         info['url'] = formats[-1]['url']
         info['url'] = formats[-1]['url']
         info['ext'] = determine_ext(formats[-1]['url'])
         info['ext'] = determine_ext(formats[-1]['url'])
 
 
-        return self.video_result(info)
+        return info