OpenSourceArk/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-06-14 11:52:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5759 from kamilkrzyskow/social-patch2

Browse Source 
Social plugin maintenance for MkDocs 1.5.0
This commit is contained in:
Martin Donath 2023-07-27 09:40:23 +02:00 committed by GitHub
commit 772421d16d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
material/plugins/social/plugin.py
View File

@ -78,7 +78,6 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
def __init__(self): def __init__(self):
self._executor = concurrent.futures.ThreadPoolExecutor(4) self._executor = concurrent.futures.ThreadPoolExecutor(4)
self.custom_dir = None
# Retrieve configuration # Retrieve configuration
def on_config(self, config): def on_config(self, config):
@ -145,13 +144,6 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
"text": options.get("color", self.color["text"]) "text": options.get("color", self.color["text"])
} }
# Retrieve custom_dir path
for user_config in config.user_configs:
custom_dir = user_config.get("theme", {}).get("custom_dir")
if custom_dir:
self.custom_dir = custom_dir
break
# Retrieve logo and font # Retrieve logo and font
self._resized_logo_promise = self._executor.submit(self._load_resized_logo, config) self._resized_logo_promise = self._executor.submit(self._load_resized_logo, config)
self.font = self._load_font(config) self.font = self._load_font(config)
@ -403,8 +395,8 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
path = os.path.join(config.docs_dir, theme["logo"]) path = os.path.join(config.docs_dir, theme["logo"])
# Allow users to put the logo inside their custom_dir (theme["logo"] case) # Allow users to put the logo inside their custom_dir (theme["logo"] case)
if self.custom_dir: if theme.custom_dir:
custom_dir_logo = os.path.join(self.custom_dir, theme["logo"]) custom_dir_logo = os.path.join(theme.custom_dir, theme["logo"])
if os.path.exists(custom_dir_logo): if os.path.exists(custom_dir_logo):
path = custom_dir_logo path = custom_dir_logo
@ -431,8 +423,8 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
path = f"{base}/.icons/{logo}.svg" path = f"{base}/.icons/{logo}.svg"
# Allow users to put the logo inside their custom_dir (theme["icon"]["logo"] case) # Allow users to put the logo inside their custom_dir (theme["icon"]["logo"] case)
if self.custom_dir: if theme.custom_dir:
custom_dir_logo = os.path.join(self.custom_dir, ".icons", f"{logo}.svg") custom_dir_logo = os.path.join(theme.custom_dir, ".icons", f"{logo}.svg")
if os.path.exists(custom_dir_logo): if os.path.exists(custom_dir_logo):
path = custom_dir_logo path = custom_dir_logo

16
src/plugins/social/plugin.py
View File

@ -78,7 +78,6 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
def __init__(self): def __init__(self):
self._executor = concurrent.futures.ThreadPoolExecutor(4) self._executor = concurrent.futures.ThreadPoolExecutor(4)
self.custom_dir = None
# Retrieve configuration # Retrieve configuration
def on_config(self, config): def on_config(self, config):
@ -145,13 +144,6 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
"text": options.get("color", self.color["text"]) "text": options.get("color", self.color["text"])
} }
# Retrieve custom_dir path
for user_config in config.user_configs:
custom_dir = user_config.get("theme", {}).get("custom_dir")
if custom_dir:
self.custom_dir = custom_dir
break
# Retrieve logo and font # Retrieve logo and font
self._resized_logo_promise = self._executor.submit(self._load_resized_logo, config) self._resized_logo_promise = self._executor.submit(self._load_resized_logo, config)
self.font = self._load_font(config) self.font = self._load_font(config)
@ -403,8 +395,8 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
path = os.path.join(config.docs_dir, theme["logo"]) path = os.path.join(config.docs_dir, theme["logo"])
# Allow users to put the logo inside their custom_dir (theme["logo"] case) # Allow users to put the logo inside their custom_dir (theme["logo"] case)
if self.custom_dir: if theme.custom_dir:
custom_dir_logo = os.path.join(self.custom_dir, theme["logo"]) custom_dir_logo = os.path.join(theme.custom_dir, theme["logo"])
if os.path.exists(custom_dir_logo): if os.path.exists(custom_dir_logo):
path = custom_dir_logo path = custom_dir_logo
@ -431,8 +423,8 @@ class SocialPlugin(BasePlugin[SocialPluginConfig]):
path = f"{base}/.icons/{logo}.svg" path = f"{base}/.icons/{logo}.svg"
# Allow users to put the logo inside their custom_dir (theme["icon"]["logo"] case) # Allow users to put the logo inside their custom_dir (theme["icon"]["logo"] case)
if self.custom_dir: if theme.custom_dir:
custom_dir_logo = os.path.join(self.custom_dir, ".icons", f"{logo}.svg") custom_dir_logo = os.path.join(theme.custom_dir, ".icons", f"{logo}.svg")
if os.path.exists(custom_dir_logo): if os.path.exists(custom_dir_logo):
path = custom_dir_logo path = custom_dir_logo