diff --git a/VERSION b/VERSION index 29ccd4d0..fe91d61d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop149 +1.18.3-develop150 diff --git a/defaults/both/universe.yml b/defaults/both/universe.yml index 1ce9b77c..c1b6e032 100644 --- a/defaults/both/universe.yml +++ b/defaults/both/universe.yml @@ -16,13 +16,14 @@ translations: templates: universe: conditionals: - my_mdblist_list: + mdblist_list: conditions: - - trakt_list.exists: false - imdb_list.exists: false + - trakt_list_<>.exists: false + imdb_list_<>.exists: false + mdblist_list_<>.exists: false value: <> default: - mdblist_list_<>: <> + mdblist_list_<>: <> name_mapping_<>: <> minimum_items: 2 optional: diff --git a/docs/_static/custom.css b/docs/_static/custom.css index a4144508..5f362388 100644 --- a/docs/_static/custom.css +++ b/docs/_static/custom.css @@ -379,6 +379,38 @@ table.clearTable, table.clearTable tbody, table.clearTable tr, table.clearTable table.dualTable td, table.dualTable th { padding-left: 15px !important; } +.image-accordion { + background-color: #eee; + color: #444; + cursor: pointer; + padding: 18px; + width: 100%; + border: none; + text-align: left; + outline: none; + font-size: 15px; + transition: 0.4s; +} +.image-active, .image-accordion:hover { + background-color: #ccc; +} +.image-panel { + padding: 0 18px; + background-color: white; + max-height: 0; + overflow: hidden; + transition: max-height 0.2s ease-out; +} +.image-accordion:after { + content: '\02795'; /* Unicode character for "plus" sign (+) */ + font-size: 13px; + color: #777; + float: right; + margin-left: 5px; +} +.image-active:after { + content: "\2796"; /* Unicode character for "minus" sign (-) */ +} table.image-table { margin-top: 5px; margin-bottom: 5px; @@ -386,7 +418,7 @@ table.image-table { border-collapse: separate; } table.image-table td { - padding: 15px + padding: 15px; text-align: center; background-color: #1D1D1D } diff --git a/docs/home/test.md b/docs/home/test.md index 76bc795e..f8af1b17 100644 --- a/docs/home/test.md +++ b/docs/home/test.md @@ -1,6 +1,22 @@ diff --git a/modules/meta.py b/modules/meta.py index 4decccab..53f11ee3 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -399,6 +399,7 @@ class DataFile: error_text = "- does not exist" elif var_key[:-7] in variables and variables[var_key[:-7]]: error_text = "- exists" + con_var_value = var_key[:-7] elif var_key.endswith(".not"): if var_key[:-4] in variables: con_var_value = variables[var_key[:-4]] @@ -422,7 +423,7 @@ class DataFile: logger.trace(f'Condition {i} Failed: {var_key}{error_text}') condition_passed = False if condition_passed: - logger.debug(f'Conditional Variable: {final_key} is "{condition["value"]}"') + logger.trace(f'Conditional Variable: {final_key} is "{condition["value"]}"') condition_found = True if condition["value"] is not None: variables[final_key] = condition["value"] @@ -432,11 +433,11 @@ class DataFile: break if not condition_found: if "default" in con_value: - logger.debug(f'Conditional Variable: {final_key} defaults to "{con_value["default"]}"') + logger.trace(f'Conditional Variable: {final_key} defaults to "{con_value["default"]}"') variables[final_key] = con_value["default"] variables[f"{final_key}_encoded"] = util.quote(con_value["default"]) else: - logger.debug(f"Conditional Variable: {final_key} added as optional variable") + logger.trace(f"Conditional Variable: {final_key} added as optional variable") optional.append(str(final_key)) optional.append(f"{final_key}_encoded")