mirror of
https://github.com/meisnate12/Plex-Meta-Manager
synced 2024-11-25 22:10:22 +00:00
[51] add back_align
This commit is contained in:
meisnate12
parent
b6c7677025
commit
145dfd6709
5 changed files with 102 additions and 64 deletions
|
|
@ -1,4 +1,4 @@
|
|||
FROM python:3.9-slim
|
||||
FROM python:3.10-slim
|
||||
ENV TINI_VERSION v0.19.0
|
||||
COPY . /
|
||||
RUN echo "**** install system packages ****" \
|
||||
|
|
@ -8,6 +8,7 @@ RUN echo "**** install system packages ****" \
|
|||
&& apt-get install -y gcc g++ libxml2-dev libxslt-dev libz-dev wget \
|
||||
&& wget -O /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-"$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
|
||||
&& chmod +x /tini \
|
||||
&& RUN apk add jpeg-dev zlib-dev
|
||||
&& pip3 install --no-cache-dir --upgrade --requirement /requirements.txt \
|
||||
&& apt-get --purge autoremove wget gcc g++ libxml2-dev libxslt-dev libz-dev -y \
|
||||
&& apt-get clean \
|
||||
|
|
|
|||
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
|||
1.17.0-develop50
|
||||
1.17.0-develop51
|
||||
|
|
|
|||
|
|
@ -88,12 +88,13 @@ There are many attributes available when using overlays to edit how they work.
|
|||
| `back_color` | Backdrop Color for the Text Overlay.<br>**Value:** Color Hex Code in format `#RGB`, `#RGBA`, `#RRGGBB` or `#RRGGBBAA`. | ❌ |
|
||||
| `back_width` | Backdrop Width for the Text Overlay. If `back_width` is not specified the Backdrop Sizes to the text<br>**`back_height` is required when using `back_width`**<br>**Value:** Integer greater than 0 | ❌ |
|
||||
| `back_height` | Backdrop Height for the Text Overlay. If `back_height` is not specified the Backdrop Sizes to the text<br>**`back_width` is required when using `back_height`**<br>**Value:** Integer greater than 0 | ❌ |
|
||||
| `back_align` | Alignment for the Text Overlay inside the backdrop. If `back_align` is not specified the Backdrop Centers the text<br>**`back_width` and `back_height` are required when using `back_align`**<br>**Values:** `left`, `right`, `center`, `top`, `bottom` | ❌ |
|
||||
| `back_padding` | Backdrop Padding for the Text Overlay.<br>**Value:** Integer greater than 0 | ❌ |
|
||||
| `back_radius` | Backdrop Radius for the Text Overlay.<br>**Value:** Integer greater than 0 | ❌ |
|
||||
| `back_line_color` | Backdrop Line Color for the Text Overlay.<br>**Value:** Color Hex Code in format `#RGB`, `#RGBA`, `#RRGGBB` or `#RRGGBBAA`. | ❌ |
|
||||
| `back_line_width` | Backdrop Line Width for the Text Overlay.<br>**Value:** Integer greater than 0 | ❌ |
|
||||
| `addon_offset` | Text Addon Image Offset from the text.<br>**`addon_offset` Only works with text overlays**<br>**Value:** Integer 0 or greater | ❌ |
|
||||
| `addon_align` | Text Addon Image Alignment in relation to the text.<br>**`addon_align` Only works with text overlays**<br>**Values:** `left`, `right`, `top`, `bottom` | ❌ |
|
||||
| `addon_position` | Text Addon Image Alignment in relation to the text.<br>**`addon_position` Only works with text overlays**<br>**Values:** `left`, `right`, `top`, `bottom` | ❌ |
|
||||
|
||||
* If `url`, `git`, and `repo` are all not defined then PMM will look in your `config/overlays` folder for a `.png` file named the same as the `name` attribute.
|
||||
|
||||
|
|
@ -178,7 +179,7 @@ overlays:
|
|||
```
|
||||
|
||||
You can add an image to accompany the text by specifying the image location using `file`, `url`, `git`, or `repo`.
|
||||
Then you can use `addon_offset` to control the space between the text and the image and `addon_align` to control which side of the text the image will be
|
||||
Then you can use `addon_offset` to control the space between the text and the image and `addon_position` to control which side of the text the image will be
|
||||
|
||||
```yaml
|
||||
overlays:
|
||||
|
|
@ -196,8 +197,8 @@ overlays:
|
|||
back_radius: 30
|
||||
back_width: 300
|
||||
back_height: 105
|
||||
git: PMM/overlay/images/raw/IMDB_Rating
|
||||
addon_align: left
|
||||
git: PMM/overlays/images/raw/IMDB_Rating
|
||||
addon_position: left
|
||||
addon_offset: 25
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -61,13 +61,12 @@ class MyAnimeList:
|
|||
if not self._save(self.authorization):
|
||||
if not self._refresh():
|
||||
self._authorization()
|
||||
self._genres = None
|
||||
self._studios = None
|
||||
self._genres = {}
|
||||
self._studios = {}
|
||||
|
||||
@property
|
||||
def genres(self):
|
||||
if not self._genres:
|
||||
self._genres = {}
|
||||
for data in self._jiken_request("genres/anime")["data"]:
|
||||
self._genres[data["name"]] = int(data["mal_id"])
|
||||
self._genres[data["name"].lower()] = int(data["mal_id"])
|
||||
|
|
|
|||
147
modules/util.py
147
modules/util.py
|
|
@ -923,8 +923,8 @@ class Overlay:
|
|||
self.font_name = None
|
||||
self.font_size = 36
|
||||
self.font_color = None
|
||||
self.addon_offset = None
|
||||
self.addon_align = None
|
||||
self.addon_offset = 0
|
||||
self.addon_position = None
|
||||
|
||||
logger.debug("")
|
||||
logger.debug("Validating Method: overlay")
|
||||
|
|
@ -962,11 +962,14 @@ class Overlay:
|
|||
self.back_line_width = parse("Overlay", "back_line_width", self.data["back_line_width"], datatype="int", parent="overlay") if "back_line_width" in self.data else None
|
||||
self.back_line_color = color("back_line_color")
|
||||
self.back_padding = parse("Overlay", "back_padding", self.data["back_padding"], datatype="int", parent="overlay", default=0) if "back_padding" in self.data else 0
|
||||
self.back_align = parse("Overlay", "back_align", self.data["back_align"], parent="overlay", default="center", options=["left", "right", "center", "top", "bottom"]) if "back_align" in self.data else "center"
|
||||
self.back_box = None
|
||||
back_width = parse("Overlay", "back_width", self.data["back_width"], datatype="int", parent="overlay", minimum=0) if "back_width" in self.data else -1
|
||||
back_height = parse("Overlay", "back_height", self.data["back_height"], datatype="int", parent="overlay", minimum=0) if "back_height" in self.data else -1
|
||||
if (back_width >= 0 and back_height < 0) or (back_height >= 0 and back_width < 0):
|
||||
raise Failed(f"Overlay Error: overlay attributes back_width and back_height must be used together")
|
||||
if self.back_align != "center" and (back_width < 0 or back_height < 0):
|
||||
raise Failed(f"Overlay Error: overlay attribute back_align only works when back_width and back_height are used")
|
||||
elif back_width >= 0 and back_height >= 0:
|
||||
self.back_box = (back_width, back_height)
|
||||
self.has_back = True if self.back_color or self.back_line_color else False
|
||||
|
|
@ -1020,7 +1023,7 @@ class Overlay:
|
|||
if not os.path.exists(self.path):
|
||||
raise Failed(f"Overlay Error: Text Overlay Addon Image not found at: {self.path}")
|
||||
self.addon_offset = parse("Overlay", "addon_offset", self.data["addon_offset"], datatype="int", parent="overlay") if "addon_offset" in self.data else 0
|
||||
self.addon_align = parse("Overlay", "addon_align", self.data["addon_align"], parent="overlay", options=["left", "right", "top", "bottom"]) if "addon_align" in self.data else "left"
|
||||
self.addon_position = parse("Overlay", "addon_position", self.data["addon_position"], parent="overlay", options=["left", "right", "top", "bottom"]) if "addon_position" in self.data else "left"
|
||||
image_compare = None
|
||||
if self.config.Cache:
|
||||
_, image_compare, _ = self.config.Cache.query_image_map(self.mapping_name, f"{self.library.image_table_name}_overlays")
|
||||
|
|
@ -1089,75 +1092,107 @@ class Overlay:
|
|||
|
||||
def get_backdrop(self, canvas_box, box=None, text=None, new_cords=None):
|
||||
overlay_image = None
|
||||
width = None
|
||||
height = None
|
||||
box_width = None
|
||||
box_height = None
|
||||
text_width = None
|
||||
text_height = None
|
||||
image_width, image_height = box if box else (None, None)
|
||||
if text is not None:
|
||||
_, _, width, height = self.get_text_size(text)
|
||||
if box is not None:
|
||||
box_width, box_height = box
|
||||
if self.addon_align in ["left", "right"]:
|
||||
box = (width + box_width + self.addon_offset, height if height > box_height else box_height)
|
||||
else:
|
||||
box = (width if width > box_width else box_width, height + box_height + self.addon_offset)
|
||||
_, _, text_width, text_height = self.get_text_size(text)
|
||||
if image_width is not None and self.addon_position in ["left", "right"]:
|
||||
box = (text_width + image_width + self.addon_offset, text_height if text_height > image_height else image_height)
|
||||
elif image_width is not None:
|
||||
box = (text_width if text_width > image_width else image_width, text_height + image_height + self.addon_offset)
|
||||
else:
|
||||
box = (width, height)
|
||||
x_cord, y_cord = self.get_coordinates(canvas_box, box, new_cords=new_cords)
|
||||
box = (text_width, text_height)
|
||||
box_width, box_height = box
|
||||
back_width, back_height = self.back_box if self.back_box else (None, None)
|
||||
start_x, start_y = self.get_coordinates(canvas_box, box, new_cords=new_cords)
|
||||
main_x = start_x
|
||||
main_y = start_y
|
||||
if text is not None or self.has_back:
|
||||
overlay_image = Image.new("RGBA", canvas_box, (255, 255, 255, 0))
|
||||
drawing = ImageDraw.Draw(overlay_image)
|
||||
if self.has_back:
|
||||
cords = (
|
||||
x_cord - self.back_padding,
|
||||
y_cord - self.back_padding,
|
||||
x_cord + (self.back_box[0] if self.back_box else box[0]) + self.back_padding,
|
||||
y_cord + (self.back_box[1] if self.back_box else box[1]) + self.back_padding
|
||||
start_x - self.back_padding,
|
||||
start_y - self.back_padding,
|
||||
start_x + (back_width if self.back_box else box_width) + self.back_padding,
|
||||
start_y + (back_height if self.back_box else box_height) + self.back_padding
|
||||
)
|
||||
if self.back_box:
|
||||
x_cord = x_cord + (self.back_box[0] - box[0]) // 2
|
||||
y_cord = y_cord + (self.back_box[1] - box[1]) // 2
|
||||
|
||||
if self.back_radius:
|
||||
drawing.rounded_rectangle(cords, fill=self.back_color, outline=self.back_line_color, width=self.back_line_width, radius=self.back_radius)
|
||||
else:
|
||||
drawing.rectangle(cords, fill=self.back_color, outline=self.back_line_color, width=self.back_line_width)
|
||||
|
||||
a_x_cord = None
|
||||
a_y_cord = None
|
||||
if box_width:
|
||||
if self.addon_align == "left":
|
||||
a_x_cord = x_cord
|
||||
x_cord = a_x_cord + box_width + self.addon_offset
|
||||
elif self.addon_align == "right":
|
||||
a_x_cord = x_cord + box_width + self.addon_offset
|
||||
elif width == box_width:
|
||||
a_x_cord = x_cord
|
||||
elif width < box_width:
|
||||
a_x_cord = x_cord
|
||||
x_cord = x_cord + ((box_width - width) / 2)
|
||||
if self.back_box:
|
||||
if self.back_align == "left":
|
||||
main_x = start_x
|
||||
elif self.back_align == "right":
|
||||
main_x = start_x + back_width - (text_width if text is not None else image_width)
|
||||
elif self.back_align == "top":
|
||||
main_y = start_y
|
||||
elif self.back_align == "bottom":
|
||||
main_y = start_y + back_height - (text_height if text is not None else image_height)
|
||||
else:
|
||||
a_x_cord = x_cord + ((box_width - width) / 2)
|
||||
main_x = start_x + (back_width - box_width) // 2
|
||||
main_y = start_y + (back_height - box_width) // 2
|
||||
|
||||
if self.addon_align == "top":
|
||||
a_y_cord = y_cord
|
||||
y_cord = a_y_cord + box_height + self.addon_offset
|
||||
elif self.addon_align == "bottom":
|
||||
a_y_cord = y_cord + box_height + self.addon_offset
|
||||
elif height == box_height:
|
||||
a_y_cord = y_cord
|
||||
elif height < box_height:
|
||||
a_y_cord = y_cord
|
||||
y_cord = y_cord + ((box_height - height) / 2)
|
||||
addon_x = None
|
||||
addon_y = None
|
||||
if text is not None and image_width:
|
||||
addon_x = main_x
|
||||
addon_y = main_y
|
||||
if self.addon_position == "left":
|
||||
if self.back_align == "left":
|
||||
main_x = start_x + self.addon_offset
|
||||
elif self.back_align == "right":
|
||||
addon_x = start_x + back_width - self.addon_offset
|
||||
else:
|
||||
main_x = addon_x + image_width + self.addon_offset
|
||||
elif self.addon_position == "right":
|
||||
if self.back_align == "left":
|
||||
addon_x = start_x + self.addon_offset
|
||||
elif self.back_align == "right":
|
||||
addon_x = start_x + back_width - image_width
|
||||
main_x = start_x + back_width - self.addon_offset
|
||||
else:
|
||||
addon_x = main_x + text_width + self.addon_offset
|
||||
elif text_width == image_width:
|
||||
addon_x = main_x
|
||||
elif text_width < image_width:
|
||||
addon_x = main_x
|
||||
main_x = main_x + ((image_width - text_width) / 2)
|
||||
else:
|
||||
a_y_cord = y_cord + ((box_height - height) / 2)
|
||||
addon_x = main_x + ((image_width - text_width) / 2)
|
||||
|
||||
if self.addon_position == "top":
|
||||
if self.back_align == "top":
|
||||
main_y = start_y + self.addon_offset
|
||||
elif self.back_align == "bottom":
|
||||
addon_y = start_y + back_height - self.addon_offset
|
||||
else:
|
||||
main_y = addon_y + image_height + self.addon_offset
|
||||
elif self.addon_position == "bottom":
|
||||
if self.back_align == "top":
|
||||
addon_y = start_y + self.addon_offset
|
||||
elif self.back_align == "bottom":
|
||||
addon_y = start_y + back_height - image_height
|
||||
main_y = start_y + back_height - self.addon_offset
|
||||
else:
|
||||
addon_y = main_y + text_height + self.addon_offset
|
||||
elif text_height == image_height:
|
||||
addon_y = main_y
|
||||
elif text_height < image_height:
|
||||
addon_y = main_y
|
||||
main_y = main_y + ((image_height - text_height) / 2)
|
||||
else:
|
||||
addon_y = main_y + ((image_height - text_height) / 2)
|
||||
|
||||
if text is not None:
|
||||
drawing.text((x_cord, y_cord), text, font=self.font, fill=self.font_color, anchor="lt")
|
||||
if a_x_cord is not None:
|
||||
x_cord = a_x_cord
|
||||
y_cord = a_y_cord
|
||||
return overlay_image, (x_cord, y_cord)
|
||||
drawing.text((main_x, main_y), text, font=self.font, fill=self.font_color, anchor="lt")
|
||||
if addon_x is not None:
|
||||
main_x = addon_x
|
||||
main_y = addon_y
|
||||
return overlay_image, (main_x, main_y)
|
||||
|
||||
def get_overlay_compare(self):
|
||||
output = f"{self.mapping_name}|{self.name}"
|
||||
|
|
@ -1169,7 +1204,9 @@ class Overlay:
|
|||
output += f"{self.font_name}{self.font_size}"
|
||||
if self.back_box:
|
||||
output += f"{self.back_box[0]}{self.back_box[1]}"
|
||||
for value in [self.addon_align, self.addon_offset, self.font_color, self.back_color, self.back_radius, self.back_padding, self.back_line_color, self.back_line_width]:
|
||||
if self.addon_position is not None:
|
||||
output += f"{self.addon_position}{self.addon_offset}"
|
||||
for value in [self.font_color, self.back_color, self.back_radius, self.back_padding, self.back_line_color, self.back_line_width]:
|
||||
if value is not None:
|
||||
output += f"{value}"
|
||||
return output
|
||||
|
|
|
|||
Loading…
Reference in a new issue