about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-03-21 00:46:32 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-03-21 00:46:32 +0100
commit773c0b4bb816b9cd9b5835e64b85fcdbf6113a3d (patch)
tree7d145850da1a36ac0d836f75e810e1b056dd5df6
parent23c322a531ab5ec346ec3426eaba6646c6611202 (diff)
downloadyoutube-dl-773c0b4bb816b9cd9b5835e64b85fcdbf6113a3d.tar.gz
youtube-dl-773c0b4bb816b9cd9b5835e64b85fcdbf6113a3d.tar.xz
youtube-dl-773c0b4bb816b9cd9b5835e64b85fcdbf6113a3d.zip
[pbs] Add support for widget URLs (Fixes #2594)
-rw-r--r--test/test_all_urls.py1
-rw-r--r--youtube_dl/extractor/pbs.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index 3ce0b910a..39ac8b8a1 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -141,6 +141,7 @@ class TestAllURLsMatching(unittest.TestCase):
     def test_pbs(self):
         # https://github.com/rg3/youtube-dl/issues/2350
         self.assertMatch('http://video.pbs.org/viralplayer/2365173446/', ['PBS'])
+        self.assertMatch('http://video.pbs.org/widget/partnerplayer/980042464/', ['PBS'])
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py
index e7e0042fb..56fbe3d56 100644
--- a/youtube_dl/extractor/pbs.py
+++ b/youtube_dl/extractor/pbs.py
@@ -13,7 +13,7 @@ class PBSIE(InfoExtractor):
             # Article with embedded player
            (?:www\.)?pbs\.org/(?:[^/]+/){2,5}(?P<presumptive_id>[^/]+)/?(?:$|[?\#]) |
            # Player
-           video\.pbs\.org/partnerplayer/(?P<player_id>[^/]+)/
+           video\.pbs\.org/(?:widget/)?partnerplayer/(?P<player_id>[^/]+)/
         )
     '''