12 Commits

6 changed files with 72 additions and 47 deletions

View File

@@ -1,21 +0,0 @@
[tool.bumpversion]
current_version = "0.1.0"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
serialize = ["{major}.{minor}.{patch}"]
search = "{current_version}"
replace = "{new_version}"
regex = false
ignore_missing_version = false
ignore_missing_files = false
tag = false
sign_tags = false
tag_name = "v{new_version}"
tag_message = "Bump version: {current_version} → {new_version}"
allow_dirty = false
commit = false
message = "Bump version: {current_version} → {new_version}"
moveable_tags = []
commit_args = ""
setup_hooks = []
pre_commit_hooks = []
post_commit_hooks = []

View File

@@ -2,7 +2,14 @@
"categories": [ "categories": [
{ {
"title": "## 🚀 Features", "title": "## 🚀 Features",
"labels": ["add","Add", "Kind/Feature"] "labels": [
"add",
"Add",
"Kind/Feature",
"feat",
"Feature",
"Feat"
]
}, },
{ {
"title": "## 🐛 Fixes", "title": "## 🐛 Fixes",
@@ -18,16 +25,50 @@
"labels": ["docs","Docs", "Kind/Documentation"] "labels": ["docs","Docs", "Kind/Documentation"]
}, },
{ {
"title": "## 🧹 Chore", "title": "## 🛠️ Maintenance",
"labels": ["chore","Chore", "Kind/Chore"] "labels": [
"maintenance",
"Maintenance",
"Kind/Maintenance",
"chore",
"Chore",
"Kind/Chore"
]
}, },
{ {
"title": "## 🛠️ Maintenance", "title": "## ⏪ Reverts",
"labels": ["maintenance","Maintenance", "Kind/Maintenance"] "labels": [
"revert",
"Revert",
"Kind/Revert",
"Kind/Reverts",
"reverts",
"Reverts"
]
}, },
{ {
"title": "## 🗑️ Deprecation", "title": "## 🗑️ Deprecation",
"labels": ["deprecation","Deprecation", "Kind/Deprecation"] "labels": ["deprecation","Deprecation", "Kind/Deprecation"]
},
{
"title": "## ⚡️ Performance Improvements",
"labels": [
"perf",
"Perf",
"Kind/Performance"
]
},
{
"title": "## 🎨 Styling",
"labels": [
"style",
"Style",
"Kind/Style"
]
},
{
"title": "## 🎯 Other Changes",
"labels": []
} }
], ],
"label_extractor": [ "label_extractor": [

View File

@@ -112,7 +112,7 @@ jobs:
with: with:
tag_name: v${{ env.VERSION }} tag_name: v${{ env.VERSION }}
release_name: Release ${{ env.VERSION }} release_name: Release ${{ env.VERSION }}
body_path: release_notes/release_notes.md body: ${{steps.build_changelog.outputs.changelog}}
draft: false draft: false
prerelease: false prerelease: false
make_latest: true make_latest: true

View File

@@ -1,6 +1,6 @@
[project] [project]
name = "kompage" name = "kompage"
version = "0.1.0" version = "0.1.3"
description = "Add your description here" description = "Add your description here"
readme = "README.md" readme = "README.md"
requires-python = ">=3.13" requires-python = ">=3.13"
@@ -28,7 +28,7 @@ url = "https://git.theprivateserver.de/api/packages/KomSuite/pypi/simple/"
[tool.bumpversion] [tool.bumpversion]
current_version = "0.1.0" current_version = "0.1.3"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)" parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
serialize = ["{major}.{minor}.{patch}"] serialize = ["{major}.{minor}.{patch}"]
search = "{current_version}" search = "{current_version}"

View File

@@ -301,18 +301,19 @@ async def log_request():
log.debug(f"Received request data: {data}") log.debug(f"Received request data: {data}")
item = data.get("item") item = data.get("item")
if item: if item:
data = await fetch_requested_data([item]) # data = await fetch_requested_data([item])
if not data: if not data:
return jsonify({"status": "failed", "message": "Item not found"}), 404 return jsonify({"status": "failed", "message": "Item not found"}), 404
data = data[0] # data = data[0]
title = data.get("title") manga_id = item.get("id")
image_url = data.get("image") title = item.get("title")
image_url = item.get("image")
log.debug( log.debug(
f"Logging request for item: {item}, title: {title}, image_url: {image_url}" f"Logging request for item: {item}, title: {title}, image_url: {image_url}, manga_id: {manga_id}"
) )
asynccache = KomCache() asynccache = KomCache()
asynccache.insert( asynccache.insert(
f"INSERT INTO manga_requests (manga_id, title, image) VALUES ({item}, '{title}', :image)", f"INSERT INTO manga_requests (manga_id, title, image) VALUES ({manga_id}, '{title}', :image)",
args={"image": image_url}, args={"image": image_url},
) )
return jsonify({"status": "success"}) return jsonify({"status": "success"})
@@ -324,7 +325,7 @@ async def requests_page():
cache = KomCache() cache = KomCache()
requests = ( requests = (
cache.fetch_all( cache.fetch_all(
query="SELECT manga_id, title, image grabbed FROM manga_requests" query="SELECT manga_id, title, image, grabbed FROM manga_requests"
) )
or [] or []
) )
@@ -332,23 +333,26 @@ async def requests_page():
req_ids = [req[0] for req in requests] req_ids = [req[0] for req in requests]
if req_ids: if req_ids:
entries = [ entries = [
{"manga_id": req[0], "title": req[1], "image": req[2]} for req in requests {"manga_id": req[0], "title": req[1], "image": req[2], "grabbed": req[3]}
for req in requests
] ]
else: else:
entries = [] entries = []
log.debug(f"Fetched {len(entries)} requests from the database")
log.debug(f"Requests entries: {entries}")
return await render_template("requests.html", requests=entries) return await render_template("requests.html", requests=entries)
@app.route("/delete", methods=["POST"]) @app.route("/delete", methods=["POST"])
async def delete_request(): async def delete_request():
# Delete a request from the database. ID is sent after the /delete endpoint, so: /delete/<id> # Delete a request from the database. ID is sent after the /delete endpoint, so: /delete/<id>
data = await request.get_json() data = await request.get_json()
item_id = data.get("item") log.debug(f"Received delete request data: {data}")
if item_id: if data:
title = data.get("title")
asynccache = KomCache() asynccache = KomCache()
asynccache.query( asynccache.delete(
"DELETE FROM manga_requests WHERE manga_id = :id", args={"id": item_id} "DELETE FROM manga_requests WHERE title = :title", args={"title": title}
) )
return jsonify({"status": "success"}) return jsonify({"status": "success"})
return jsonify({"status": "failed"}), 400 return jsonify({"status": "failed"}), 400

View File

@@ -20,7 +20,7 @@
{% if results %} {% if results %}
{% for result in results %} {% for result in results %}
<div class="card {{ result.type | lower }} {% if result.in_komga %}komga{% else %}requested{% endif %}"> <div class="card {{ result.type | lower }} {% if result.grabbed %}komga{% else %}requested{% endif %}">
<div class="image-container {{ 'nsfw' if result.isAdult else '' }}"> <div class="image-container {{ 'nsfw' if result.isAdult else '' }}">
@@ -44,7 +44,7 @@
{% if requests %} {% if requests %}
<div class="results"> <div class="results">
{% for request in requests %} {% for request in requests %}
<div class="card {{ request.type | lower }} {% if request.in_komga %}komga{% else %}requested{% endif %}"> <div class="card {{ request.type | lower }} {% if request.grabbed %}komga{% else %}requested{% endif %}">
<div class="image-container {{ 'nsfw' if request.isAdult else '' }}"> <div class="image-container {{ 'nsfw' if request.isAdult else '' }}">
<img src="{{ request.image }}" alt="Cover"> <img src="{{ request.image }}" alt="Cover">
@@ -56,7 +56,7 @@
<p>{{ request.title }}</p> <p>{{ request.title }}</p>
<div class="actions"> <div class="actions">
<button onclick="showInfo({{ request | tojson | safe }})" class="info">Info</button> <button onclick="showInfo({{ request | tojson | safe }})" class="info">Info</button>
<button onclick="deleteEntry({{ request.id }})" class="delete-button">Delete</button> <button onclick="deleteEntry('{{ request.title | escape }}')" class="delete-button">Delete</button>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
@@ -111,10 +111,11 @@
closeModal(); closeModal();
} }
} }
function deleteEntry(entryId) { function deleteEntry(title) {
console.log("Deleting entry with title:", title);
fetch(`/delete`, { fetch(`/delete`, {
method: 'POST', method: 'POST',
body: JSON.stringify({ item: entryId }), body: JSON.stringify({ title: title }), // Send title as part of a JSON object
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }