Skip to content
Merged

Rgba #287

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [ '3.11', '3.12', '3.13', '3.14-dev' ]
python-version: [ '3.11', '3.12', '3.13', '3.14' ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Install poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: '2.1.4'
poetry-version: '2.2.1'

- name: Install Go
uses: actions/setup-go@v5
Expand All @@ -58,7 +58,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'pnpm'
node-version: '22'
node-version: '24'

- name: Install Poetry Dependencies
run: poetry install
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- name: Install poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: '2.1.4'
poetry-version: '2.2.1'

- uses: pnpm/action-setup@v3
with:
Expand All @@ -112,7 +112,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: 'pnpm'
node-version: '22'
node-version: '24'

- name: Install Poetry Dependencies
run: poetry install
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
- name: install poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: '2.1.4'
poetry-version: '2.2.1'

- name: create tag from pyproject version on change.
id: auto-tag
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
- name: Install poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: '2.1.4'
poetry-version: '2.2.1'

- name: Install Go
uses: actions/setup-go@v5
Expand All @@ -240,7 +240,7 @@ jobs:
- uses: actions/setup-node@v4
with:
cache: 'pnpm'
node-version: '22'
node-version: '24'

- name: Intall Poetry Dependencies
run: poetry install
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*

RUN pipx install poetry
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
RUN . /root/.bashrc && nvm install 22
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
RUN . /root/.bashrc && nvm install 24
RUN . /root/.bashrc && npm i -g pnpm@latest-10

RUN mkdir /work/
Expand Down
3 changes: 3 additions & 0 deletions namer/metadataapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ def get_image(url: str, infix: str, video_file: Optional[Path], config: NamerCon
file.parent.mkdir(parents=True, exist_ok=True)
if download_file(url, file, config):
with Image.open(file) as img:
if config.image_format == 'jpeg' and img.mode in ('RGBA', 'P'):
img = img.convert('RGB')

img.save(file, config.image_format)
set_permissions(file, config)
return file
Expand Down
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,47 @@
"@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.8",
"bootstrap-icons": "^1.13.1",
"datatables.net": "^2.3.3",
"datatables.net-bs5": "^2.3.3",
"datatables.net-buttons": "^3.2.4",
"datatables.net-buttons-bs5": "^3.2.4",
"datatables.net-colreorder": "^2.1.1",
"datatables.net-colreorder-bs5": "^2.1.1",
"datatables.net-fixedheader": "^4.0.3",
"datatables.net-fixedheader-bs5": "^4.0.3",
"datatables.net-responsive": "^3.0.6",
"datatables.net-responsive-bs5": "^3.0.6",
"datatables.net": "^2.3.5",
"datatables.net-bs5": "^2.3.5",
"datatables.net-buttons": "^3.2.5",
"datatables.net-buttons-bs5": "^3.2.5",
"datatables.net-colreorder": "^2.1.2",
"datatables.net-colreorder-bs5": "^2.1.2",
"datatables.net-fixedheader": "^4.0.5",
"datatables.net-fixedheader-bs5": "^4.0.5",
"datatables.net-responsive": "^3.0.7",
"datatables.net-responsive-bs5": "^3.0.7",
"jquery": "^3.7.1",
"lodash": "^4.17.21"
},
"devDependencies": {
"@babel/core": "^7.28.3",
"@babel/preset-env": "^7.28.3",
"@babel/core": "^7.28.5",
"@babel/preset-env": "^7.28.5",
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.34.0",
"@eslint/js": "^9.39.1",
"babel-loader": "^10.0.0",
"copy-webpack-plugin": "^13.0.1",
"css-loader": "^7.1.2",
"css-minimizer-webpack-plugin": "^7.0.2",
"eslint": "^9.34.0",
"eslint": "^9.39.1",
"eslint-config-standard": "^17.1.0",
"file-loader": "^6.2.0",
"globals": "^16.3.0",
"globals": "^16.5.0",
"html-minimizer-webpack-plugin": "^5.0.3",
"husky": "^9.1.7",
"lint-staged": "^16.1.5",
"lint-staged": "^16.2.7",
"mini-css-extract-plugin": "^2.9.4",
"postcss": "^8.5.6",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^10.3.1",
"sass": "^1.91.0",
"sass-loader": "^16.0.5",
"postcss-loader": "^8.2.0",
"postcss-preset-env": "^10.4.0",
"sass": "^1.94.2",
"sass-loader": "^16.0.6",
"terser-webpack-plugin": "^5.3.14",
"webpack": "^5.101.3",
"webpack": "^5.103.0",
"webpack-cli": "^6.0.1"
},
"engines": {
"node": "^22.0",
"node": "^24.0",
"npm": "^9.0",
"pnpm": "^10.0"
}
Expand Down
Loading