Pornhubpremium #21416

fauresystems · 2019-06-16T14:20:08Z

Please follow the guide below

You will be asked some questions, please read them carefully and answer honestly
Put an x into all the boxes [ ] relevant to your pull request (like that [x])
Use Preview tab to see how your pull request will actually look like

Before submitting a pull request make sure you have:

[x ] At least skimmed through adding new extractor tutorial and youtube-dl coding conventions sections
[x ] Searched the bugtracker for similar pull requests
[x ] Checked the code with flake8

In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under Unlicense. Check one of the following options:

[x ] I am the original author of this code and I am willing to release it under Unlicense
I am not the original author of this code but it is in public domain or released under Unlicense (provide reliable evidence)

What is the purpose of your pull request?

Bug fix
[x ] Improvement
New extractor
New feature

Description of your pull request and other information

Add pornhubpremium.com to PornHub extractor.

Add yourextractor.py

Cleanup

Pornhub tests corrections: # non-ASCII title 'uploader': 'Unknown', --> 'uploader': 'unknown', # subtitles 'url': 'https://www.pornhub.com/view_video.php?viewkey=ph5af5fef7c2aa7', --> This video has been disabled --> 'url': 'https://fr.pornhub.com/view_video.php?viewkey=ph5a73f8c84d1a9', Add PornHubPremium login

fauresystems · 2019-06-18T08:06:55Z

PornHub test were broken, so I fixed them and added PornHub Premium login, should be OK now

Cleanup

fauresystems · 2019-06-19T14:59:42Z

Do I need anything to do now?

youtube_dl/extractor/extractors.py

youtube_dl/extractor/pornhub.py

.gitignore

Resolve changes requested by dstftw

…ube-dl into pornhubpremium

fauresystems · 2019-06-22T11:06:12Z

all done :-) *Everything should be as simple as possible, but not simpler.* *_______________* FAURE SYSTEMS 5 square Linné 38320 Eybens Le ven. 21 juin 2019 à 19:49, Sergey M. <notifications@github.com> a écrit :

…

***@***.**** commented on this pull request. ------------------------------ In .gitignore <#21416 (comment)>: > @@ -51,3 +51,8 @@ venv/ # VS Code related files .vscode +AtomicParsley.exe +ffmpeg.exe +ffprobe.exe +test_fork.py +venv.bat Revert all unrelated changes. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#21416?email_source=notifications&email_token=AIGJHRYAFGPVI3X3OEZ46VTP3UID3A5CNFSM4HYRI6B2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOB4J37OY#pullrequestreview-252952507>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AIGJHR4Z4MFZLTA23LWGWMDP3UID3ANCNFSM4HYRI6BQ> .

Revert .gitignore commit

Maybe I am no good at github! But I am a work in progress

fauresystems · 2019-06-23T05:55:37Z

I'm a github rookie but I guess it's okay now.

fauresystems · 2019-06-23T10:48:52Z

I guess the only test failing is Pornhub Premium because of credentials.

dstftw · 2019-06-23T11:14:25Z

Wrong. See travis log.

fauresystems · 2019-06-23T13:20:41Z

I fall back to previous password, sounds good now.

fauresystems · 2019-06-23T13:22:21Z

Is test going to run automatically again, or I need to do something?

fauresystems · 2019-06-24T06:13:44Z

Test OK on my PC, please tell me what should I do? Maybe just process Travis again (I changed back the password). *Everything should be as simple as possible, but not simpler.* *_______________* FAURE SYSTEMS 5 square Linné 38320 Eybens Le dim. 23 juin 2019 à 13:15, Sergey M. <notifications@github.com> a écrit :

…

Wrong. See travis log. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#21416?email_source=notifications&email_token=AIGJHR526KTWSITXR5DS63DP35LNZA5CNFSM4HYRI6B2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODYK4AXI#issuecomment-504741981>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AIGJHR7BT247YXBOJZN3W3TP35LNZANCNFSM4HYRI6BQ> .

Added credentials

fauresystems · 2019-06-25T05:54:01Z

