Commit Graph

10535 Commits (f0c96af9cb0edc69f9ba73d39e6e191994e31256)

Author SHA1 Message Date
remitamine f628d800fb [ted] add support for youtube embeds and update tests 9 years ago
remitamine 11fa3d7f99 [ted] extract all http formats 9 years ago
Sergey M․ d41ee7b774
[vlive] Pass Referer as bytestring (Closes #9352) 9 years ago
remitamine e0e9bbb0e9 [pbs] extract srt and vtt subtitles 9 years ago
remitamine 7691184a31 [pbs] remove duplicate format 9 years ago
remitamine 35cd2f4c25 [pbs] extract only the formats that we know that they will be available as http format
https://projects.pbs.org/confluence/display/coveapi/COVE+Video+Specifications
9 years ago
remitamine 350d7963db [pbs] fix the least bitrate http url construction 9 years ago
remitamine cbc032c8b7 [pbs] extract all http formats 9 years ago
remitamine 69c4cde4ba [wsj] improve extraction 9 years ago
Sergey M․ ca278a182b
[rtlnl] Replace test 9 years ago
Sergey M․ 373e1230e4
[rtlnl] Clarify tests 9 years ago
Sergey M․ cd63d091ce
[rtlnl] Fix tests 9 years ago
Sergey M․ 0571ffda7d
[rtlnl] Improve extraction (Closes #9329)
* Make hls extraction non fatal and revert ext
* Extract progressive formats' metadata from corresponding hls formats
9 years ago
Reino17 5556047465
[rtlnl] Update 720p PG_URL_TEMPLATE
- Fixed the format_id for the 720p progressive videostream and added the video's resolution.
- The adaptive videostreams have the m3u8-extension, so I removed the confusing mp4-extension in order to make a better distinction between the these and the progressive videostreams.
9 years ago
remitamine 65a3bfb379 [dfb] extract m3u8 formats 9 years ago
Yen Chi Hsuan cef3f3011f
[funimation] Detect blocking and support CloudFlare cookies 9 years ago
Yen Chi Hsuan e9c6cdf4a1
[common] Fix format_id construction for HLS 9 years ago
Sergey M․ 00a17a9e12
[crunchyroll] Sort formats 9 years ago
Sergey M․ 8312b1a3d1
[crunchyroll] Add even more relaxed fmt fallback 9 years ago
Sergey M․ 6ff4469528
[crunchyroll] Relax fmt regex 9 years ago
Yen Chi Hsuan 68835d687a
Merge branch 'Kagami-vlive-hls' 9 years ago
Yen Chi Hsuan 9d186afac8
[vlive] Coding style and PEP8 9 years ago
Yen Chi Hsuan 151d98130b Merge branch 'vlive-hls' of https://github.com/Kagami/youtube-dl into Kagami-vlive-hls 9 years ago
Kagami Hiiragi b24d6336a7 [vlive] Add support for live videos 9 years ago
remitamine 065216d94f [crunchyroll] reduce requests for formats extraction 9 years ago
remitamine 67167920db [viewlift] replace SnagFilms extractors
- add support for other sites that use the same logic
- improve format extraction and sorting
9 years ago
Yen Chi Hsuan 14638e2915
[sexykarma] Rename to WatchIndianPornIE and fix extraction 9 years ago
Yen Chi Hsuan 1910077ed7
Revert "[sexykarma] Remove the extractor"
This reverts commit 31ff3c074e.
9 years ago
Yen Chi Hsuan 5819edef03
[ooyala] Skip an invalid test
Ooyala is used by lots of extractors and its correctness can be verified
by these websites.
9 years ago
Yen Chi Hsuan f5535ed0e3
[orf] Skip the expired test 9 years ago
Yen Chi Hsuan 31ff3c074e
[sexykarma] Remove the extractor
Its domain name is on sale.

Closes #9317
9 years ago
Sergey M․ 72670c39de
[arte:+7] Fix typo in _VALID_URL 9 years ago
Sergey M․ 683d892bf9
[viewster] Remove unused import 9 years ago
Sergey M․ 497971cd4a
[yandexmusic] Clarify blockage even more 9 years ago
remitamine e757fb3d05 [crunchyroll] improve extraction
- extract more metadata(series, episode, episode_number)
- reduce duplicate requests for extracting formats
- remove duplicate formats
9 years ago
remitamine 0ba9e3ca22 [viewster] extract formats for videos with multiple audios/subtitles 9 years ago
Sergey M․ 4b53762914
[yandexmusic] Clarify blockage 9 years ago
Sergey M․ eebe6b382e
[yandexmusic] Improve error handling 9 years ago
Yen Chi Hsuan 0cbcbdd89d
[nuvid] Fix extraction
Closes #7620
9 years ago
Yen Chi Hsuan 7f776fa4b5
[yandexmusic] Skip tests as Travis CI blocked 9 years ago
Yen Chi Hsuan a5941305b6
[mwave] Coding style 9 years ago
Yen Chi Hsuan f8dddaf456 Merge branch 'mwave-meetgreet' of https://github.com/pmrowla/youtube-dl into pmrowla-mwave-meetgreet 9 years ago
Yen Chi Hsuan 618c71dc64
[cloudy] New domain name for the test_cloudy_1
I'm sure whether videoraj.ch still works or not, so keep it.
9 years ago
Sergey M․ 52af8f222b
[cwtv] Relax _VALID_URL (Closes #9327) 9 years ago
Yen Chi Hsuan 3cc8649c9d
[20min] Detect embedded YouTube videos
Fixes #9331
9 years ago
Yen Chi Hsuan dcf094d626
[theplatform] Fix for Python 3.2
test_AENetworks{,_1} fails as in Python < 3.3, binascii.a2b_* functions
accepts only bytes-like objects
9 years ago
Peter Rowlands 5b5d7cc11e [mwave] Add Mwave Meet & Greet extractor 9 years ago
Yen Chi Hsuan 2ac2cbc0a3
[malemotion] Remove the extractor
Announcement from their homepage:

```
MaleMotion is closed

After another system crash, I'm forced to close the site

This week all content will be erased

Don't forget to cancel your subscription if any !
```

Closes #9311.
9 years ago
Yen Chi Hsuan a7e03861e8
[scivee] Skip the test
Not accessible from either Travis CI or my machine.

Closes #9315
9 years ago
Sergey M․ 175c2e9ec3
[youtube:search_url] Reimplement in terms of youtube:playlistbase 9 years ago
remitamine f1f879098a [viewster] extract more metadata for http formats 9 years ago
Sergey M․ c9fd530670
[ok] Extract start time 9 years ago
Sergey M․ 749b0046a8
[ok] Allow embeds without title (Closes #9303) 9 years ago
Yen Chi Hsuan e3de3d6f2f
[normalboots] Fix extraction
Now it's using ScreenwaveMedia
9 years ago
Yen Chi Hsuan ad58942d57
[muzu] Remove extractor
MUZU is shutting down in October 2015. [1]

[1] http://www.musicbusinessworldwide.com/youtube-rival-muzu-is-heading-into-liquidation/
9 years ago
Yen Chi Hsuan 4645432d7a
[eagleplatform] Checking direct HTTP links
Sometimes they fail with 404
9 years ago
Yen Chi Hsuan 6bdc2d5358
[mitele] Comment out unstable MD5
Also Akamai f4f fragments
9 years ago
Yen Chi Hsuan 2beff95da5
[nrk] Comment out unstable MD5 checksums
Both are Akamai f4f fragments.
9 years ago
Yen Chi Hsuan abc1723edd
[unistra] Sort formats
Originally URLs are passed to set() and not sorted, so the result is not
deterministic, causing occasional FAILs on Travis CI.
9 years ago
Yen Chi Hsuan d6712378e7
Merge branch 'akamai_pv' of https://github.com/remitamine/youtube-dl into remitamine-akamai_pv 9 years ago
remitamine fb72ec58ae [extractor/common] do not process f4m manifest that contain akamai playerVerificationChallenge 9 years ago
Sergey M․ c83a352227
[openload] Make thumbnail optional 9 years ago
Sergey M․ e9063b5de9
[openload] Add test 9 years ago
Sergey M․ 594b0c4c69
[openload] Fix ext extraction 9 years ago
Sergey M․ eb9ee19422
[utils] Allow None mimetypes in mimetype2ext 9 years ago
Sergey M․ a1394b820d
[openload] Fix title extraction (Closes #9298) 9 years ago
Yen Chi Hsuan aa9dc24f5a
[douyutv] Improve extraction and update tests
The JSON API sometimes return HTML pages with errors
9 years ago
Yen Chi Hsuan 51762e1a31
[xminus] Fix extraction (closes #9228) 9 years ago
Philipp Hagemeister 8b38f2ac40 release 2016.04.24 9 years ago
Yen Chi Hsuan a82398bd72
[kwuo:song] Fix extraction and update the test 9 years ago
remitamine c14dc00df3 [viewster] improve http formats extraction 9 years ago
Yen Chi Hsuan 03dd60ca41
[kuwo:category] Fix the test
Sometimes there are 24 songs and sometimes 30 lol
9 years ago
Yen Chi Hsuan 0738187f9b
[ThePlatform] Fix tests failed since 79ba9140dc 9 years ago
Yen Chi Hsuan a956cb6306
[onionstudios] Fix description extraction
\1 does not work in []. Fixes test_Generic_75
(http://www.clickhole.com/video/dont-understand-bitcoin-man-will-mumble-explanatio-2537)
9 years ago
Yen Chi Hsuan a8062eabcd
[mwave] Skip checking unstable MD5
On my PC the checksum is 02eda6d09fb63131a17a8d44e6237463, while a
recent Travis CI build
(https://travis-ci.org/rg3/youtube-dl/jobs/125341081) shows it's
c930e27b7720aaa3c9d0018dfc8ff6cc
9 years ago
Yen Chi Hsuan 2a7dee8cc5
[yahoo] Improve error detection and update tests 9 years ago
Yen Chi Hsuan d9ed362116
[yahoo] Extract all <iframe>s
Fixes test_yahoo_6

(https://ca.finance.yahoo.com/news/hackers-sony-more-trouble-well-154609075.html)
9 years ago
Yen Chi Hsuan 4f54958097
[yahoo] Update some tests
One has new fields as ThePlatformIE changed, and others have changed
files.
9 years ago
Yen Chi Hsuan 2a7c38831c
[yahoo] Extend _VALID_URL and fix extraction
Closes #9271
9 years ago
Yen Chi Hsuan 949b6497cc
[generic] Unescape the video URL
Fixes #9279
9 years ago
remitamine fda9a1ca9e [viewster] simplify qualities_basename regex 9 years ago
remitamine 864d5e7231 [viewster] extract all http formats 9 years ago
Sergey M․ 5448b781f6
[dplay] Sign unsigned final download hls URLs 9 years ago
Sergey M․ e239413fbc
[dplay] Extract subtitles (Closes #9284) 9 years ago
Sergey M․ fd0ff8bad8
[dplay] Improve extraction and document workarounds and tests 9 years ago
Sergey M․ 397ec446f3
[dplay] Try secure api for no tld (Closes #9282) 9 years ago
remitamine 29a7e8f6f8 [nhl] Add new extractor(closes #8419)(closes #8798) 9 years ago
Yen Chi Hsuan eb01e97e10
[youku] Skip streams with channel_type=tail
Fixes #9275

These video segments look like ads and they don't appear in the web
player.
9 years ago
remitamine cb7d4d0efd [nbc] add support for today.com(closes #2909) 9 years ago
Yen Chi Hsuan c80037918b
[iqiyi] Improve error detection (#9276) 9 years ago
remitamine 237a41108a [eagleplatform] extract all http formats 9 years ago
remitamine e962ae15d3 [newstube] extract http formats(closes #9253) 9 years ago
remitamine 7c36ea7d54 [rtbf] improve extraction(fixes #9267) 9 years ago
remitamine 9260cf1d97 [tubitv] fix extraction(closes #8741) 9 years ago
Sergey M․ bdbb8530c7
[vimeo] Pass Referer for check-password request 9 years ago
Sergey M․ 09a9fadb84
[dump] Remove extractor 9 years ago
Sergey M․ bf09af3acb
Add --hls-prefer-ffmpeg 9 years ago
Sergey M․ 88296ac326
[planetaplay] Remove remainings of extractor 9 years ago
Sergey M․ 870d525848
[options] Remove experimental mark for --hls-prefer-native 9 years ago
Sergey M․ 6577112890
[planetaplay] Remove extractor (Closes #9256) 9 years ago
Sergey M․ 1988647dda
[tvigle] Skip hls completely (#9259) 9 years ago
Yen Chi Hsuan a292cba256
[mgtv] Fix _VALID_URL and add localized name 9 years ago
Yen Chi Hsuan 982e518a96
[dispeak] Rename DigitalSpeaking to DigitallySpeaking 9 years ago
Yen Chi Hsuan 748e730099
[dispeak] Several fixes 9 years ago
Sergey M b6c0d4f431 Merge pull request #9110 from remitamine/parse_duration
[utils] imporove parse_duration to handle more formats
9 years ago
remitamine acaff49575 [utils] imporove parse_duration to handle more formats 9 years ago
Yen Chi Hsuan 1da19488f9
[mgtv] Add new extractor (closes #9212) 9 years ago
Yen Chi Hsuan 442c4d361f
[dispeak/gdcvault] Add the test case from #5784 9 years ago
Yen Chi Hsuan ec59d657e7
[dispeak] Add new extractor
Both GDCVault and GPUTechConf uses the service of DigitalSpeaking.
9 years ago
Yen Chi Hsuan 99ef96f84c
[gdcvault] Fix for videos with hard-coded hostnames
Fixes #9248
9 years ago
Yen Chi Hsuan 4dccea8ad0
[streetvoice] Fix extraction
The old API results in URLs with HTTP 403 from time to time.

Hopefully fixes #9219.
9 years ago
Yen Chi Hsuan 2c0d9c6217
[extractor/common] Allow empty post data 9 years ago
Sergey M․ 12a5134596
[tvigle] Fix extraction (Closes #9259) 9 years ago
Sergey M․ 16e633a5d7
[quickvid] Remove extractor (Closes #9258) 9 years ago
Sergey M․ 494ab6db73
[youtube] Capture and output login error message 9 years ago
Sergey M․ 107701fcfc
[people] Remove bogus comment 9 years ago
Sergey M․ f77970765a
[people] Add extractor 9 years ago
Philipp Hagemeister 81215d5652 release 2016.04.19 9 years ago
Sergey M․ 241a318f27
[vimeo] Improve _VALID_URL (Closes #9229) 9 years ago
Sergey M․ 4fdf082375
[theonion] Remove extractor (Closes #9220)
It now uses generic onionstudios embed
9 years ago
Jaime Marquínez Ferrándiz 1b6182d8f7 [youtube:playlist] Fetch all the videos in a mix (fixes #3837)
Since there doesn't seem to be any indication, it stops when there aren't new videos in the webpage.
9 years ago
remitamine 7bab22a402 [vice] remove unused import and variable 9 years ago
Yen Chi Hsuan 0f97fb4d00
[musicplayon] Relax _VALID_URL and improve metadata extraction
In r'pl=\d+&play=\d+' pages, several metadata items are missing

Closes #9222.
9 years ago
Yen Chi Hsuan b1cf58f48f
[musicplayon] Fix extraction (closes #9222) 9 years ago
remitamine 3014b0ae83 Merge pull request #9195 from remitamine/ffmpeg-pipe
[downloader/external] enable piping for FFmpegFD(closes #2124)
9 years ago
remitamine b9f2fdd37f [ffmpeg] Clarify rationale for pipe(-) exclusion in _ffmpeg_filename_argument 9 years ago
remitamine bbb3f730bb [onionstudios] extract m3u8 formats 9 years ago
remitamine d868f43c58 [ffmpeg] check for - file name in _ffmpeg_filename_argument 9 years ago
Yen Chi Hsuan 21525bb8ca
[kuwo:category] Update the test
Now the webpage says there are 24 songs.
9 years ago
Sergey M․ d8f103159f
[nerdist] Remove extractor
It now uses brightcove
9 years ago
remitamine 663ee5f0a9 [vice] extract youtube embed 9 years ago
Sergey M․ b6b950bf58
[cbs] Remove unused import 9 years ago
Sergey M․ 11e60fcad8
[extractor/generic] Improve instagram embeds (Closes #9213) 9 years ago
Sergey M․ c23533a100
[instagram] Add support for iframe embeds 9 years ago
Sergey M․ 0dafea02e6
[instagram] Add support for embed URLs 9 years ago
Sergey M․ 5d6360c3b7
[mooshare] Remove extractor 9 years ago
Yen Chi Hsuan 5e5c30c3fd
[mdr] Fix extraction and update tests
It's strange that the date is changed. Anyway, new data matches what the
webpage says.
9 years ago
Yen Chi Hsuan 9154c87fc4
[huffpost] Fix a typo 9 years ago
Yen Chi Hsuan ef0e4e7bc0
[generic] Fix test_Generic_2
Now a HEAD request returns 400 Bad Request
9 years ago
Yen Chi Hsuan 67d46a3f90
[ustream] Fix /embed/ URLs and add a test 9 years ago
Yen Chi Hsuan bec47a0748
[tudou] Improve error detection (closes #9175) 9 years ago
Yen Chi Hsuan 36b7d9dbfa
[twitter] Don't check /cards/ URLs
Fixes #9181

In this tweet, there are two cards:
1. https://twitter.com/i/cards/tfw/v1/719944006306701313
   This shows #TeamCap vs. #TeamIronMan
2. https://twitter.com/i/videos/tweet/719944021058060289
   This is the real video and can be handled by TwitterCardIE

In all current test_Twitter* tests, /videos/tweet/ approach works fine.
9 years ago
Yen Chi Hsuan 8c65e4a527
[bbc] Fix a test 9 years ago
Yen Chi Hsuan 6ad2ef8b7c
[audiomack] Update the test
The original test raises 404
9 years ago
Yen Chi Hsuan 00b426d66d
[varzesh3] Add md5 to the test 9 years ago
Yen Chi Hsuan 0de968b584
[newgrounds] Support videos (closes #9138) 9 years ago
remitamine 0841d5013c [cbs] do not catch Exceptions raised by by _extract_theplatform_smil 9 years ago
remitamine a71fca8577 [theplatform] remove _sort_formats from _extract_theplatform_smil 9 years ago
Yen Chi Hsuan ee94e7e66d
[varzesh3] Fix metadata extraction (closes #9197) 9 years ago
Yen Chi Hsuan 759e37c9e6
[gazeta] Relax _VALID_URL and update tests
Closes #9196
9 years ago
Yen Chi Hsuan ae65567102
[eagleplatform] Fix error handling 9 years ago
Yen Chi Hsuan c394b4f4cb
[puls4] Fix error detection (#9194) 9 years ago
Yen Chi Hsuan 260c7036ba
[sportbox] Fix SportBoxEmbedIE
Also fixes test_Generic_29 (http://www.vestifinance.ru/articles/25753)
9 years ago
remitamine f74197a074 [cbs] extract rtmp formats 9 years ago
remitamine f3a58d46bf [youtube:user] check if the url didn't match only the other youtube extractors 9 years ago
Sergey M․ b6612c9b11
[karaoketv] Fix extraction 9 years ago
Yen Chi Hsuan 7e176effb2
[iqiyi] Also suuport pps.tv URLs
PPS is acquired by Baidu and merged with iQiyi in 2013 [1]. Now they
have the same page layouts.

[1] http://www.chinanews.com/it/2013/05-07/4792526.shtml
9 years ago
Yen Chi Hsuan 4a252cc2d2
[karaoketv] Update and mark as not _WORKING 9 years ago
Yen Chi Hsuan f0ec61b525
[huffpost] Fix extraction 9 years ago
Yen Chi Hsuan 66d40ae3a5 Merge pull request #9041 from kasper93/master
[generic] Add support for LiveLeak embeds
9 years ago
Yen Chi Hsuan e6da9240d4
[mixcloud:stream] Add new extractor
Closes #7633
9 years ago
Yen Chi Hsuan dd91dfcd67
[mixcloud] Fix extraction by decrypting play info
Fixes #7521
9 years ago
Yen Chi Hsuan c773082692
Merge branch 'Phaeilo-mixcloud' 9 years ago
Yen Chi Hsuan 9c250931f5
[mixcloud] Improve and simplify mixcloud:user and mixcloud:playlist 9 years ago
Yen Chi Hsuan 56f1750049
[tdslifeway] Use the new Brightcove API
Thanks for @remitamine's suggestion.
9 years ago
Yen Chi Hsuan f2159c9815
[wayofthemaster] Remove extractor
Now it's using YouTube embeds.
9 years ago
Yen Chi Hsuan b0cf2e7c1b
[ubu] Remove extractor
1. Videos on ubu.com are now hosted on Vimeo
2. The duration is far from correct, and may not exist on other videos
   (For example http://ubu.com/film/hammons_king.html)
9 years ago
Yen Chi Hsuan 74b47d00c3
[xboxclips] Use http:// URL
xboxclips has misconfigured certificates
9 years ago
Yen Chi Hsuan 8cb57bab8e
[ministrygrid] Fix extraction and modernize 9 years ago
Yen Chi Hsuan e1bf277e19
[tdslifeway] Add TDSLifewayIE
Used by MinistryGridIE
9 years ago
remitamine ce599d5a7e [downloader/external] enable piping for FFmpegFD(closes #2124) 9 years ago
Sergey M․ 9e28538726
[arte:creative] Improve _VALID_URL 9 years ago
Sergey M․ 404284132c
[arte:info] Add extractor (Closes #9182) 9 years ago
remitamine 5565be9dd9 [aol] relex _VALID_URL regex 9 years ago
Yen Chi Hsuan b3a9474ad1 Merge branch 'mixcloud' of https://github.com/Phaeilo/youtube-dl into Phaeilo-mixcloud 9 years ago
Yen Chi Hsuan 86475d59b1
[metacritic] Add a new valid test case 9 years ago
Yen Chi Hsuan 73d93f948e
[lecture2go] Fix extraction
RTSP stream fails to download. Seems it's a mpv bug as direct playback
works well:

$ mpv --ytdl-format rtsp https://lecture2go.uni-hamburg.de/veranstaltungen/-/v/17473
9 years ago
Yen Chi Hsuan f5d8743e0a
[downloader/rtsp] Print the command 9 years ago
Yen Chi Hsuan d1c4e4ba15
[laola1tv] Improve error detection and skip an invalid test 9 years ago
Yen Chi Hsuan f141fefab7
[karrierevideos] Fix extraction
The server serves malformed header "Content Type: text/xml" for the XML
request (it should be Content-Type but not Content Type). Python 3.x,
which uses email.feedparser rejects such headers. As a result,
Content-Encoding header is not parsed, so the returned content is kept
not decompressed, and thus XML parsing error.
9 years ago
aystroganov@gmail.com 8334637f4a Make tbr field 'int' rather than 'tuple'
Closes #9180.
9 years ago
Philipp Hagemeister b0ba11cc64 release 2016.04.13 9 years ago
Kacper Michajłow b8f67449ec [generic] Add support for LiveLeak embeds 9 years ago
Yen Chi Hsuan 75af5d59ae
[netease] Skip all tests: completely georestricted 9 years ago
Philip Huppert 6d67169509 [mixcloud] improved extraction of user description 9 years ago
Philip Huppert dcaf00fb3e [mixcloud] support older urllib versions 9 years ago
Philip Huppert f896e1ccef [mixcloud] fixed some tests 9 years ago
Philip Huppert c96eca426b [mixcloud] Added support for user uploads, playlists, favorites and listens.
Fixes #3750 and #5272
9 years ago
Sergey M․ 466a614537
[youtube:playlist] Recognize popular uploads playlist as mix (Closes #9170) 9 years ago
Sergey M․ ffa2cecf72
[ard] Change subtitles extension to ttml (Closes #9169)
ttml is now served instead of srt
9 years ago
Yen Chi Hsuan a837416025
[jadorecettepub] Remove extractor: website gone 9 years ago
Yen Chi Hsuan c9d448876f
[izlesene] Fix extraction
description may be absent
9 years ago
Yen Chi Hsuan 8865b8abfd
[howstuffworks] Skip a broken test case 9 years ago
Yen Chi Hsuan c77a0c01cb
[groupon] Fix extraction 9 years ago
Yen Chi Hsuan 12355ac473
[goshgay] Fix extraction
isFamilyFriendly no longer exists in the webpage and I can't find
another indicator.
9 years ago
Sergey M․ 49f523ca50
[mixcloud] Capture error message (#9156) 9 years ago
remitamine 4a903b93a9 Revert "[openclassroom] Add new extractor(closes #9147)"
This reverts commit 13267a2be3.
9 years ago
remitamine 13267a2be3 [openclassroom] Add new extractor(closes #9147) 9 years ago
Yen Chi Hsuan 134c207e3f
[arte.tv:embed] Extended support (#2620) 9 years ago
Yen Chi Hsuan 0f56bd2178
Merge branch 'Phaeilo-presstv' 9 years ago