5d6360c3b7
[mooshare] Remove extractor
9 years ago
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
9154c87fc4
[huffpost] Fix a typo
9 years ago
ef0e4e7bc0
[generic] Fix test_Generic_2
...
Now a HEAD request returns 400 Bad Request
9 years ago
67d46a3f90
[ustream] Fix /embed/ URLs and add a test
9 years ago
bec47a0748
[tudou] Improve error detection ( closes #9175 )
9 years ago
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
8c65e4a527
[bbc] Fix a test
9 years ago
6ad2ef8b7c
[audiomack] Update the test
...
The original test raises 404
9 years ago
00b426d66d
[varzesh3] Add md5 to the test
9 years ago
0de968b584
[newgrounds] Support videos ( closes #9138 )
9 years ago
0841d5013c
[cbs] do not catch Exceptions raised by by _extract_theplatform_smil
9 years ago
a71fca8577
[theplatform] remove _sort_formats from _extract_theplatform_smil
9 years ago
ee94e7e66d
[varzesh3] Fix metadata extraction ( closes #9197 )
9 years ago
759e37c9e6
[gazeta] Relax _VALID_URL and update tests
...
Closes #9196
9 years ago
ae65567102
[eagleplatform] Fix error handling
9 years ago
c394b4f4cb
[puls4] Fix error detection ( #9194 )
9 years ago
260c7036ba
[sportbox] Fix SportBoxEmbedIE
...
Also fixes test_Generic_29 (http://www.vestifinance.ru/articles/25753 )
9 years ago
f74197a074
[cbs] extract rtmp formats
9 years ago
f3a58d46bf
[youtube:user] check if the url didn't match only the other youtube extractors
9 years ago
b6612c9b11
[karaoketv] Fix extraction
9 years ago
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
4a252cc2d2
[karaoketv] Update and mark as not _WORKING
9 years ago
f0ec61b525
[huffpost] Fix extraction
9 years ago
66d40ae3a5
Merge pull request #9041 from kasper93/master
...
[generic] Add support for LiveLeak embeds
9 years ago
e6da9240d4
[mixcloud:stream] Add new extractor
...
Closes #7633
9 years ago
dd91dfcd67
[mixcloud] Fix extraction by decrypting play info
...
Fixes #7521
9 years ago
c773082692
Merge branch 'Phaeilo-mixcloud'
9 years ago
9c250931f5
[mixcloud] Improve and simplify mixcloud:user and mixcloud:playlist
9 years ago
56f1750049
[tdslifeway] Use the new Brightcove API
...
Thanks for @remitamine's suggestion.
9 years ago
f2159c9815
[wayofthemaster] Remove extractor
...
Now it's using YouTube embeds.
9 years ago
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
74b47d00c3
[xboxclips] Use http:// URL
...
xboxclips has misconfigured certificates
9 years ago
8cb57bab8e
[ministrygrid] Fix extraction and modernize
9 years ago
e1bf277e19
[tdslifeway] Add TDSLifewayIE
...
Used by MinistryGridIE
9 years ago
9e28538726
[arte:creative] Improve _VALID_URL
9 years ago
404284132c
[arte:info] Add extractor ( Closes #9182 )
9 years ago
5565be9dd9
[aol] relex _VALID_URL regex
9 years ago
b3a9474ad1
Merge branch 'mixcloud' of https://github.com/Phaeilo/youtube-dl into Phaeilo-mixcloud
9 years ago
86475d59b1
[metacritic] Add a new valid test case
9 years ago
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
d1c4e4ba15
[laola1tv] Improve error detection and skip an invalid test
9 years ago
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
8334637f4a
Make tbr field 'int' rather than 'tuple'
...
Closes #9180 .
9 years ago
b8f67449ec
[generic] Add support for LiveLeak embeds
9 years ago
75af5d59ae
[netease] Skip all tests: completely georestricted
9 years ago
6d67169509
[mixcloud] improved extraction of user description
9 years ago
dcaf00fb3e
[mixcloud] support older urllib versions
9 years ago
f896e1ccef
[mixcloud] fixed some tests
9 years ago
c96eca426b
[mixcloud] Added support for user uploads, playlists, favorites and listens.
...
Fixes #3750 and #5272
9 years ago
466a614537
[youtube:playlist] Recognize popular uploads playlist as mix ( Closes #9170 )
9 years ago
ffa2cecf72
[ard] Change subtitles extension to ttml ( Closes #9169 )
...
ttml is now served instead of srt
9 years ago
a837416025
[jadorecettepub] Remove extractor: website gone
9 years ago
c9d448876f
[izlesene] Fix extraction
...
description may be absent
9 years ago
8865b8abfd
[howstuffworks] Skip a broken test case
9 years ago
c77a0c01cb
[groupon] Fix extraction
9 years ago
12355ac473
[goshgay] Fix extraction
...
isFamilyFriendly no longer exists in the webpage and I can't find
another indicator.
9 years ago
49f523ca50
[mixcloud] Capture error message ( #9156 )
9 years ago
4a903b93a9
Revert "[openclassroom] Add new extractor( closes #9147 )"
...
This reverts commit 13267a2be3
9 years ago
13267a2be3
[openclassroom] Add new extractor( closes #9147 )
9 years ago
134c207e3f
[arte.tv:embed] Extended support ( #2620 )
9 years ago
0f56bd2178
Merge branch 'Phaeilo-presstv'
9 years ago
dfbc7f7f3f
[presstv] Improve and simplify
9 years ago
7d58ea7c5b
Merge branch 'presstv' of https://github.com/Phaeilo/youtube-dl into Phaeilo-presstv
9 years ago
452908b257
[telebruxelles] Fix extraction ( Closes #9142 )
9 years ago
5899e988d5
[glide] Improve extraction and extract upload info
9 years ago
4a121d29bb
[glide] Fix extraction ( Closes #9141 )
9 years ago
7ebc36900d
[jwplatform:base] Improve subtitles extraction
9 years ago
d7eb052fa2
[screencastomatic] Add duration to test
9 years ago
a6d6722c8f
[jwplatform:base] Extract duration
9 years ago
66fa495868
[screencastomatic] Fix extraction ( Closes #9136 )
9 years ago
443285aabe
[ebaumsworlds] Update _VALID_URL ( Closes #9135 )
9 years ago
de728757ad
[presstv] Refactored extractor.
9 years ago
f44c276842
[extractor/extractors] Remove non-existant imports
9 years ago
a1fa60a934
[cliprs] Add extractor ( Closes #9099 )
9 years ago
49caf3307f
[extractor/common] Remove irrelevant comment
9 years ago
61dd350a04
[1tv] Fix extraction ( Closes #9103 )
9 years ago
95153a960d
[presstv] updated extractor and tests to work with current PressTV website
9 years ago
c991106706
[videodetective] Adapt to InternetVideoArchiveIE
9 years ago
dae2a058de
[rottentomatoes] Adapt to InternetVideoArchiveIE
9 years ago
c05025fdd7
[internetvideoarchive] Fix extraction and support json URLs
9 years ago
bfe96d7bea
[presstv] Added extractor PressTV.
...
Fixes #7060
9 years ago
ab481b48e5
[funnyordie] Relax M3U8 URL matching
...
Also, m3u8_url extraction should be fatal as all formats depends
directly or indirectly on it.
This change fixes test_Generic_26 and TestFunnyOrDieSubtitles
9 years ago
92c7f3157a
[aol] Add coding cookie
9 years ago
bffb245a48
[aol] add support for videos with vidible IDs( closes #9124 )
9 years ago
e0986e31cf
lazy extractors: Output if it's enabled in the verbose log
9 years ago
779822d945
Add experimental support for lazy loading the info extractors
...
'make lazy-extractors' creates the youtube_dl/extractor/lazy_extractors.py (imported by youtube_dl/extractor/__init__.py), which contains simplified classes that only have the 'suitable' class method and that load the appropiate class with the '__new__' method when a instance is created.
9 years ago
1b3d5e05a8
Move the extreactors import to youtube_dl/extractor/extractors.py
9 years ago
e52d7f85f2
Delay initialization of InfoExtractors until they are needed
9 years ago
568d2f78d6
[tnaflix] Fix metadata extraction
9 years ago
2f2fcf1a33
[tnaflix] Fix extraction ( Closes #9074 )
9 years ago
bacec0397f
[extractor/common] Relax _hidden_inputs
9 years ago
3c6c7e7d7e
[gdcvault] Fix extraction ( Closes #9107 , closes #9114 )
9 years ago
fb38aa8b53
[extractor/common] Support arbitrary format strings for template based identifiers in mpd manifests ( Closes #9119 , closes #9120 )
9 years ago
18da24634c
[democracynow] Improve extraction
9 years ago
a134426d61
[democracynow] Fix tests
9 years ago
a64c0c9b06
[democracynow] Make description optional ( Closes #9115 )
9 years ago
56019444cb
[novamov] Improve _VALID_URL template ( Closes #9116 )
9 years ago
a1ff3cd5f9
[acast] fix channel extraction( closes #9117 )
9 years ago
9a32e80477
[acast] fix extraction( #9117 )
9 years ago
ed6fb8b804
[vrt] Add support for direct hls playlists and YouTube ( Closes #9108 )
9 years ago
3afef2e3fc
[beeg] Improve extraction
9 years ago
e90d175436
[yandexmusic] Extract music album metafields ( Closes #7354 )
9 years ago
7a93ab5f3f
[extractor/common] Introduce music album metafields
9 years ago
8790249c68
[iqiyi] Improve error detection for VIP-only videos
...
Closes #9071
9 years ago
65150b41bb
[deezer] Fix extraction ( Closes #9086 )
9 years ago
e42f413716
[rte] Improve thumbnail extraction ( Closes #9085 )
9 years ago
40a056d85d
[extractor/__init__] Remove novamov extractor and sort novamov based extractors alphabetically
9 years ago
e7d77efb9d
[auroravid] Add extractor ( Closes #9070 )
9 years ago
995cf05c96
[novamov] Make title fatal
9 years ago
8c7d6e8e22
[zdf] Extract subtitles ( closes #9081 )
9 years ago
6d4fc66bfc
[youtube] Add support for zwearz ( Closes #9062 )
9 years ago
23576edbfc
[brightcove:legacy] skip None value for uploader_id
9 years ago
4d4cd35f48
[brightcove:legacy] extract uploader_id as a string
9 years ago
3aac9b2fb1
[nowness] update tests
9 years ago
e47d19e991
[brightcove:new] extract subtitles and strip video title
9 years ago
41f5492fbc
[brightcove:legacy] improve format extraction and extract uploader_id, duration and timestamp
9 years ago
2defa7d75a
[instagram:user] Fix extraction ( fixes #9059 )
...
The URL for the next page was incorrect and we always got the same page, therefore it got trapped in an infinite loop.
9 years ago
bbc26c8a01
[bbc] Set vcodec to none for audio formats
9 years ago
b507cc925b
[extractor/common] Carry long line
9 years ago
db8ee7ec05
[extractor/common] Fix numeric identifiers conversion in DASH URL templates
9 years ago
08136dc138
[brightcove] fix format sorting
9 years ago
fe7ef95e91
[cbsinteractive] Add support for ZDNet videos
9 years ago
5f705baf5e
[cnet] extract more formats
9 years ago
df634be2ed
[common] prefer using mime type over ext for smil subtitle extraction
...
the subtitle ext for http://www.cnet.com/videos/download-amazon-prime-movies-and-tv/
is adb_xml while using the mime type it get tt(application/smptett+xml)
9 years ago
6d628fafca
[camwithher] Remove extra blank line
9 years ago
0f28777f58
[cbsnews] Remove unused import
9 years ago
329c1eae54
[aenetworks] Make pep8 happy
9 years ago
9aaaf8e8e8
[camwithher] Improve extraction ( Closes #8989 )
9 years ago
04819db58e
[camwithher] Add extractor
...
Corrected unnecessary test
Sane variable naming
RTMP all .flv & url_id for _download_webpage()
Corrected all outstanding issues, next up is a squash!
9 years ago
79ba9140dc
[theplatform] extract timestamp and uploader
9 years ago
75d572e9fb
[screencast] Improve title regexes ( Closes #9025 )
9 years ago
791d6aaecc
screencast.com: fallback on page title
...
When determining the title of the page, use the <title> tag of the page
9 years ago
81de73e5b4
[screencast] Add test
9 years ago
83cedc1cf2
screencast.com: support missing www
...
The "www." part of the URL is not mandatory
9 years ago
244cd04237
[pluralsight] Remove unnecessary login/password encode
9 years ago
fbdaced256
[lynda] Remove unnecessary login/password encode
9 years ago
a3373823e1
[udemy] Remove unnecessary login/password encode
...
This is now covered by compat_urllib_parse_urlencode
9 years ago
03caa463e7
[udemy:course] Skip non-video lectures
9 years ago
3f64379eda
[movieclips] fix extraction
9 years ago
3e0c3d14d9
[cbs] add base extractor
9 years ago
d8873d4def
[aenetworks] improve format extraction
9 years ago
db1c969da5
[theplatform] sign https urls
9 years ago
63c55e9f22
[cbs] improve extraction( closes #6321 )
9 years ago
f9b1529af8
[generic] remove sbnation test(handled by VoxMediaIE)
9 years ago
961fc024d2
[voxmedia] improve sbnation support
9 years ago
b53a06e3b9
[udemy:course] Use new URL format
9 years ago
4ecc1fc638
[howstuffworks] improve extraction
9 years ago
5b012dfce8
[tudou] Improve error handling ( closes #8988 )
9 years ago
8369942773
[voxmedia] Add new extractor( closes #3182 )
9 years ago
86f3b66cec
[udemy] Remove unused import
9 years ago
6bb4600717
[udemy:course] Simplify course curriculum downloading
9 years ago
41d06b0424
[extractor/common] Improve _request_webpage
...
* Do not ignore data, headers and query for Requests
* Default values for headers and query switched to dicts since these are used by urllib itself
9 years ago
81da8cbc45
[udemy] Switch to api 2.0 ( Closes #9035 )
9 years ago
5299bc3f91
[beeg] Switch to api v6 ( Closes #9036 )
9 years ago
c9c39c22c5
[nationalgeographic] add support for channel.nationalgeographic.com urls
9 years ago
d84b48e3f1
[nationalgeographic] improve extraction
9 years ago
dd17041c82
[tenplay] remove extractor( fixes #6927 )
9 years ago
fea7295b14
[brightcove] relax embed_in_page regex
9 years ago
9cf01f7f30
[nbc] add new extractor for csnne.com( #5432 )
9 years ago
ce548296fe
[cnbc] fix test
9 years ago
c02ec7d430
[cnbc] Add new extractor( closes #8012 )
9 years ago
6b820a2376
[myspace] improve extraction
9 years ago
e621a344e6
[kwuo] Port to new API and enable --cn-verification-proxy
9 years ago
3ae6f8fec1
[kwuo] Remove _sort_formats() from KuwoBaseIE._get_formats()
...
Following the idea proposed in 19dbaeece3
9 years ago
597d52fadb
[kuwo:song] Correct song ID extraction ( fixes #9033 )
...
Bug introduced in daef04a4e7
9 years ago
afca767d19
[tumblr] Improve _VALID_URL ( Closes #9027 )
9 years ago
6e359a1534
[comcarcoff] don not depend on crackle extractor( closes #8995 )
...
previously extraction has been delegated to crackle to extract more info
and subtitles #6106 but some of the episodes can't be extracted using
crackle #8995 .
9 years ago
03442072c0
[pornhub] Fix typo ( Closes #9008 )
9 years ago
c8b13fec02
[foxnews] Restore upload time fields in test
9 years ago
87d105ac6c
[amp] Fix upload timestamp extraction ( Closes #9007 )
9 years ago
3454139576
[pornhub:uservideos] Add support for multipage videos ( Closes #9006 )
9 years ago
3a23bae9cc
[pornhub:playlistbase] Do not include videos not from playlist
9 years ago
8f9a477e7f
[pornhub:playlistbase] Use orderedSet
9 years ago
a1cf3e38a3
[bbc] Extend vpid regex ( Closes #9003 )
9 years ago
b22ca76204
[extractor/common] Filter out unsupported encrypted media for f4m formats ( Closes #8573 )
9 years ago
19dbaeece3
Remove _sort_formats from _extract_*_formats methods
...
Now _sort_formats should be called explicitly.
_sort_formats has been added to all the necessary places in code.
Closes #8051
9 years ago
395fd4b08a
[twitter] Handle another form of embedded Vine
...
Fixes #8996
9 years ago
8018028d0f
[pluralsight] Extract chapter metadata ( Closes #8993 )
9 years ago
00322ad4fd
[lynda] Extract chapter metadata ( #8993 )
9 years ago
4cf3489c6e
[vevo] Update videoservice API URL ( Closes #8900 )
9 years ago
b24ab3e341
[udemy] Improve paid course detection
9 years ago
af4116f4f0
[udemy] Improve format_id
9 years ago
f973e5d54e
[udemy] Drop outputs' formats
...
Always results in 403
9 years ago
62f55aa68a
[udemy] Add outputs metadata to view_html formats
9 years ago
02d7634d24
[udemy] Fix outputs' formats format_id
9 years ago
48dce58ca9
[udemy] Use custom sorting
9 years ago
efcba804f6
[udemy] Extract formats from view_html ( Closes #8979 )
9 years ago
6dee688e6d
[youtube:playlistsbase] Restrict playlist regex ( Closes #8986 )
9 years ago
b5a5bbf376
[mailru] Extend _VALID_URL ( Closes #8990 )
9 years ago
e68d3a010f
[twitter] Fix extraction ( closes #8966 )
...
HLS and DASH formats are no longer appeared in test cases. I keep them
for fear of triggering new errors.
9 years ago
d10fe8358c
[generic] Add a test case for brightcove embed
...
Closes #8862
9 years ago
d6c340cae5
[brightcove] Extract more formats ( #8862 )
9 years ago
5964b598ff
[brightcove] Support alternative BrightcoveExperience layout
...
The full URL lays in the `data` attribute of <object> (#8862 )
9 years ago
6e6bc8dae5
Use urlencode_postdata across the codebase
9 years ago
15707c7e02
[compat] Add compat_urllib_parse_urlencode and eliminate encode_dict
...
encode_dict functionality has been improved and moved directly into compat_urllib_parse_urlencode
All occurrences of compat_urllib_parse.urlencode throughout the codebase have been replaced by compat_urllib_parse_urlencode
Closes #8974
9 years ago
2156f16ca7
[thescene] Fix extraction and improve style ( Closes #8978 )
9 years ago
4db441de72
[once] Relax _VALID_URL ( Closes #8976 )
9 years ago
d7f62b049a
[iqiyi] Update enc_key
9 years ago
3bb3356812
[douyutv] Extend _VALID_URL
9 years ago
98e68806fb
[mnet] Improve ( Closes #8958 )
9 years ago
e031768666
[mnet] Add new extractor
9 years ago
5eb7db4ee9
[udemy] Add support for new URL schema
9 years ago
f0e83681d9
[udemy] Extract formats from outputs
9 years ago
ff9d5d0938
[udemy] Improve course enrolling
9 years ago
d041a73674
[extractor/__init__] Add youtube:live and sort youtube extractors alphabetically
9 years ago
f07e276a04
[youtube:live] Add extractor ( Closes #8959 )
9 years ago
993271da0a
[nytimes] Tolerate missing metadata ( Closes #8952 )
9 years ago
369e7e3ff0
[iprima] Fix extraction ( Closes #8953 )
9 years ago
5767b4eeae
[mtv] Fix description extraction ( Closes #8962 )
9 years ago
32d88410eb
[tumblr] Add a test with Instagram embed
...
Closes #8817
9 years ago
5a51775a58
[generic] Extract Instagram embeds ( #8817 )
9 years ago
87696e78d7
[instagram] Unescape description ( #8817 )
9 years ago
c4096e8aea
[instagram] Extract embed videos ( #8817 )
9 years ago
fc27ea9464
[tumblr] Support Vine embeds ( #8817 )
9 years ago
088e1aac59
[generic] Support Vine embeds ( #8817 )
9 years ago
882c699296
[tunein] Fix stream data extraction ( Closes #8899 , closes #8924 )
9 years ago
7da2c87119
Add extractor for thescene.com ( closes #8929 )
9 years ago
c6ca11f1b3
[once] Prevent ads from embedding into m3u8 playlists ( Closes #8893 )
9 years ago
2beeb286e1
[laola1tv] Add support for livestreams ( Closes #8934 )
9 years ago
cc7397b04d
[ceskatelevize] Make m3u8 formats extraction non fatal ( Closes #8933 )
9 years ago
bc5d16b302
[animeondemand] Skip dash for now
9 years ago
85c637b737
[animeondemand] Extract teaser when no full episode available ( #8923 )
9 years ago
5c69f7a479
[animeondemand] Respect startvideo ( Closes #8923 )
9 years ago
ff5873b72d
[motherless] Detect friends only videos
9 years ago
065c4b27bf
[xhamster:embed] Extract vars ( Closes #8912 )
9 years ago
1600ed1ff9
[rutv] Improve flash version pattern ( Closes #8911 )
9 years ago
5886b38d73
Add support for https for all extractors as preventive and future-proof measure
9 years ago
0cef27ad25
Add missing r prefix for _VALID_URLs
9 years ago
12af4beb3e
[mailru] Add support for https ( Closes #8920 )
9 years ago
3c5d183c19
[animeondemand] Extract all formats ( Closes #8906 )
9 years ago
3e8bb9a972
[animeondemand] Detect geo restriction
9 years ago
daef04a4e7
[kwuo] Fix KuwoChartIE and KuwoSingerIE and accept new URL forms
9 years ago
2648918c81
[vlive] Fix creator extraction ( closes #8814 )
9 years ago
9e3c2f1d74
[openload] Misc improvements
...
* Add thumbnail
* Detect errors (#6469 )
* Match more (#6469 , #8489 )
9 years ago
2bfeee69b9
[openload] Add new extractor ( closes #8489 )
9 years ago
664bcd80b9
[tudou] Use InAdvancePagedList ( closes #8884 )
9 years ago
3c20208eff
[francetv] Improve formats extraction
9 years ago
db264e3cc3
[francetvinfo] Add support for france3-regions and strip title ( Closes #7673 )
9 years ago
96a9f22d98
[discovery] Relax _VALID_URL ( Closes #8903 )
9 years ago
298c04b464
[91porn] Use common messages' wording
9 years ago
d95114dd83
[91porn] Unquote final URL ( Closes #8881 )
9 years ago
fa023ccb2c
[biobiochiletv] Fix extraction, extract m3u8 formats and overall improve ( Closes #7314 )
9 years ago
e36f4aa72b
[biobiotv] Add extractor
9 years ago
f1ced6df51
[cda] Improve and simplify ( Closes #8805 )
9 years ago
8b0d7a66ef
[cda] Add new extractor for cda.pl
...
Fixes #8760
9 years ago
3aec71766d
[safari:api] Separate extractor ( Closes #8871 )
9 years ago
0d769bcb78
[extractor/generic] Fix missing byte literal prefix
9 years ago
4cd70099ea
[hbo] Add new extractor
9 years ago
19e2617a6f
[commonprotocols] Add generic support for rtmp URLs ( Closes #8488 )
9 years ago
Sergey M․