I don't know what to do with that:
Traceback (most recent call last): File "/home/travis/build/ytdl-org/youtube-dl/test/test_unicode_literals.py", line 52, in test_all_files 'unicode_literals import missing in %s' % fn) File "/home/travis/build/ytdl-org/youtube-dl/test/helper.py", line 242, in assertRegexpMatches self.assertTrue(m, msg) AssertionError: None is not true : Regexp didn't match: '(?:(?:#.*?|\\s*)\\n)*from __future__ import (?:[a-z_]+,\\s*)*unicode_literals' not found in '"""\ntest_fork.py is not added to git (only for local testing)\n"""\n\nfrom __future__ import unicode_literals\nimport youtube_dl\n\nydl_opts = {\n \'skip_download\': True,\n}\n\nwith youtube_dl.YoutubeDL(ydl_opts) as ydl:\n ydl.download([\'http://www.pornhub.com/view_video.php?viewkey=1331683002\'])\n\nexit()\n\nydl_opts = {\n \'format\': \'bestvideo[ext=mp4]+bestaudio[ext=m4a]\',\n \'username\': "tdsist",\n \'password\': "ZtOUktu0QP",\n}\n\nwith youtube_dl.YoutubeDL(ydl_opts) as ydl:\n ydl.download([\'https://fr.pornhubpremium.com/view_video.php?viewkey=ph5bdbb2cd6df6a\'])', unicode_literals import missing in /home/travis/build/ytdl-org/youtube-dl/test_fork.py

fauresystems · 2019-06-27T06:52:45Z

Sounds OK now, you merge the request ?

Remove credentials from tests

fauresystems · 2019-06-30T09:48:49Z

Sounds OK now without creds, you merge the request ? Or am I requested to dpo something ?

fauresystems · 2019-07-13T06:27:42Z

Hi Sergey, I don't see the code in master branch, so not in 2019.07.12 release, what should I do ? *Everything should be as simple as possible, but not simpler.* *_______________* FAURE SYSTEMS 5 square Linné 38320 Eybens Le lun. 24 juin 2019 à 08:13, Faure <dev@faure.systems> a écrit :

…

Test OK on my PC, please tell me what should I do? Maybe just process Travis again (I changed back the password). *Everything should be as simple as possible, but not simpler.* *_______________* FAURE SYSTEMS 5 square Linné 38320 Eybens Le dim. 23 juin 2019 à 13:15, Sergey M. ***@***.***> a écrit : > Wrong. See travis log. > > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub > <#21416?email_source=notifications&email_token=AIGJHR526KTWSITXR5DS63DP35LNZA5CNFSM4HYRI6B2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODYK4AXI#issuecomment-504741981>, > or mute the thread > <https://github.com/notifications/unsubscribe-auth/AIGJHR7BT247YXBOJZN3W3TP35LNZANCNFSM4HYRI6BQ> > . >

dstftw · 2019-07-13T18:55:43Z

youtube_dl/extractor/pornhub.py

@@ -48,10 +49,12 @@ def dl(*args, **kwargs):

 class PornHubIE(PornHubBaseIE):
    IE_DESC = 'PornHub and Thumbzilla'
+    _NETRC_MACHINE = 'pornhubpremium'
+    _LOGIN_URL = 'https://www.pornhubpremium.com/premium/login'


This must be a separate extractor.

dstftw · 2019-07-13T18:56:51Z

youtube_dl/extractor/pornhub.py

+            })
+
+        # Successful login
+        if response.get("success") == '1':


Single quotes.

dstftw · 2019-07-13T19:13:45Z

youtube_dl/extractor/pornhub.py

@@ -48,10 +49,12 @@ def dl(*args, **kwargs):

 class PornHubIE(PornHubBaseIE):
    IE_DESC = 'PornHub and Thumbzilla'
+    _NETRC_MACHINE = 'pornhubpremium'


No, should be pornhub. Auth should work for non premium site as well.

dstftw · 2019-07-13T19:13:59Z

