From a3939a173f0995272c316379bc8a09694dd9f6c5 Mon Sep 17 00:00:00 2001
From: Tontze <you@example.com>
Date: Thu, 25 Jun 2026 17:47:11 +0300
Subject: [PATCH] paranneltu hakusanojen osuvuutta

---
 __pycache__/torrent_vahti.cpython-311.pyc | Bin 9507 -> 9486 bytes
 hakulista.json                            |   8 ++++++++
 torrent_vahti.py                          |  19 +++++--------------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/__pycache__/torrent_vahti.cpython-311.pyc b/__pycache__/torrent_vahti.cpython-311.pyc
index 91f690bf8d20a2daa8973720fb7397786417267c..9252a14b38556aff615088dadcd3fc3beb481569 100644
GIT binary patch
delta 739
zcmY+A&rcIk5Xa{&bZv{Yly<v73oMk9v_TS4#1Jh0B1WKU#3Kfu-NsM~C2toa%{FMl
zfkQ)LUW~?zRS{wUqv?gjgZ>GU^wg6kdM_bdJUNdBf|H%^o0*-N_t||vx;pCGsIPYd
z+FI;VYEk*(a;Z)`rZwpMJ;iP{D4lweb6AdooqLG4IN7{R)CZFiK&~<8wY(O242<NR
zy06e68X}-8%V3?p4(qsK6TNEd1T*xi<$Pv{(|~fuXEmCgM^%87_b6URfK35$XiT*{
z1)tc@D}g3Lxg&ViqgaaWpFt7;L&jL;W5IKzi7y2M;jDRl7l7XU|Lp{Hn1D!2@mo+O
z1KFD1=y2jhJJ@ie0NKBQ@)90_1^4|qa&l#g@VwNt^jylT6YvotQdwfjvYa#$bUqo8
zSRYQ7YYjR_4FRZWtQ(KN&Y|?QVJ0%O^RaB$q-+K=I+dbRX=+m1JCx2OXxfNjaMZSn
zV}^$E6n=!qtItl?hlgv^pKITGGHaRRD(lBC{;PGPr#6+Do?}@|*=3Zn^X83Px9^Tz
zyD~At?uqKGkQhqD&p);8G}p~j(@e6tDZ^xC8IjBd!|>yK{<Zz0^iwJxwAT??v-RzP
z#^sJbvfa^N0XyI8PzEY81hhBN*U>7-_XwW5;qek`OT5$)Ul}`)p`kIq_$pA)x36x+
zcin>}_aM)Aw%KsDHOjX;SCvE9C4m(e(kkQ`zY`j^u@%AbA~X<Si=ryNvidXaL$euu
ZA)Sn|cg5c!iMY>`Xa$ZX%@4YI{{h6Pw>ba+

delta 800
zcmY+A|4S2L9LJwKx9O&Hx3BkQx7>8BmXxigVVD)E)o8z2B3g2J2c2^_xtqr9E+GmG
zhK$aluXNT@!-!(P^k1}v&^QPN(XX=Tm*}US(-i#h`MjRb^L#$f=XvuiCEg@j*X(v1
zfEJ0zrx@R-)>hnRh1&)gzn4o9oJJepD^}U6HK|U-T^c9vA^7q*3V`BL+_GCn=75Og
zZL&+V8V%}})v=&>SdZdmy^2q6835O=Dmd%QhKyHsY|6Qt$@nS)zy^#Rn}-YQGpG>z
zZn*w80GW_IvX2G#QF8YPtU@^(Fm_CFlQJopSX}WUKp<qFOlt03ZMJzkobAhx$X+$$
zk0FoL6@Sc0$rMYZwkJpyn3L)c|A|gYc0C6#(ftY$kRL1{`48DW%}}vlJx6;Hx->%L
zNb|6044OyBZw#r)18Wgf<a7%sO)@i_cotUl22NnbVVH?&1N{(DzZz`&oU{pinxB}?
z+~P#tKAp*BbGeBW!>3Zb?wsTKG{;N4Fu@Bfmy&qhBryV`H_kBGEGG)OIn87zZ|W8)
z%VcLI$**p;kq?7rb<1f{?Litn(opIQHY1j(`S>poRr^9e7hKlvI)Hd^d2yf+sXDw*
z@UkNaT{~1G1FxuO)KmHey_l%d!Np`P7%H~}szj&`n(VP{6iijB?QMH8x<0VdRqU!z
zv5$ils<+ViouFP=wS()Y$~_m#Jr|*Gc3!FwiA^F=FxPOp4p1jmJs*x1l2s2`7_4C-
z?aJEd>(Q05;#dVcR>nfmYYy0m*t@G(;2ReHiiI_HeMq}r!Qz`(yo|;F)aa=CxP8fc
z*Z9Yrfuw<ef!k_t#~F)mn#%Bks&t$r-T|@OC`2IsHua@5?CdnxFBVH*I#9%M8aZ4C
Ld$^<4!bkrBTXxz(

diff --git a/hakulista.json b/hakulista.json
index c29cbb4..7709a2f 100644
--- a/hakulista.json
+++ b/hakulista.json
@@ -52,6 +52,14 @@
                 5,
                 6
             ]
+        },
+        {
+            "jackett_haku": "äänikirja",
+            "regex_suodatin": ".*",
+            "kohdekansio": "All",
+            "paivat": [
+                6
+            ]
         }
     ],
     "asetukset": {
diff --git a/torrent_vahti.py b/torrent_vahti.py
index 787dea2..05bd72c 100644
--- a/torrent_vahti.py
+++ b/torrent_vahti.py
@@ -138,23 +138,14 @@ def tarkista_ja_lataa():
         for nimi, linkki in list(set(kaikki_tulokset)):
             if linkki in ladatut: continue
             
-            nimi_lower = nimi.lower()
-            loytyy_kaikki = True
+            # Luodaan regex: sana1.*?sana2.*?sana3
+            pattern_str = ".*?".join([re.escape(sana) for sana in hakusanat])
             
-            viimeisin_indeksi = 0
-            for sana in hakusanat:
-                pattern = r'\b' + re.escape(sana) + r'\b'
-                match = re.search(pattern, nimi_lower[viimeisin_indeksi:])
-                
-                if not match:
-                    loytyy_kaikki = False
-                    break
-                
-                viimeisin_indeksi += match.end()
-                
-            if loytyy_kaikki:
+            # Etsitään regexillä osumaa (re.IGNORECASE huomioi kirjainkoon)
+            if re.search(pattern_str, nimi, re.IGNORECASE):
                 uudet_kohteet.append((nimi, linkki))
 
+
         for nimi, linkki in uudet_kohteet:
             status = qbit_lisaa_torrent_api_keylla(qbit_url, qbit_api_key, linkki, kategoria)
             if status == 200 or status == 409: