[154] change image_path to image_sets

pull/1351/head
meisnate12 2 years ago
parent b7f50a76ff
commit fd232a3e0a

@ -1 +1 @@
1.18.3-develop153 1.18.3-develop154

@ -391,6 +391,11 @@ table.dualTable td, table.dualTable th {
background-color: #181818; background-color: #181818;
border-radius: 10px; border-radius: 10px;
margin: 0 5px 5px 0; margin: 0 5px 5px 0;
text-align: center;
line-height: 20px;
}
.images-inline-link {
font-size: 60%;
} }
.image-accordion { .image-accordion {
border-radius: 15px; border-radius: 15px;
@ -404,7 +409,7 @@ table.dualTable td, table.dualTable th {
outline: none; outline: none;
font-size: 20px; font-size: 20px;
transition: 0.4s; transition: 0.4s;
margin: 15px 0 0 0; margin: 5px 0 0 0;
} }
.image-active { .image-active {
border-radius: 15px 15px 0 0 !important; border-radius: 15px 15px 0 0 !important;
@ -419,6 +424,8 @@ table.dualTable td, table.dualTable th {
overflow: auto hidden; overflow: auto hidden;
border-radius: 0 0 15px 15px; border-radius: 0 0 15px 15px;
transition: max-height 0.2s ease-out; transition: max-height 0.2s ease-out;
padding-left: 10px;
padding-right: 10px;
} }
.image-accordion:after { .image-accordion:after {
content: '\25BC'; content: '\25BC';
@ -439,7 +446,8 @@ table.image-table div {
border-radius: 15px; border-radius: 15px;
padding: 10px 10px 0 10px; padding: 10px 10px 0 10px;
text-align: center; text-align: center;
background-color: #1D1D1D background-color: #1D1D1D;
line-height: 15px;
} }
table.image-table td:last-child div { table.image-table td:last-child div {
margin: 0; margin: 0;

@ -11,10 +11,10 @@ $(document).ready(function(){
panel.style.maxHeight = parseInt(panel.scrollHeight) + 10 + "px"; panel.style.maxHeight = parseInt(panel.scrollHeight) + 10 + "px";
parent.style.maxHeight = parseInt(parent.style.maxHeight) + panel.scrollHeight + "px"; parent.style.maxHeight = parseInt(parent.style.maxHeight) + panel.scrollHeight + "px";
} }
if (panel.style.padding) { if (panel.style.paddingBottom) {
panel.style.padding = null; panel.style.paddingBottom = null;
} else { } else {
panel.style.padding = "0 10px 10px 10px" panel.style.paddingBottom = "10px";
} }
}); });
}); });

@ -895,15 +895,15 @@ class ConfigFile:
except Failed as e: except Failed as e:
logger.error(e) logger.error(e)
params["images_path"] = [] params["image_sets"] = []
try: try:
if lib and "images_path" in lib: if lib and "image_sets" in lib:
if not lib["images_path"]: if not lib["image_sets"]:
raise Failed("Config Error: images_path attribute is blank") raise Failed("Config Error: image_sets attribute is blank")
files = util.load_files(lib["images_path"], "images_path") files = util.load_files(lib["image_sets"], "image_sets")
if not files: if not files:
raise Failed("Config Error: No Paths Found for images_path") raise Failed("Config Error: No Paths Found for image_sets")
params["images_path"] = files params["image_sets"] = files
except Failed as e: except Failed as e:
logger.error(e) logger.error(e)

@ -42,7 +42,7 @@ class Library(ABC):
self.original_mapping_name = params["mapping_name"] self.original_mapping_name = params["mapping_name"]
self.metadata_path = params["metadata_path"] self.metadata_path = params["metadata_path"]
self.overlay_path = params["overlay_path"] self.overlay_path = params["overlay_path"]
self.images_path = params["images_path"] self.image_sets = params["image_sets"]
self.skip_library = params["skip_library"] self.skip_library = params["skip_library"]
self.asset_depth = params["asset_depth"] self.asset_depth = params["asset_depth"]
self.asset_directory = params["asset_directory"] if params["asset_directory"] else [] self.asset_directory = params["asset_directory"] if params["asset_directory"] else []
@ -165,7 +165,7 @@ class Library(ABC):
logger.error(e) logger.error(e)
logger.info("Overlay File Failed To Load") logger.info("Overlay File Failed To Load")
if not operations_only and not overlays_only: if not operations_only and not overlays_only:
for file_type, images_file, temp_vars, asset_directory in self.images_path: for file_type, images_file, temp_vars, asset_directory in self.image_sets:
try: try:
images_obj = MetadataFile(self.config, self, file_type, images_file, temp_vars, asset_directory, image_set_file=True) images_obj = MetadataFile(self.config, self, file_type, images_file, temp_vars, asset_directory, image_set_file=True)
self.images_files.append(images_obj) self.images_files.append(images_obj)

Loading…
Cancel
Save