R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FranceInter update : merge to similar functions on utils

Browse Source
This commit is contained in:
renalid 2016-09-04 00:00:44 +02:00
parent 5db1a3a73f
commit d330e57c2c
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/franceinter.py
View File

@ -4,7 +4,7 @@ from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
unified_timestamp, unified_timestamp,
month_by_french_name, month_by_name,
) )
@ -37,7 +37,7 @@ class FranceInterIE(InfoExtractor):
extractdate = self._search_regex('(\d{2}-([a-zA-Z\s]+)-\d{4}$)', url, 'extractdate', fatal=False) extractdate = self._search_regex('(\d{2}-([a-zA-Z\s]+)-\d{4}$)', url, 'extractdate', fatal=False)
extractdate = extractdate.split('-') extractdate = extractdate.split('-')
extractdate = extractdate[2] + "," + str(month_by_french_name(extractdate[1])) + "," + extractdate[0] extractdate = extractdate[2] + "," + str(month_by_name(extractdate[1],'fr')) + "," + extractdate[0]
timestamp = unified_timestamp(extractdate) timestamp = unified_timestamp(extractdate)

16
youtube_dl/utils.py
View File

@ -93,7 +93,7 @@ ENGLISH_MONTH_NAMES = [
FRENCH_MONTH_NAMES = [ FRENCH_MONTH_NAMES = [
'janvier', 'fevrier', 'mars', 'avril', 'mai', 'juin', 'janvier', 'fevrier', 'mars', 'avril', 'mai', 'juin',
'juillet', 'août', 'septembre', 'octobre', 'novembre', 'decembre'] 'juillet', 'aout', 'septembre', 'octobre', 'novembre', 'decembre']
KNOWN_EXTENSIONS = ( KNOWN_EXTENSIONS = (
'mp4', 'm4a', 'm4p', 'm4b', 'm4r', 'm4v', 'aac', 'mp4', 'm4a', 'm4p', 'm4b', 'm4r', 'm4v', 'aac',
@ -1591,20 +1591,16 @@ def parse_count(s):
return lookup_unit_table(_UNIT_TABLE, s) return lookup_unit_table(_UNIT_TABLE, s)
def month_by_name(name): def month_by_name(name, lang='en'):
""" Return the number of a month by (locale-independently) English name """ """ Return the number of a month by (locale-independently) English name """
try: name_list = ENGLISH_MONTH_NAMES
return ENGLISH_MONTH_NAMES.index(name) + 1
except ValueError:
return None
if lang == 'fr':
def month_by_french_name(name): name_list = FRENCH_MONTH_NAMES
""" Return the number of a month by French name """
try: try:
return FRENCH_MONTH_NAMES.index(name) + 1 return name_list.index(name) + 1
except ValueError: except ValueError:
return None return None