From 71f550b71588168bc4a4edb11ce5d45e127f22e4 Mon Sep 17 00:00:00 2001 From: Tontze Date: Tue, 16 Jun 2026 17:55:46 +0300 Subject: [PATCH] =?UTF-8?q?viikonp=C3=A4iv=C3=A4=20valinta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/torrent_vahti.cpython-311.pyc | Bin 8836 -> 9180 bytes app.py | 4 +++- hakulista.json | 7 ++----- templates/index.html | 18 ++++++++++++++++-- torrent_vahti.py | 6 ++++++ 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/__pycache__/torrent_vahti.cpython-311.pyc b/__pycache__/torrent_vahti.cpython-311.pyc index b12c6ce9d187cc9046b8e77476742592cbc168e0..969a3c581c62824fa0110220da0352bbe2671f7b 100644 GIT binary patch delta 1361 zcmZWoU2NM_6u#H7o%k<~B3wa@6cGUp z5(i9^1fWSIzzmTAvqS;3Je#QJdIfxyL!Q;0!(Ya*)^&v293Jo9jo;#Mjm^p*;DcSP ztYdt*`%qN{{8;xFV}!>inQHxw|6!8-juZ5{(^ont3^aE{_!#z^^C>nPD)LnQeb9&S%4Q;y2>*vAVcDiM8KLWL^5iGkh}j^+f8o(@%@rM74t zW%J}{2nE6_pRj9MM#N{(~co77jo%BPb3c z2nC~CK22`j7xrsTGSZ<*O^W9ce1}Za1Kqk6W{44HNjkKs3c|)in`SyGDEcI#Hq8?A zGGyJ+5{Ej(*t`ck$%Gb0tr&H}?7{@Ke482_0}{N2XquWc+%Dxa)PPF$GjNeY&=u_4 zrdyyQ=+t&JB1dy1+b`G_!M8SxmxJ+b@0!DvPGS_mPctxL)AWbv~G+pg$FzB#0Y$z0+9h!o{`tMbA4&+)M1e!nB?D_ePX>(*@ES z!I~JjE!S^tRh<&O-F1zB0DI_&%QpI{UV0v+oUwtrt!CIs|55wb$8S#ivR? zYS|TSP7591S$4Vn6$LE#coznnWdM4 zLL)Q`)`JQGAtKfu%*l)3!J|h(f_fCa*@JkgKX02hY10SqoA=GUdGDKfpD(PAtIrih zL|`j7dgfo4Wi^4XmivbkZb4WKP6jb5p!pE{YiD>rC@*wkvAmVmB%k@$e5=T8TQze9 zi3F+~LNCD^HmMv{Mc(JpeY_WbYHv;{wzWTQ$5OaOnUK(SXBK-r=ag zxMZ&#%A<8WmG{ClOq5n0TU0yP+YXh@X%?)SAi}xIcI>RrMx@={M@}DXI->yWPI_ERINg3yXknU6yEk3-F@2WxXCCqiKjB>_ z!Rnc$xCW#EUff`RGH2LS=cbeuhPM&Gec@AWEc+T;w&Rbu&N&6A2!V6ahZKwCmhc+8 ho$C=dV8efJv6oeIqwHJmjW&V@f1)PLv#suv{{b(k+nxXb diff --git a/app.py b/app.py index 9cfaca0..a59bcff 100644 --- a/app.py +++ b/app.py @@ -85,7 +85,9 @@ def lisaa_kohde(): kaikki_data = torrent_vahti.lataa_kaikki_data() kaikki_data["hakukohteet"].append({ "jackett_haku": data['jackett_haku'], - "kohdekansio": data['kohdekansio'] + "regex_suodatin": data.get('regex_suodatin', '.*'), + "kohdekansio": data['kohdekansio'], + "paivat": data.get('paivat', [0, 1, 2, 3, 4, 5, 6]) }) torrent_vahti.tallenna_kaikki_data(kaikki_data) return jsonify({'status': 'ok'}) diff --git a/hakulista.json b/hakulista.json index 1cc125a..5e99ac8 100644 --- a/hakulista.json +++ b/hakulista.json @@ -5,7 +5,8 @@ "therarbg", "thepiratebay", "torrentdownload", - "limetorrents" + "limetorrents", + "filemood" ], "hakukohteet": [ { @@ -27,10 +28,6 @@ "jackett_haku": "Formula 1 2026 SkyF1HD 1080p", "regex_suodatin": "(?i)Formula.?1.*2026.*SkyF1HD.*1080p", "kohdekansio": "Formula1" - }, - { - "jackett_haku": "Rio hamasaki", - "kohdekansio": "All" } ], "asetukset": { diff --git a/templates/index.html b/templates/index.html index 3b17eb7..a7bd386 100644 --- a/templates/index.html +++ b/templates/index.html @@ -46,6 +46,18 @@
+
+
+
+ + + + + + + +
+
@@ -156,14 +168,16 @@ function poistaKohde(i) { fetch(`/poista_kohde/${i}`, {method:'DELETE'}).then(() => paivitaNakyma()); } document.getElementById('lisaa-form').addEventListener('submit', (e) => { - e.preventDefault(); + e.preventDefault(); + const paivat = [0,1,2,3,4,5,6].filter(i => document.getElementById('pv-'+i).checked); fetch('/lisaa_kohde', { method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify({ jackett_haku: document.getElementById('haku-sana').value, regex_suodatin: document.getElementById('haku-regex').value, - kohdekansio: document.getElementById('haku-kansio').value + kohdekansio: document.getElementById('haku-kansio').value, + paivat: paivat }) }).then(() => { e.target.reset(); paivitaNakyma(); }); }); diff --git a/torrent_vahti.py b/torrent_vahti.py index 43d3559..e8cf191 100644 --- a/torrent_vahti.py +++ b/torrent_vahti.py @@ -3,6 +3,7 @@ import re import time import requests import json +import datetime from bs4 import BeautifulSoup SKRIPTIN_KANSIO = os.path.dirname(os.path.abspath(__file__)) @@ -102,6 +103,7 @@ def tarkista_ja_lataa(): print(f"--- ALOITETAAN ERITELTY JACKETT & QBITTORRENT API-HAKU ({time.strftime('%Y-%m-%d %H:%M:%S')}) ---") data = lataa_kaikki_data() ladatut = lataa_jo_ladatut() + tanaan = datetime.datetime.now().weekday() jackett_url = data["asetukset"].get("jackett_url", "") api_key = data["asetukset"].get("jackett_api_key", "") @@ -116,6 +118,10 @@ def tarkista_ja_lataa(): return for kohde in hakulista: + sallitut_paivat = kohde.get("paivat", [0, 1, 2, 3, 4, 5, 6]) + if tanaan not in sallitut_paivat: + continue + haku = kohde["jackett_haku"] hakusanat = haku.lower().split() kategoria = kohde["kohdekansio"].strip()