diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-11-11 06:22:10 -0800 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-11-11 06:22:10 -0800 |
| commit | 0526e4f55a822cb629ca06bb02d695eac2ef4a60 (patch) | |
| tree | d622a697c5e9792de77b2a1022b14fc4cf18a936 | |
| parent | 5d40a470a2c62f33de54f14a04dfab997e6503fe (diff) | |
| parent | 39973a023687e9492e3ecde64f4d1c48b098319d (diff) | |
| download | youtube-dl-0526e4f55a822cb629ca06bb02d695eac2ef4a60.tar.xz | |
Merge pull request #522 from art-zhitnik/master
--(match|reject)-title utf8 fix
| -rw-r--r-- | youtube_dl/FileDownloader.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index ed5a79f13..4449fe711 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -333,11 +333,15 @@ class FileDownloader(object): title = info_dict['title'] matchtitle = self.params.get('matchtitle', False) - if matchtitle and not re.search(matchtitle, title, re.IGNORECASE): - return u'[download] "' + title + '" title did not match pattern "' + matchtitle + '"' + if matchtitle: + matchtitle = matchtitle.decode('utf8') + if not re.search(matchtitle, title, re.IGNORECASE): + return u'[download] "' + title + '" title did not match pattern "' + matchtitle + '"' rejecttitle = self.params.get('rejecttitle', False) - if rejecttitle and re.search(rejecttitle, title, re.IGNORECASE): - return u'"' + title + '" title matched reject pattern "' + rejecttitle + '"' + if rejecttitle: + rejecttitle = rejecttitle.decode('utf8') + if re.search(rejecttitle, title, re.IGNORECASE): + return u'"' + title + '" title matched reject pattern "' + rejecttitle + '"' return None def process_info(self, info_dict): |