Browse Source

Convert youtu.be links to youtube.com

merge-requests/55/head
Deimos 6 years ago
parent
commit
f8cd7bdba8
  1. 8
      tildes/tests/test_url_transform.py
  2. 35
      tildes/tildes/lib/url_transform.py

8
tildes/tests/test_url_transform.py

@ -59,3 +59,11 @@ def test_wikipedia_mobile_homepage_not_converted():
# check both with and without a trailing slash # check both with and without a trailing slash
for test_url in (url, url + "/"): for test_url in (url, url + "/"):
assert apply_url_transformations(test_url) == test_url assert apply_url_transformations(test_url) == test_url
def test_youtube_unshortened():
"""Ensure that a youtu.be link is converted to a youtube.com one."""
url = "https://youtu.be/YbJOTdZBX1g?t=1"
transformed_url = apply_url_transformations(url)
assert transformed_url == "https://www.youtube.com/watch?v=YbJOTdZBX1g&t=1"

35
tildes/tildes/lib/url_transform.py

@ -6,7 +6,14 @@
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from collections import Counter from collections import Counter
import logging import logging
from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
from urllib.parse import (
ParseResult,
parse_qs,
parse_qsl,
urlencode,
urlparse,
urlunparse,
)
class UrlTransformationLoopError(Exception): class UrlTransformationLoopError(Exception):
@ -168,3 +175,29 @@ class WikipediaMobileConverter(UrlTransformer):
"""Apply the actual transformation process to the url.""" """Apply the actual transformation process to the url."""
new_domain = parsed_url.hostname.replace(".m.wikipedia.org", ".wikipedia.org") new_domain = parsed_url.hostname.replace(".m.wikipedia.org", ".wikipedia.org")
return parsed_url._replace(netloc=new_domain) return parsed_url._replace(netloc=new_domain)
class YoutubeUnshortener(UrlTransformer):
"""Converts youtu.be links into youtube.com ones."""
@classmethod
def is_applicable(cls, parsed_url: ParseResult) -> bool:
"""Return whether this transformation should be applied to the url."""
return parsed_url.hostname == "youtu.be" and has_path(parsed_url)
@classmethod
def apply_transformation(cls, parsed_url: ParseResult) -> ParseResult:
"""Apply the actual transformation process to the url.
This converts a url like https://youtu.be/asdf to
https://www.youtube.com/watch?v=asdf (and retains any other query params).
"""
video_id = parsed_url.path.strip("/")
# use parse_qsl() and insert() here so the v= is always the first query param
query_params = parse_qsl(parsed_url.query)
query_params.insert(0, ("v", video_id))
return parsed_url._replace(
netloc="www.youtube.com", path="/watch", query=urlencode(query_params)
)
Loading…
Cancel
Save