malhuda/social-dl
1
0
Fork 0
mirror of https://github.com/anonymousx97/social-dl.git synced 2025-02-20 11:13:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v2.4.1: Reddit DL hot fix.

Browse Source
This commit is contained in:
anonymousx97 2023-10-23 14:16:41 +05:30
parent b935ccfd2a
commit cdf7ca73df
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/api/reddit.py
View File

@ -4,7 +4,7 @@ import time
from urllib.parse import urlparse from urllib.parse import urlparse
from app.core import shell from app.core import shell
from app.core.aiohttp_tools import get_json, get_type from app.core import aiohttp_tools
from app.core.scraper_config import MediaType, ScraperConfig from app.core.scraper_config import MediaType, ScraperConfig
@ -12,20 +12,15 @@ class Reddit(ScraperConfig):
def __init__(self, url): def __init__(self, url):
super().__init__() super().__init__()
parsed_url = urlparse(url) parsed_url = urlparse(url)
self.url: str = f"https://www.reddit.com{parsed_url.path}.json?limit=1" self.url: str = f"https://www.reddit.com{parsed_url.path}"
async def download_or_extract(self) -> None: async def download_or_extract(self) -> None:
headers: dict = { json_data = await self.get_data()
"user-agent": "Mozilla/5.0 (Macintosh; PPC Mac OS X 10_8_7 rv:5.0; en-US) AppleWebKit/533.31.5 (KHTML, like Gecko) Version/4.0 Safari/533.31.5" if not json_data:
}
response: dict | None = await get_json(
url=self.url, headers=headers, json_=True
)
if not response:
return return
try: try:
json_: dict = response[0]["data"]["children"][0]["data"] json_: dict = json_data[0]["data"]["children"][0]["data"]
except BaseException: except BaseException:
return return
@ -64,7 +59,24 @@ class Reddit(ScraperConfig):
return return
generic: str = json_.get("url_overridden_by_dest", "").strip() generic: str = json_.get("url_overridden_by_dest", "").strip()
self.type: MediaType = get_type(generic) self.type: MediaType = aiohttp_tools.get_type(generic)
if self.type: if self.type:
self.media: str = generic self.media: str = generic
self.success = True self.success = True
async def get_data(self) -> dict | None:
headers: dict = {
"user-agent": "Mozilla/5.0 (Macintosh; PPC Mac OS X 10_8_7 rv:5.0; en-US) AppleWebKit/533.31.5 (KHTML, like Gecko) Version/4.0 Safari/533.31.5"
}
response: dict | None = await aiohttp_tools.get_json(
url=f"{self.url}.json?limit=1", headers=headers, json_=True
)
if not response:
raw_url = (await aiohttp_tools.SESSION.get(self.url)).url # fmt : skip
parsed_url = urlparse(f"{raw_url}")
url: str = f"https://www.reddit.com{parsed_url.path}"
response: dict | None = await aiohttp_tools.get_json(
url=f"{url}.json?limit=1", headers=headers, json_=True
)
return response