github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace old %-formatted and .format(…) strings with f-strings (#7671)

Browse Source 
mostly using flynt
https://github.com/ikamensh/flynt
This commit is contained in:
Mike Fährmann
2025-06-28 19:36:16 +02:00
parent f77e98b57d
commit 9dbe33b6de
167 changed files with 756 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gallery_dl/extractor/imagefap.py
View File

@@ -49,7 +49,7 @@ class ImagefapGalleryExtractor(ImagefapExtractor):
self.image_id = ""
def items(self):
url = "{}/gallery/{}".format(self.root, self.gid)
url = f"{self.root}/gallery/{self.gid}"
page = self.request(url).text
data = self.get_job_metadata(page)
yield Message.Directory, data
@@ -81,12 +81,12 @@ class ImagefapGalleryExtractor(ImagefapExtractor):
def get_images(self):
"""Collect image-urls and -metadata"""
url = "{}/photo/{}/".format(self.root, self.image_id)
url = f"{self.root}/photo/{self.image_id}/"
params = {"gid": self.gid, "idx": 0, "partial": "true"}
headers = {
"Content-Type": "application/x-www-form-urlencoded",
"X-Requested-With": "XMLHttpRequest",
"Referer": "{}?pgid=&gid={}&page=0".format(url, self.image_id)
"Referer": f"{url}?pgid=&gid={self.image_id}&page=0"
}
num = 0
@@ -124,7 +124,7 @@ class ImagefapImageExtractor(ImagefapExtractor):
yield Message.Url, url, data
def get_image(self):
url = "{}/photo/{}/".format(self.root, self.image_id)
url = f"{self.root}/photo/{self.image_id}/"
page = self.request(url).text
url, pos = text.extract(
@@ -161,7 +161,7 @@ class ImagefapFolderExtractor(ImagefapExtractor):
def items(self):
for gallery_id, name, folder in self.galleries(self.folder_id):
url = "{}/gallery/{}".format(self.root, gallery_id)
url = f"{self.root}/gallery/{gallery_id}"
data = {
"gallery_id": gallery_id,
"title" : text.unescape(name),
@@ -175,14 +175,13 @@ class ImagefapFolderExtractor(ImagefapExtractor):
if folder_id == "-1":
folder_name = "Uncategorized"
if self._id:
url = "{}/usergallery.php?userid={}&folderid=-1".format(
self.root, self.user)
url = (f"{self.root}/usergallery.php"
f"?userid={self.user}&folderid=-1")
else:
url = "{}/profile/{}/galleries?folderid=-1".format(
self.root, self.user)
url = f"{self.root}/profile/{self.user}/galleries?folderid=-1"
else:
folder_name = None
url = "{}/organizer/{}/".format(self.root, folder_id)
url = f"{self.root}/organizer/{folder_id}/"
params = {"page": 0}
extr = text.extract_from(self.request(url, params=params).text)
@@ -222,19 +221,17 @@ class ImagefapUserExtractor(ImagefapExtractor):
for folder_id in self.folders():
if folder_id == "-1":
url = "{}/profile/{}/galleries?folderid=-1".format(
self.root, self.user)
url = f"{self.root}/profile/{self.user}/galleries?folderid=-1"
else:
url = "{}/organizer/{}/".format(self.root, folder_id)
url = f"{self.root}/organizer/{folder_id}/"
yield Message.Queue, url, data
def folders(self):
"""Return a list of folder IDs of a user"""
if self.user:
url = "{}/profile/{}/galleries".format(self.root, self.user)
url = f"{self.root}/profile/{self.user}/galleries"
else:
url = "{}/usergallery.php?userid={}".format(
self.root, self.user_id)
url = f"{self.root}/usergallery.php?userid={self.user_id}"
response = self.request(url)
self.user = response.url.split("/")[-2]