Plex
/
Plex-Meta-Manager
mirror of https://github.com/meisnate12/Plex-Meta-Manager.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[155] remove default in styles

Browse Source
pull/1351/head
meisnate12 2 years ago
parent fd232a3e0a
commit de6ba1dd1e
4 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
VERSION
Unescape View File

@ -1 +1 @@
1.18.3-develop154 1.18.3-develop155

2
docs/_static/custom.css vendored
Unescape View File

@ -394,7 +394,7 @@ table.dualTable td, table.dualTable th {
text-align: center; text-align: center;
line-height: 20px; line-height: 20px;
} }
.images-inline-link { .images-inline-link code {
font-size: 60%; font-size: 60%;
} }
.image-accordion { .image-accordion {

3
docs/home/test.md
Unescape View File

@ -21,4 +21,7 @@ $(document).ready(function(){
}); });
</script> </script>
```{title} Movies
```
<div id="bing"></div> <div id="bing"></div>

90
modules/meta.py
Unescape View File

@ -660,47 +660,51 @@ class MetadataFile(DataFile):
self.update_episodes = util.parse("Images", "update_episodes", self.temp_vars, datatype="bool", methods=methods, default=True) self.update_episodes = util.parse("Images", "update_episodes", self.temp_vars, datatype="bool", methods=methods, default=True)
logger.info(f"Update Episodes: {self.update_episodes}") logger.info(f"Update Episodes: {self.update_episodes}")
item_attr = "movies" if self.library.is_movie else "shows" item_attr = "movies" if self.library.is_movie else "shows"
for set_key, set_data in get_dict("sections", data).items(): for section_key, section_data in get_dict("sections", data).items():
if not isinstance(set_data, dict): if not isinstance(section_data, dict):
raise Failed("Image Set Error: Set Data must be a dictionary") raise Failed("Image Set Error: Section Data must be a dictionary")
elif "builders" not in set_data or not set_data["builders"]: if "builders" not in section_data or not section_data["builders"]:
logger.trace(f"Skipping No Builder for Section: {set_key}") logger.trace(f"Skipping No Builder for Section: {section_key}")
continue continue
elif item_attr not in set_data: elif item_attr not in section_data:
raise Failed(f"Set Data must have the {item_attr} attribute") raise Failed(f"Section Data must have the {item_attr} attribute")
elif not set_data[item_attr]: elif not section_data[item_attr]:
raise Failed(f"Set Data attribute {item_attr} is empty") raise Failed(f"Section Data attribute {item_attr} is empty")
elif "styles" not in set_data: elif "styles" not in section_data:
raise Failed("Image Set Error: Set Data must have the styles attribute") raise Failed("Image Section Error: Section Data must have the styles attribute")
styles = util.parse("Set Data", "styles", set_data["styles"], datatype="dictlist") styles = util.parse("Section Data", "styles", section_data["styles"], datatype="dictlist")
if "default" not in styles or not styles["default"]: if not styles:
raise Failed("Image Set Error: Set Data styles attribute must have a default") raise Failed("Image Section Error: Section Data styles attribute is empty")
default_style = styles["default"][0] default_style = None
if default_style not in styles: for sk, sv in styles.items():
raise Failed(f"Image Set Error: Set Data styles default style not found. Options: {', '.join([s for s in styles])}") if sv:
default_style = sk
break
if not default_style:
raise Failed(f"Image Section Error: No styles found for section: {section_key}")
use_key = None use_key = None
if f"use_{set_key}" in methods: if f"use_{section_key}" in methods:
use_key = util.parse("Images", f"use_{set_key}", self.temp_vars, datatype="bool",methods=methods, default=False) use_key = util.parse("Images", f"use_{section_key}", self.temp_vars, datatype="bool",methods=methods, default=False)
logger.info(f"Use {set_key}: {use_key}") logger.info(f"Use {section_key}: {use_key}")
if use_key is False: if use_key is False:
logger.trace(f"Skipped as use_{set_key} is false") logger.trace(f"Skipped as use_{section_key} is false")
continue continue
elif use_all and set_key in exclude: elif use_all and section_key in exclude:
logger.trace(f"Skipped as {set_key} is in the exclude list") logger.trace(f"Skipped as {section_key} is in the exclude list")
continue continue
elif not use_all and use_key is None and set_key not in include: elif not use_all and use_key is None and section_key not in include:
logger.trace(f"Skipped as use_all is false and use_{set_key} is not set{f' and {set_key} not in the include list' if include else ''}") logger.trace(f"Skipped as use_all is false and use_{section_key} is not set{f' and {section_key} not in the include list' if include else ''}")
continue continue
prioritized_style = None prioritized_style = None
for ps in self.style_priority: for ps in self.style_priority:
if ps in styles: if ps in styles:
prioritized_style = ps prioritized_style = ps
break break
if f"style_{set_key}" in methods: if f"style_{section_key}" in methods:
style_key = util.parse("Images", f"style_{set_key}", self.temp_vars, methods=methods, default=default_style) style_key = util.parse("Images", f"style_{section_key}", self.temp_vars, methods=methods, default=default_style)
logger.info(f"Style {set_key}: {style_key}") logger.info(f"Style {section_key}: {style_key}")
if style_key not in styles: if style_key not in styles:
p_warning = f"Image Set Warning: {set_key} has no style: {style_key} using" p_warning = f"Image Section Warning: {section_key} has no style: {style_key} using"
if prioritized_style: if prioritized_style:
logger.warning(f"{p_warning} Prioritized Style: {prioritized_style}") logger.warning(f"{p_warning} Prioritized Style: {prioritized_style}")
style_key = prioritized_style style_key = prioritized_style
@ -712,13 +716,13 @@ class MetadataFile(DataFile):
style_key = prioritized_style style_key = prioritized_style
else: else:
style_key = default_style style_key = default_style
if self.update_collections and "collections" in set_data and set_data["collections"]: if self.update_collections and "collections" in section_data and section_data["collections"]:
self.set_collections[set_key] = set_data["collections"] self.set_collections[section_key] = section_data["collections"]
if f"style_file_{set_key}" in methods: if f"style_file_{section_key}" in methods:
style_file = self.temp_vars[methods[f"style_file_{set_key}"]] style_file = self.temp_vars[methods[f"style_file_{section_key}"]]
elif not styles[style_key]: elif not styles[style_key]:
style_file = [{"pmm": f"{set_key}/{style_key}"}] style_file = [{"pmm": f"{section_key}/{style_key}"}]
else: else:
style_file = styles[style_key] style_file = styles[style_key]
if not style_file: if not style_file:
@ -728,18 +732,18 @@ class MetadataFile(DataFile):
raise Failed("Image Style Error: style file call attribute is not a dictionary") raise Failed("Image Style Error: style file call attribute is not a dictionary")
elif not style_dict: elif not style_dict:
raise Failed("Image Style Error: style file call attribute dictionary is empty") raise Failed("Image Style Error: style file call attribute dictionary is empty")
style_data = self.get_style_data(style_dict, set_key, items_data=set_data[item_attr]) style_data = self.get_style_data(style_dict, section_key, items_data=section_data[item_attr])
for item_name, item_data in set_data[item_attr].items(): for item_name, item_data in section_data[item_attr].items():
if item_name not in style_data or not style_data[item_name]: if item_name not in style_data or not style_data[item_name]:
continue continue
if isinstance(item_data, dict): if isinstance(item_data, dict):
if "mapping_id" not in item_data: if "mapping_id" not in item_data:
raise Failed(f"Image Set Error: {set_key}: {item_name}: No mapping ID found") raise Failed(f"Image Section Error: {section_key}: {item_name}: No mapping ID found")
meta_data = item_data meta_data = item_data
else: else:
meta_data = {"mapping_id": item_data} meta_data = {"mapping_id": item_data}
meta_data["style_data"] = style_data[item_name] meta_data["style_data"] = style_data[item_name]
meta_data["set_key"] = set_key meta_data["section_key"] = section_key
meta_data["style_key"] = style_key meta_data["style_key"] = style_key
if "seasons" in style_data[item_name] and style_data[item_name]["seasons"]: if "seasons" in style_data[item_name] and style_data[item_name]["seasons"]:
season_dict = {} season_dict = {}
@ -1224,7 +1228,7 @@ class MetadataFile(DataFile):
logger.info("") logger.info("")
logger.info(f"Metadata File Loaded Successfully") logger.info(f"Metadata File Loaded Successfully")
def get_style_data(self, style_file, set_key, items_data=None): def get_style_data(self, style_file, section_key, items_data=None):
style_id = "" style_id = ""
for k, v in style_file.items(): for k, v in style_file.items():
style_id = f"{k}: {v}" style_id = f"{k}: {v}"
@ -1319,9 +1323,9 @@ class MetadataFile(DataFile):
self.library.image_styles[style_id] = style_data self.library.image_styles[style_id] = style_data
if set_key and set_key in self.set_collections and "collections" in top_tree: if section_key and section_key in self.set_collections and "collections" in top_tree:
collections_folder = self.config.GitHub.get_tree(top_tree["collections"]["url"]) collections_folder = self.config.GitHub.get_tree(top_tree["collections"]["url"])
for k, alts in self.set_collections[set_key].items(): for k, alts in self.set_collections[section_key].items():
if k in collections_folder: if k in collections_folder:
collection_data = init_set(f"collections/{k}", self.config.GitHub.get_tree(collections_folder[k]["url"])) collection_data = init_set(f"collections/{k}", self.config.GitHub.get_tree(collections_folder[k]["url"]))
self.library.collection_images[k] = collection_data self.library.collection_images[k] = collection_data
@ -1343,8 +1347,8 @@ class MetadataFile(DataFile):
if not isinstance(temp_data[item_attr], dict): if not isinstance(temp_data[item_attr], dict):
raise Failed(f"Image Style Error: {item_attr} attribute must be a dictionary") raise Failed(f"Image Style Error: {item_attr} attribute must be a dictionary")
self.library.image_styles[style_id] = temp_data[item_attr] self.library.image_styles[style_id] = temp_data[item_attr]
if set_key and set_key in self.set_collections and "collections" in temp_data and temp_data["collections"]: if section_key and section_key in self.set_collections and "collections" in temp_data and temp_data["collections"]:
for k, alts in self.set_collections[set_key].items(): for k, alts in self.set_collections[section_key].items():
if k in temp_data["collections"]: if k in temp_data["collections"]:
self.library.collection_images[k] = temp_data["collections"][k] self.library.collection_images[k] = temp_data["collections"][k]
if alts: if alts:

Write Preview
Loading…
Cancel
Save