From 7356dffe6b45679ff97597a5fdb010a20174d27c Mon Sep 17 00:00:00 2001
From: Tontze <you@example.com>
Date: Fri, 19 Jun 2026 09:06:58 +0300
Subject: [PATCH] =?UTF-8?q?viikonp=C3=A4iv=C3=A4t=20milloin=20haetaan?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/torrent_vahti.cpython-311.pyc | Bin 9349 -> 9507 bytes
 hakulista.json                            |  48 ++++++++++++++++------
 templates/index.html                      |  37 ++++++++++++++++-
 torrent_vahti.py                          |  11 +++--
 4 files changed, 79 insertions(+), 17 deletions(-)

diff --git a/__pycache__/torrent_vahti.cpython-311.pyc b/__pycache__/torrent_vahti.cpython-311.pyc
index d6a9893a0a21510fb6806ee77a87aad18c8ca893..91f690bf8d20a2daa8973720fb7397786417267c 100644
GIT binary patch
delta 661
zcmZqmT<pcWoR^o20SMGgOtKO;^74ywaRPbFK>T^iW;JmcCiXS8oHd*aI3^1+3U7{)
zY++=aGWnsDdwp1~c#2qwB1kU;WC_ApHR8({85mXrF$7crsT45~Su25}LkOyXp+=%c
zq(&@-p_NGzCd9Ce31|ioLqM%$jbt%Pig>LkBSW4<jTlRf<N{%kn<l^G<QJ&o1)43^
z6J8@)Bwi!9Km;r?Nm@d1YK@=^L##^-(41PKTHzAy$-AW$rKM`5QY5m$W*4&o*^&@;
zkz$GN<nPk1jO#Yr%2+dUg%p95R58UQO>UO8XB3}&ST<e#7E@8`Ew<F+<ivv1A_t)S
zE#}m`l%fzIt0)&l*Z~Pm>B$aqM;v)`@+(U!E90{hGqbZZZwZ!VX6B}57H8(gXXd4(
zW*2APVku6{OT5KikXTZZT9kK-H8-&&IpY>vaY<rHX>qaiWIK7;$!`VOCnw4abIk%8
zoDRgrx|{3dc^KI=S&cq2XilD>@RUu6)AR#_(Bx`G<$4)~4&Mg~iWhifZ%8P9VBp|2
z1QQcjZb->5Ra&CC!eycU68(!(h8tWjN?A@|zbhd%hjW4Y3abld?ib8Ffar?0=S2yx
zD-vE4SRaVXd|+S_l)9m!Il=dah~xy<2Lg%<LYGG_id-1IB>JL&!36<DAbP+LRL96`
zdP89HH^t>*MNOc9s00zdAVL;IR8QWdl*c%0vZAsI<C4v8%1n&>wv1XI7~n+R<Zu-|
E01`d19smFU

delta 478
zcmZ4N)#}N+oR^o20SMYvjj|Xw^74ywaR7PDK>XQkvzoXJ6MJnfXAS29j>&?I!kc3x
zTNoKrCqI;OXIHNkuMt@w01~!ks1dIbO%baC>RQIcz_1#KA)r>GMj}Nd8_X|aNfECV
zV`Ru<u92t}?a`<aD-y2}Tp$QCVe$uQ3Bj})K^KNtml&YxTA^Cu64l9)GK$iYHIgY3
z5EF{ofNV*qX^JK4lS5@(8S6LCma%5!e)%5=LW&B2_D+5vYtJY$SwSvctSAV`FA4z>
zxgf$0NN7q;UMF{Ca-+Pk7H>{|Wl3dae0E}Hc6R11mg2;`#9Qo{c`2#c#hJI*ic1np
zN{fr7fSM+6mpA5`4rHVQaWUKGFY-K$Y-+4V9~smpvnf7h<L5N}z`#HGqoT5hg3<*Z
z*&8wn9lj4F6hAPq^6G$z2`o3HROai?(qEx+!NBo=<3$74i&Ab^q}(R3-w>9Xku=G6
zg6$0z%?Z9YL?kD;-cZq=+^n=+^cGW5Y7r=0i+n+ZEQqL?9H5-XIDPVdWfjIno1Z8%
TG4fk6YJFgU6BU!cs^|d#W*>yk

diff --git a/hakulista.json b/hakulista.json
index 3955505..c29cbb4 100644
--- a/hakulista.json
+++ b/hakulista.json
@@ -9,25 +9,49 @@
         "filemood"
     ],
     "hakukohteet": [
-        {
-            "jackett_haku": "motogp 2026 720p jff",
-            "regex_suodatin": "motogp.*?2026.*?720p.*?jff.*?",
-            "kohdekansio": "MotoGP"
-        },
         {
             "jackett_haku": "motogp 2026 tntsportshd 1080p",
-            "regex_suodatin": "motogp.*?2026.*?tntsportshd.*?1080p.*?",
-            "kohdekansio": "MotoGP"
+            "regex_suodatin": ".*",
+            "kohdekansio": "MotoGP",
+            "paivat": [
+                3,
+                4,
+                5,
+                6
+            ]
         },
         {
             "jackett_haku": "Formula 1 2026 1080p SS",
-            "regex_suodatin": "\tFormula.*?1.*?2026.*?1080p.*?SS.*?",
-            "kohdekansio": "Formula1"
+            "regex_suodatin": ".*",
+            "kohdekansio": "Formula1",
+            "paivat": [
+                3,
+                4,
+                5,
+                6
+            ]
         },
         {
             "jackett_haku": "Formula 1 2026 SkyF1HD 1080p",
-            "regex_suodatin": "(?i)Formula.?1.*2026.*SkyF1HD.*1080p",
-            "kohdekansio": "Formula1"
+            "regex_suodatin": ".*",
+            "kohdekansio": "Formula1",
+            "paivat": [
+                3,
+                4,
+                5,
+                6
+            ]
+        },
+        {
+            "jackett_haku": "motogp 2026 720p jff",
+            "regex_suodatin": ".*",
+            "kohdekansio": "MotoGP",
+            "paivat": [
+                3,
+                4,
+                5,
+                6
+            ]
         }
     ],
     "asetukset": {
@@ -36,6 +60,6 @@
         "qbit_url": "http://192.168.1.40:8080/",
         "qbit_user": "admin",
         "qbit_pass": "qbt_uFxc7gqD7sJsBk9FJdH38bLIyapr",
-        "haku_vali": 10
+        "haku_vali": 900
     }
 }
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index c38e733..0957c6e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -132,7 +132,22 @@
                 document.getElementById('tila-badge').className = "badge bg-success";
 
                 const lista = document.getElementById('hakukohteet-lista');
-                lista.innerHTML = data.hakukohteet.map((k, i) => `<tr><td>${k.jackett_haku}</td><td>${k.kohdekansio}</td><td class="text-end"><button onclick="poistaKohde(${i})" class="btn btn-link text-danger btn-sm p-0">Poista</button></td></tr>`).join('');
+                lista.innerHTML = data.hakukohteet.map((k, i) => {
+                    const paivaNimet = ['Ma', 'Ti', 'Ke', 'To', 'Pe', 'La', 'Su'];
+                    const paivatTeksti = [0, 1, 2, 3, 4, 5, 6].map(p => 
+                        k.paivat.includes(p) ? `<span class="badge bg-info text-dark">${paivaNimet[p]}</span>` : `<span class="badge bg-light text-muted">${paivaNimet[p]}</span>`
+                    ).join(' ');
+
+                    return `<tr>
+                        <td>${k.jackett_haku}</td>
+                        <td>${k.kohdekansio}</td>
+                        <td>${paivatTeksti}</td>
+                        <td class="text-end">
+                            <button onclick="muokkaaKohdetta(${i})" class="btn btn-link btn-sm p-0 me-2 text-warning">Muokkaa</button>
+                            <button onclick="poistaKohde(${i})" class="btn btn-link text-danger btn-sm p-0">Poista</button>
+                        </td>
+                    </tr>`;
+                }).join('');
                 
                 const hakuTermi = document.getElementById('historia-haku').value.toLowerCase();
                 const lokiDiv = document.getElementById('loki-sisalto');
@@ -199,6 +214,26 @@
         document.getElementById('tyhjenna-loki-btn').addEventListener('click', () => fetch('/tyhjenna_loki', {method:'POST'}).then(() => paivitaNakyma()));
         
         paivitaNakyma(); setInterval(paivitaNakyma, 5000);
+    function muokkaaKohdetta(i) {
+    fetch('/status')
+        .then(res => res.json())
+        .then(data => {
+            const kohde = data.hakukohteet[i];
+            // Täytetään lomake hakukohteen tiedoilla
+            document.getElementById('haku-sana').value = kohde.jackett_haku;
+            document.getElementById('haku-kansio').value = kohde.kohdekansio;
+            
+            // Päivitetään checkboxit
+            [0, 1, 2, 3, 4, 5, 6].forEach(p => {
+                const cb = document.getElementById('pv-' + p);
+                if (cb) cb.checked = kohde.paivat.includes(p);
+            });
+            
+            // Vieritetään sivu takaisin ylös lomakkeeseen
+            window.scrollTo(0, 0);
+        });
+}
+
     </script>
 </body>
 </html>
diff --git a/torrent_vahti.py b/torrent_vahti.py
index c94855e..787dea2 100644
--- a/torrent_vahti.py
+++ b/torrent_vahti.py
@@ -139,15 +139,18 @@ def tarkista_ja_lataa():
             if linkki in ladatut: continue
             
             nimi_lower = nimi.lower()
-            viimeisin_indeksi = -1
             loytyy_kaikki = True
             
+            viimeisin_indeksi = 0
             for sana in hakusanat:
-                indeksi = nimi_lower.find(sana, viimeisin_indeksi + 1)
-                if indeksi == -1:
+                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 = indeksi
+                
+                viimeisin_indeksi += match.end()
                 
             if loytyy_kaikki:
                 uudet_kohteet.append((nimi, linkki))