youtube_dl/extractor/pornhub.py

        'info_dict': {
-            'id': 'ph5af5fef7c2aa7',
+            'id': 'ph5a73f8c84d1a9',


Remove all unrelated changes.

twaddington · 2019-08-17T21:59:20Z

youtube_dl/extractor/pornhub.py

    _VALID_URL = r'''(?x)
                    https?://
                        (?:
-                            (?:[^/]+\.)?(?P<host>pornhub\.(?:com|net))/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)|
+                            (?:[^/]+\.)?(?P<host>(?:pornhub|pornhubpremium)\.(?:com|net))/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)|


This could be simplified as:

P<host>pornhub(?:premium)?\.

fauresystems added 2 commits June 14, 2019 12:41

Add pornhubpremium.py

30c4a21

Add yourextractor.py

Add PornHubPremium to pornhub.py

e9821a2

dstftw added the pending-fixes label Jun 17, 2019

fauresystems added 2 commits June 18, 2019 07:30

Cleanup whilt testing

92d111c

Cleanup

fauresystems added 2 commits June 18, 2019 10:11

Delete pornhub - Copie.py

9bccd2f

Cleanup

Remove print(info_dict)

07f5ccc

dstftw requested changes Jun 21, 2019

View reviewed changes

dstftw reviewed Jun 21, 2019

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

fauresystems added 3 commits June 22, 2019 09:43

Cleanup unused code

0f2eb32

Resolve changes requested by dstftw

Update .gitignore

6f6db3b

Merge branch 'pornhubpremium' of https://github.com/fauresystems/yout…

0392a82

…ube-dl into pornhubpremium

fauresystems added 2 commits June 23, 2019 07:47

Revert .gitignore commit

a0ddf26

Revert .gitignore commit

Complet reverted commit

0eb785f

Maybe I am no good at github! But I am a work in progress

Update pornhub.py

72fb36c

Added credentials

Delete test_fork.py

7651816

Remove creds from pornhub.py

d4bca8a

Remove credentials from tests

dstftw requested changes Jul 13, 2019

View reviewed changes

twaddington reviewed Aug 17, 2019

View reviewed changes

dstftw closed this in e22ff4e Feb 3, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pornhubpremium #21416

Pornhubpremium #21416

fauresystems commented Jun 16, 2019 •

edited

Loading

fauresystems commented Jun 18, 2019

fauresystems commented Jun 19, 2019

fauresystems commented Jun 22, 2019 via email

fauresystems commented Jun 23, 2019

fauresystems commented Jun 23, 2019

dstftw commented Jun 23, 2019

fauresystems commented Jun 23, 2019

fauresystems commented Jun 23, 2019

fauresystems commented Jun 24, 2019 via email

fauresystems commented Jun 25, 2019

fauresystems commented Jun 27, 2019

fauresystems commented Jun 30, 2019

fauresystems commented Jul 13, 2019 via email

dstftw Jul 13, 2019

dstftw Jul 13, 2019

dstftw Jul 13, 2019

dstftw Jul 13, 2019

twaddington Aug 17, 2019 •

edited

Loading

Pornhubpremium #21416

Pornhubpremium #21416

Conversation

fauresystems commented Jun 16, 2019 • edited Loading

Please follow the guide below

Before submitting a pull request make sure you have:

In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under Unlicense. Check one of the following options:

What is the purpose of your pull request?

Description of your pull request and other information

fauresystems commented Jun 18, 2019

fauresystems commented Jun 19, 2019

fauresystems commented Jun 22, 2019 via email

fauresystems commented Jun 23, 2019

fauresystems commented Jun 23, 2019

dstftw commented Jun 23, 2019

fauresystems commented Jun 23, 2019

fauresystems commented Jun 23, 2019

fauresystems commented Jun 24, 2019 via email

fauresystems commented Jun 25, 2019

fauresystems commented Jun 27, 2019

fauresystems commented Jun 30, 2019

fauresystems commented Jul 13, 2019 via email

dstftw Jul 13, 2019

Choose a reason for hiding this comment

dstftw Jul 13, 2019

Choose a reason for hiding this comment

dstftw Jul 13, 2019

Choose a reason for hiding this comment

dstftw Jul 13, 2019

Choose a reason for hiding this comment

twaddington Aug 17, 2019 • edited Loading

Choose a reason for hiding this comment

fauresystems commented Jun 16, 2019 •

edited

Loading

twaddington Aug 17, 2019 •

edited

Loading