diff --git a/SimpleX/__pycache__/regex_simplexlinks.cpython-311.pyc b/SimpleX/__pycache__/regex_simplexlinks.cpython-311.pyc deleted file mode 100644 index 1fe6ae3..0000000 Binary files a/SimpleX/__pycache__/regex_simplexlinks.cpython-311.pyc and /dev/null differ diff --git a/SimpleX/__pycache__/utils.cpython-311.pyc b/SimpleX/__pycache__/utils.cpython-311.pyc deleted file mode 100644 index 965119d..0000000 Binary files a/SimpleX/__pycache__/utils.cpython-311.pyc and /dev/null differ diff --git a/SimpleX/__pycache__/utils.cpython-313.pyc b/SimpleX/__pycache__/utils.cpython-313.pyc deleted file mode 100644 index d46565c..0000000 Binary files a/SimpleX/__pycache__/utils.cpython-313.pyc and /dev/null differ diff --git a/scripts/lantern.py b/scripts/lantern.py index 43e5c8c..a4d973d 100644 --- a/scripts/lantern.py +++ b/scripts/lantern.py @@ -229,8 +229,28 @@ Maintenance: newrow=[instance,category,name,url,sensi,desc,'YES','100'] print_colors(f"[+] NEWROW= {newrow}") # (rest is automatic: status, score, instance is = '' because it is your own instance) - # TODO check if the entry doesnt already exist in verified.csv and in unverified.csv - # if it doesnt exist, add it into unverified.csv + # delete existing entries in verified.csv + vdf_same_url_filter = vdf["URL"] == url # check for same url + vdf_same_url_filter_count = vdf_same_url_filter.sum() # total url matches + if vdf_same_url_filter_count > 0: + print(f"Found {vdf_same_url_filter_count} row(s) with the same url in verified.csv") + for index, row in vdf[vdf_same_url_filter].iterrows(): + print_colors(f"[+] ROW[{index}]= {list(row)}") + vdf = vdf[~vdf_same_url_filter].reset_index(drop=True) # keep only entries that do not match filter + print(f"Deleted {vdf_same_url_filter_count} row(s) with the same url in verified.csv") + if desc == '': # if the description is empty = it means that it goes in unverified.csv, so save modified verified.csv file now + vdf.to_csv(verifiedcsvfile, index=False) + # delete existing entries in unverified.csv + uvdf_same_url_filter = uvdf["URL"] == url # check for same url + uvdf_same_url_filter_count = uvdf_same_url_filter.sum() # total url matches + if uvdf_same_url_filter_count > 0: + print(f"Found {uvdf_same_url_filter_count} row(s) with the same url in unverified.csv") + for index, row in uvdf[uvdf_same_url_filter].iterrows(): + print_colors(f"[+] ROW[{index}]= {list(row)}") + uvdf = uvdf[~uvdf_same_url_filter].reset_index(drop=True) # keep only entries that do not match filter + print(f"Deleted {uvdf_same_url_filter_count} row(s) with the same url in unverified.csv") + if desc != '': # if the description isnt empty = it means that it goes in verified.csv, so save modified unverified.csv file now + uvdf.to_csv(unverifiedcsvfile, index=False) if desc == '': # if the description is empty = it means that it goes in unverified.csv print("Adding new row in unverified.csv since description is empty") uvdf.loc[-1] = newrow # adding a row @@ -1438,3 +1458,4 @@ Maintenance: if __name__ == '__main__': main() + diff --git a/www/header.php b/www/header.php index 0e360fb..52b819b 100644 --- a/www/header.php +++ b/www/header.php @@ -173,11 +173,53 @@ if (($handle = fopen($csvfile, "r")) !== FALSE) { if (strtolower($oldcatname) != strtolower($data[1])){ if( str_contains(strtolower($data[1]),'monero' )){ - echo '' . $data[1] . ' | '; // display the category as its the first row with this new category + echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category $oldcatname=$data[1]; }elseif( str_contains(strtolower($data[1]),'simplex' )){ - echo '' . $data[1] . ' | '; // display the category as its the first row with this new category + echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category $oldcatname=$data[1]; + + }elseif (str_contains(strtolower($data[1]), 'sms')){ + echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category + $oldcatname=$data[1]; + + }elseif (str_contains(strtolower($data[1]), 'games')){ + echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'vps')){ + echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category + $oldcatname=$data[1]; + + }elseif (str_contains(strtolower($data[1]), 'torproject')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'privacy front-ends')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'vpns')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'fediverse')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'torrents')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'forums')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'mail')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'radio')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'search engine')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; + }elseif (str_contains(strtolower($data[1]), 'exchanges')){ + echo '' . '' . $data[1] . ' | '; + $oldcatname=$data[1]; }else{ echo '' . $data[1] . ' | '; // display the category as its the first row with this new category $oldcatname=$data[1]; diff --git a/www/img/clawsmail.png b/www/img/clawsmail.png new file mode 100644 index 0000000..dcb0127 Binary files /dev/null and b/www/img/clawsmail.png differ diff --git a/www/img/dread.png b/www/img/dread.png new file mode 100644 index 0000000..fe253ea Binary files /dev/null and b/www/img/dread.png differ diff --git a/www/img/games.ico b/www/img/games.ico new file mode 100644 index 0000000..f0a883e Binary files /dev/null and b/www/img/games.ico differ diff --git a/www/img/haveno.png b/www/img/haveno.png new file mode 100644 index 0000000..c031b77 Binary files /dev/null and b/www/img/haveno.png differ diff --git a/www/img/linux.ico b/www/img/linux.ico new file mode 100644 index 0000000..582561a Binary files /dev/null and b/www/img/linux.ico differ diff --git a/www/img/monero.png b/www/img/monero.png new file mode 100644 index 0000000..ea0d863 Binary files /dev/null and b/www/img/monero.png differ diff --git a/www/img/opensource.ico b/www/img/opensource.ico new file mode 100644 index 0000000..1808bfd Binary files /dev/null and b/www/img/opensource.ico differ diff --git a/www/img/openvpn.ico b/www/img/openvpn.ico new file mode 100644 index 0000000..5df666f Binary files /dev/null and b/www/img/openvpn.ico differ diff --git a/www/img/radio.ico b/www/img/radio.ico new file mode 100644 index 0000000..792a95c Binary files /dev/null and b/www/img/radio.ico differ diff --git a/www/img/searxng.svg b/www/img/searxng.svg new file mode 100644 index 0000000..f3ff8e3 --- /dev/null +++ b/www/img/searxng.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/www/img/simplex.png b/www/img/simplex.png new file mode 100644 index 0000000..a1cf370 Binary files /dev/null and b/www/img/simplex.png differ diff --git a/www/img/sms.ico b/www/img/sms.ico new file mode 100644 index 0000000..15ff283 Binary files /dev/null and b/www/img/sms.ico differ diff --git a/www/img/tor.png b/www/img/tor.png new file mode 100644 index 0000000..5832de5 Binary files /dev/null and b/www/img/tor.png differ diff --git a/www/img/tor_browser.ico b/www/img/tor_browser.ico new file mode 100644 index 0000000..98293b7 Binary files /dev/null and b/www/img/tor_browser.ico differ diff --git a/www/img/torrents.ico b/www/img/torrents.ico new file mode 100644 index 0000000..b7a5463 Binary files /dev/null and b/www/img/torrents.ico differ diff --git a/www/img/xmpp.ico b/www/img/xmpp.ico new file mode 100644 index 0000000..a56a17d Binary files /dev/null and b/www/img/xmpp.ico differ diff --git a/www/style.css b/www/style.css index 6c57a03..aff42a3 100644 --- a/www/style.css +++ b/www/style.css @@ -9,6 +9,10 @@ font-family: 'Source Code Pro', monospace; } + +.caticon{ + height: 13px; +} .width-class{ width: 100%; object-fit: contain;