From efa05aaba165a95e57d3e09b3a9908b04eb89a94 Mon Sep 17 00:00:00 2001 From: Schimon Jehudah Date: Thu, 23 Nov 2023 16:55:36 +0000 Subject: [PATCH] Fix tasks. Listen carefully to Laura. --- datasets/catalogues/clothe.csv | 2 + datasets/catalogues/software.csv | 2 + datasets/catalogues/torrent.csv | 29 ++++++- datasets/catalogues/vacancy.csv | 1 + datasets/corporations/computing.csv | 1 + datasets/corporations/cybersecurity.csv | 2 + datasets/corporations/data.csv | 1 + datasets/downloads/music.csv | 3 + datasets/events/computing.csv | 1 + datasets/forums/cms.csv | 2 + datasets/forums/p2p.csv | 2 + datasets/music/electronic.csv | 4 + datasets/news/art.csv | 5 +- datasets/news/blockchain.csv | 2 + datasets/news/bsd_linux_unix.csv | 6 ++ datasets/news/business.csv | 3 +- datasets/news/canada.csv | 2 + datasets/news/code.csv | 4 +- datasets/news/computer.csv | 11 +++ datasets/news/data.csv | 2 + datasets/news/fiction.csv | 4 +- datasets/news/internet.csv | 26 ++++++ datasets/news/local.csv | 2 +- datasets/news/misc.csv | 3 + datasets/news/p2p.csv | 4 + datasets/news/people.csv | 9 +- datasets/news/privacy.csv | 2 + datasets/news/relationship.csv | 4 +- datasets/news/security.csv | 6 +- datasets/news/technology.csv | 7 ++ datasets/news/telecom.csv | 1 + datasets/news/xmpp.csv | 1 + datasets/podcasts/culture.csv | 8 +- datasets/podcasts/technology.csv | 2 + datasets/projects/chat.csv | 8 ++ datasets/projects/encryption.csv | 2 + datasets/projects/firewall.csv | 2 + datasets/projects/forums.csv | 11 ++- datasets/projects/internet.csv | 14 +++- datasets/projects/issue_tracker.csv | 2 + datasets/projects/multimedia.csv | 4 +- datasets/projects/office.csv | 3 + datasets/projects/operating_system.csv | 1 + datasets/projects/p2p.csv | 2 + datasets/projects/programming_language.csv | 2 + datasets/projects/system.csv | 5 ++ datasets/projects/terminal.csv | 5 ++ datasets/projects/visualization.csv | 1 + datasets/projects/website.csv | 1 + datasets/projects/wifi.csv | 3 + datasets/videos/technology.csv | 1 + datasets/wiki/computing.csv | 1 + datasets/wiki/data.csv | 2 + datasets/wiki/wifi.csv | 2 + slixfeed/datahandler.py | 16 +++- slixfeed/filterhandler.py | 20 ++++- slixfeed/sqlitehandler.py | 28 +++++-- slixfeed/taskhandler.py | 25 ++++-- slixfeed/xmpphandler.py | 97 +++++++++++++++------- 59 files changed, 357 insertions(+), 65 deletions(-) create mode 100644 datasets/catalogues/clothe.csv create mode 100644 datasets/corporations/cybersecurity.csv create mode 100644 datasets/downloads/music.csv create mode 100644 datasets/forums/p2p.csv create mode 100644 datasets/music/electronic.csv create mode 100644 datasets/news/canada.csv create mode 100644 datasets/news/data.csv create mode 100644 datasets/news/p2p.csv create mode 100644 datasets/projects/chat.csv create mode 100644 datasets/projects/encryption.csv create mode 100644 datasets/projects/firewall.csv create mode 100644 datasets/projects/issue_tracker.csv create mode 100644 datasets/projects/p2p.csv create mode 100644 datasets/projects/programming_language.csv create mode 100644 datasets/projects/system.csv create mode 100644 datasets/projects/terminal.csv create mode 100644 datasets/projects/wifi.csv create mode 100644 datasets/wiki/data.csv create mode 100644 datasets/wiki/wifi.csv diff --git a/datasets/catalogues/clothe.csv b/datasets/catalogues/clothe.csv new file mode 100644 index 0000000..9a2cf09 --- /dev/null +++ b/datasets/catalogues/clothe.csv @@ -0,0 +1,2 @@ +name, url, language, country +HELLOTUX Blog, https://www.hellotux.com/rss.php, en-US, Hungary diff --git a/datasets/catalogues/software.csv b/datasets/catalogues/software.csv index b221a36..9b93627 100644 --- a/datasets/catalogues/software.csv +++ b/datasets/catalogues/software.csv @@ -17,3 +17,5 @@ GreasyFork: Recently Updates Userscripts, https://greasyfork.org/en/scripts.atom xfce-look.org - Latest Products, https://www.xfce-look.org/content.rdf, en-US, Worldwide Newest Python PEPs, https://peps.python.org/peps.rss/, en-US, Worldwide Joomla! Extensions, https://extensions.joomla.org/browse/new/?format=feed&type=rss, en-US, Worldwide +cblgh.org (wikis), https://cblgh.org/wikis.xml, en-US, Worldwide +cblgh.org (projects), https://cblgh.org/projects.xml, en-US, Worldwide diff --git a/datasets/catalogues/torrent.csv b/datasets/catalogues/torrent.csv index 3bff9dd..a5a2a91 100644 --- a/datasets/catalogues/torrent.csv +++ b/datasets/catalogues/torrent.csv @@ -1,3 +1,30 @@ name, url, language, country -Nyaa, https://nyaa.si/?page=rss, en-US, Worldwide Torlock, https://www.torlock.com/rss.xml, en-US, Worldwide +AndroidKino, https://androidkino.net/rss.xml, ru-RU, Russia +AngieTorrents, https://angietorrents.cc/rss.php?custom=1, en-US, Worldwide +AniDex Tracker, https://anidex.info/rss/, ja-JA, Japan +AniRena, https://www.anirena.com/rss.php, ja-JA, Japan +AudioBook Bay, https://audiobookbay.is/feed/atom/, en-US, Worldwide +Bangumi Moe, https://bangumi.moe/rss/latest, en-US, Worldwide +EZTV, https://eztv.re/ezrss.xml, en-US, Worldwide +FireBit, http://firebit.org/rss.xml, en-US, Worldwide +FOSS Torrents - Distributions, https://fosstorrents.com/feed/distribution.xml, en-US, Worldwide +FOSS Torrents - Games, https://fosstorrents.com/feed/game.xml, en-US, Worldwide +FOSS Torrents - Softwares, https://fosstorrents.com/feed/software.xml, en-US, Worldwide +Install Guide Games, https://igg-games.com/feed, en-US, Worldwide +Lime Torrents, https://www.limetorrents.lol/rss/, en-US, Worldwide +Nyaa, https://nyaa.si/?page=rss, en-US, Worldwide +PCGamesTorrents, https://pcgamestorrents.com/feed, en-US, Worldwide +Postman, http://tracker2.postman.i2p/?view=AddRSSMap, en-US, Worldwide +RARBG, https://rarbg.to/rss.php, en-US, Worldwide +RUTOR (EN/RU), http://rutor.info/rss.php, en-US, Russia +SkTorrent, https://sktorrent.org/feed_rss.xml, en-US, Worldwide +The Pirate Bay, https://tpb.party/rss, en-US, Worldwide +Tokyo Toshokan, https://tokyo-tosho.net/rss.php, en-US, Worldwide +Tokyo Toshokan, https://www.tokyotosho.info/rss.php, en-US, Worldwide +Torrent911, https://www.torrent911.me/rss, es-ES, Spain +Torrent Download, https://www.torrentdownload.info/feed_latest, en-US, Worldwide +Torrent Downloads, https://www.torrentdownloads.pro/rss.xml, en-US, Worldwide +TorrentGalaxy, https://torrentgalaxy.to/rss, en-US, Worldwide +Книжный трекер, https://booktracker.org/rss.php, ru-RU, Russia +Торрент игры, https://gamestracker.org/torrents/rss/, ru-RU, Russia diff --git a/datasets/catalogues/vacancy.csv b/datasets/catalogues/vacancy.csv index 0b17c3e..c735608 100644 --- a/datasets/catalogues/vacancy.csv +++ b/datasets/catalogues/vacancy.csv @@ -1,2 +1,3 @@ name, url, language, country Job Openings at EFF, https://www.eff.org/about/opportunities/jobs/feed, en-US, United States +Debricked, https://careers.debricked.com/blog/posts.rss, en-US, Europe diff --git a/datasets/corporations/computing.csv b/datasets/corporations/computing.csv index e52f026..6008848 100644 --- a/datasets/corporations/computing.csv +++ b/datasets/corporations/computing.csv @@ -1,3 +1,4 @@ name, url, language, country Panic Blog, https://www.panic.com/blog/feed/, en-US, United States Necuno Solutions, https://necunos.com/feed.xml, en-US, Finland +Debricked, https://debricked.com/blog/feed/, en-US, Europe diff --git a/datasets/corporations/cybersecurity.csv b/datasets/corporations/cybersecurity.csv new file mode 100644 index 0000000..3cdc8e9 --- /dev/null +++ b/datasets/corporations/cybersecurity.csv @@ -0,0 +1,2 @@ +name, url, language, country +Netgate, https://www.netgate.com/blog/rss.xml, en-US, Worldwide diff --git a/datasets/corporations/data.csv b/datasets/corporations/data.csv index 1224b77..dd0389d 100644 --- a/datasets/corporations/data.csv +++ b/datasets/corporations/data.csv @@ -1,2 +1,3 @@ name, url, language, country Confluent: Data in motion, https://www.confluent.io/rss.xml, en-US, United States +Postgres Professional, https://postgrespro.ru/rss, ru-RU, Russia diff --git a/datasets/downloads/music.csv b/datasets/downloads/music.csv new file mode 100644 index 0000000..bf54c35 --- /dev/null +++ b/datasets/downloads/music.csv @@ -0,0 +1,3 @@ +name, url, language, country +archives.anonradio.net - no voip, http://triapul.cz/feed/anonradio_novoip.xml, en-US, Czech +archives.anonradio.net, http://triapul.cz/feed/anonradio.xml, en-US, Czech diff --git a/datasets/events/computing.csv b/datasets/events/computing.csv index eb084dc..f6bdaea 100644 --- a/datasets/events/computing.csv +++ b/datasets/events/computing.csv @@ -6,3 +6,4 @@ PyCon Sweden, https://fosstodon.org/@pyconsweden.rss, en-US, Sweden FSFE Events, https://fsfe.org/events/events.en.rss, en-US, Germany FSFE Events (FR), https://fsfe.org/events/events.fr.rss, fr-FR, Germany FSFE Events (DE), https://fsfe.org/events/events.de.rss, de-DE, Germany +cblgh.org - events, https://cblgh.org/events.xml, en-US, Worldwide diff --git a/datasets/forums/cms.csv b/datasets/forums/cms.csv index a0eae53..21c07e7 100644 --- a/datasets/forums/cms.csv +++ b/datasets/forums/cms.csv @@ -1,2 +1,4 @@ name, url, language, country Zola, https://zola.discourse.group/posts.rss, en-US, Worldwide +ElkArte Community, https://www.elkarte.net/community/index.php?action=.xml;type=rss2;limit=5, en-US, Worldwide +my little forum, https://mylittleforum.net/forum/index.php?mode=rss, en-US, Worldwide diff --git a/datasets/forums/p2p.csv b/datasets/forums/p2p.csv new file mode 100644 index 0000000..42feb78 --- /dev/null +++ b/datasets/forums/p2p.csv @@ -0,0 +1,2 @@ +name, url, language, country +Transmission BT, https://forum.transmissionbt.com/app.php/feed, en-US, Worldwide diff --git a/datasets/music/electronic.csv b/datasets/music/electronic.csv new file mode 100644 index 0000000..318c445 --- /dev/null +++ b/datasets/music/electronic.csv @@ -0,0 +1,4 @@ +name, url, language, country +archives.anonradio.net - no voip, http://triapul.cz/feed/anonradio_novoip.xml, en-US, Worldwide +archives.anonradio.net, http://triapul.cz/feed/anonradio.xml, en-US, Worldwide +// aNONradio //, https://anonradio.net/feed/, en-US, Worldwide diff --git a/datasets/news/art.csv b/datasets/news/art.csv index 0f66e92..01a9bc7 100644 --- a/datasets/news/art.csv +++ b/datasets/news/art.csv @@ -1,2 +1,5 @@ name, url, language, country -The Public Domain Review, https://publicdomainreview.org/rss.xml, en-US, USA +The Public Domain Review, https://publicdomainreview.org/rss.xml, en-US, United States +třiapůl česky, https://triapul.cz/feed/cesky.xml, cz-CZ, Czech +triapul.cz, http://triapul.cz/feed/english.xml, en-US, Czech +techno-mage in:, https://bsd.network/@prahou.rss, en-US, United States diff --git a/datasets/news/blockchain.csv b/datasets/news/blockchain.csv index 943ce61..ee5721e 100644 --- a/datasets/news/blockchain.csv +++ b/datasets/news/blockchain.csv @@ -2,3 +2,5 @@ name, url, language, country CryptoSlate, https://cryptoslate.com/feed/, en-US, United States CryptoPotato, https://cryptopotato.com/feed/, en-US, United States Decrypt, https://decrypt.co/feed, , en-US, United States + +Ctrl blog: Crypto-currencies, https://feed.ctrl.blog/topic/crypto-currencies.atom, en-US, United States diff --git a/datasets/news/bsd_linux_unix.csv b/datasets/news/bsd_linux_unix.csv index 9f3f627..669271b 100644 --- a/datasets/news/bsd_linux_unix.csv +++ b/datasets/news/bsd_linux_unix.csv @@ -2,11 +2,15 @@ name, url, language, country Linux Professional Institute (LPI), https://www.lpi.org/feed/, en-US, Canada LinuxConfig, https://linuxconfig.org/feed, en-US, Worldwide The Logs, https://www.flu0r1ne.net/logs/rss.xml, en-US, United States +Ctrl blog: Fedora Linux, https://feed.ctrl.blog/topic/fedora-linux.atom, en-US, United States +Ctrl blog: Linux, https://feed.ctrl.blog/topic/linux.atom, en-US, United States Anjan Momi, https://momi.ca/feed.xml, en-US, United States postmarketOS, https://postmarketos.org/blog/feed.atom, en-US, United States PureTryOut (Alpine Linux, postmarketOS), https://mastodon.fam-ribbers.com/@bart.rss, en-US, Netherlands Blog on Bart Ribbers - PureTryOut (Alpine Linux, postmarketOS), https://fam-ribbers.com/blog/index.xml, en-US, Netherlands +LZone | Devops, https://lzone.de/feed/devops.xml, en-US, Germany Necuno Solutions, https://necunos.com/feed.xml, en-US, Finland +Laslo Hunhold, https://laslo.hunhold.de/index.xml, en-US, Germany Alpine Linux, https://fosstodon.org/@alpinelinux.rss, en-US, United States ollieparanoid, https://ollieparanoid.github.io/feed.xml, en-US, United States FSFE News, https://fsfe.org/news/news.en.rss, en-US, Germany @@ -24,3 +28,5 @@ LGUG2Z, https://lgug2z.com/index.xml, en-US, United States Hugo Barrera's site, https://whynothugo.nl/posts.xml, en-US, United States Solene'%, https://dataswamp.org/~solene/rss.xml, en-US, United States Solene'%, https://dataswamp.org/~solene/rss-html.xml, en-US, United States +drkhsh, https://drkhsh.at/atom.xml, en-US, Austria +OpenBSD Webzine, https://webzine.puffy.cafe/atom.xml, en-US, United States diff --git a/datasets/news/business.csv b/datasets/news/business.csv index 9b5e4f8..3c55bd8 100644 --- a/datasets/news/business.csv +++ b/datasets/news/business.csv @@ -1,4 +1,6 @@ name, url, language, country +Invoice Ninja, https://invoiceninja.com/feed/, en-US, Worldwide +Mail Online - Money, https://www.dailymail.co.uk/money/index.rss, en-US, United Kingdom ynet - צרכנות, https://www.ynet.co.il/Integration/StoryRss5363.xml, he-IL, Israel ynet - כלכלה, https://www.ynet.co.il/Integration/StoryRss6.xml, he-IL, Israel דה מרקר - שוק ההון, https://www.themarker.com/srv/tm-markets, he-IL, Israel @@ -10,4 +12,3 @@ ynet - כלכלה, https://www.ynet.co.il/Integration/StoryRss6.xml, he-IL, Isra דה מרקר - כותרות דף הבית, https://www.themarker.com/srv/tm-all-articles, he-IL, Israel דה מרקר - כותרות היום, https://www.themarker.com/srv/tm-news, he-IL, Israel דה מרקר - פרשנויות היום, https://www.themarker.com/srv/tm-opinions, he-IL, Israel -Mail Online - Money, https://www.dailymail.co.uk/money/index.rss, en-US, UK diff --git a/datasets/news/canada.csv b/datasets/news/canada.csv new file mode 100644 index 0000000..7f8837d --- /dev/null +++ b/datasets/news/canada.csv @@ -0,0 +1,2 @@ +name, url, language, country +blogTO, http://www.blogto.com/rss/articles.xml, en-US, Canada diff --git a/datasets/news/code.csv b/datasets/news/code.csv index 7f75449..b05d209 100644 --- a/datasets/news/code.csv +++ b/datasets/news/code.csv @@ -4,4 +4,6 @@ Karl Bartel's Website, https://www.karl.berlin/atom.xml, en-US, Germany Newest Python PEPs, https://peps.python.org/peps.rss/, en-US, Worldwide Victor Stinner blog 3, https://vstinner.github.io/feeds/all.atom.xml, en-US, Worldwide Victor Stinner 🐍, https://mamot.fr/@vstinner.rss, en-US, Worldwide -camen design, https://camendesign.com/rss, en-US, USA +camen design, https://camendesign.com/rss, en-US, United States +LZone | Devops, https://lzone.de/feed/devops.xml, en-US, Germany +Leonora Tindall on Nora Codes, https://nora.codes/index.xml, en-US, United States diff --git a/datasets/news/computer.csv b/datasets/news/computer.csv index 893c5d0..428ed9a 100644 --- a/datasets/news/computer.csv +++ b/datasets/news/computer.csv @@ -2,19 +2,26 @@ name, url, language, country camen design, https://camendesign.com/rss, en-US, USA computers are bad, https://computer.rip/rss.xml, en-US, Worldwide Jacob McCormick, https://mccor.xyz/rss.xml, en-US, United States +OpenNews.opennet.ru: Общая лента новостей, https://www.opennet.ru/opennews/opennews_all_utf.rss, ru-RU, Russia ju_hnny5, https://blog.jbriault.fr/rss/, fr-FR, France Lazy Reading | The Cyber Vanguard, https://cyber.dabamos.de/blog/feed.rss, en-US, United States XXIIVV, https://wiki.xxiivv.com/links/rss.xml, en-US, Canada +drkhsh, https://drkhsh.at/atom.xml, en-US, Austria +Codemadness, https://codemadness.org/atom.xml, en-US, United States +Leonora Tindall on Nora Codes, https://nora.codes/index.xml, en-US, United States Proycon's website, https://proycon.anaproy.nl/rss.xml, en-US, Netherlands Nathan R. Yergler, https://yergler.net/feed.xml, en-US, United States ynet - דיגיטל, https://www.ynet.co.il/Integration/StoryRss544.xml, he-IL, Israel schollz, https://schollz.com/index.xml, en-US, United States +LZone | Devops, https://lzone.de/feed/devops.xml, en-US, Germany The Logs, https://www.flu0r1ne.net/logs/rss.xml, en-US, United States Newest Python PEPs, https://peps.python.org/peps.rss/, en-US, Worldwide +Ctrl blog: Mobile Apps, https://feed.ctrl.blog/topic/mobile-apps.atom, en-US, United States Chiportal, https://chiportal.co.il/feed/, he-IL, Israel Hackaday, https://hackaday.com/feed/, en-US, United States Amethyst Reese, https://noswap.com/feed.xml, en-US, United States electro·pizza, https://electro.pizza/feed.xml, en-US, United States +Laslo Hunhold, https://laslo.hunhold.de/index.xml, en-US, Germany VironIT, https://vironit.com/feed/, en-US, Georgia Necuno Solutions, https://necunos.com/feed.xml, en-US, Finland Flipper Blog, https://blog.flipper.net/rss/, en-US, United States @@ -47,3 +54,7 @@ Solene'%, https://dataswamp.org/~solene/rss.xml, en-US, United States Solene'%, https://dataswamp.org/~solene/rss-html.xml, en-US, United States Camen Design Forum, https://forum.camendesign.com/index.xml, en-US, United States dthompson, https://dthompson.us/feed.xml, en-US, Worldwide +alexander cobleigh (articles), https://cblgh.org/articles.xml, en-US, United States +Debricked, https://debricked.com/blog/feed/, en-US, United States +out there in space, https://dataswamp.org/~lich/atom.xml, en-US, United States +journal de prx, https://si3t.ch/log/atom.xml, fr-FR, Switzerland diff --git a/datasets/news/data.csv b/datasets/news/data.csv new file mode 100644 index 0000000..61cdfd6 --- /dev/null +++ b/datasets/news/data.csv @@ -0,0 +1,2 @@ +name, url, language, country +Postgres Professional, https://postgrespro.ru/rss, ru-RU, Russia diff --git a/datasets/news/fiction.csv b/datasets/news/fiction.csv index e06d425..f09600e 100644 --- a/datasets/news/fiction.csv +++ b/datasets/news/fiction.csv @@ -1,5 +1,4 @@ name, url, language, country -ynet - מדע, https://www.ynet.co.il/Integration/StoryRss2142.xml, he-IL, Israel Stories by Williams, https://storiesbywilliams.com/feed/, en-US, United States SciTechDaily, https://scitechdaily.com/feed/, en-US, United States ScienceDaily, https://www.sciencedaily.com/rss/all.xml, en-US, United States @@ -7,5 +6,8 @@ ScienceAlert, https://www.sciencealert.com/feed, en-US, United States NASA Image of the Day, https://www.nasa.gov/feeds/iotd-feed, en-US, United States Futurism, https://futurism.com/feed, en-US, United States Nature, https://www.nature.com/nature.rss, en-US, United States +ynet - מדע, https://www.ynet.co.il/Integration/StoryRss2142.xml, he-IL, Israel Mail Online - Science & tech, https://www.dailymail.co.uk/sciencetech/index.rss, en-US, United Kingdom New Atlas, https://newatlas.com/index.rss, en-US, United States +The Onion, https://www.theonion.com/rss, en-US, United States +Phys, https://phys.org/rss-feed/, en-US, United States diff --git a/datasets/news/internet.csv b/datasets/news/internet.csv index bf4da73..e056e51 100644 --- a/datasets/news/internet.csv +++ b/datasets/news/internet.csv @@ -1,11 +1,37 @@ name, url, language, country +jezebel cheblik, gopher://triapul.cz/0/rss.xml, en-US, United States +triapul.cz gopher, https://triapul.cz/feed/gopher.xml, en-US, Czech soeren-hentzschel.at - Aktuelles zu Mozilla, https://www.soeren-hentzschel.at/feed/, de-DE, Germany WordPress.com News, https://wordpress.com/blog/feed/, en-US, United States Micro.blog News, https://news.micro.blog/feed.xml, en-US, United States EFF Action Center, https://act.eff.org/action.atom, en-US, United States +Leonora Tindall on Nora Codes, https://nora.codes/index.xml, en-US, United States Melon's Thoughts - Guidebooks, https://thoughts.melonking.net/atom/?section=guides, en-US, United States thecozy.cat, https://thecozy.cat/feed/, en-US, United States +OpenNews.opennet.ru: Общая лента новостей, https://www.opennet.ru/opennews/opennews_all_utf.rss, ru-RU, Russia +Codemadness, https://codemadness.org/atom.xml, en-US, United States Melon's Thoughts, https://thoughts.melonking.net/atom/, en-US, United States An RSS Blog, https://www.rss-specifications.com/blog-feed.xml, en-US, United States The Blog Starter, https://www.theblogstarter.com/feed/, en-US, United States Mozilla Hacks, https://hacks.mozilla.org/feed/, en-US, United States +Vivaldi Social, https://social.vivaldi.net/@Vivaldi.rss, en-US, United States +Vivaldi Community, https://vivaldi.net/feed/, en-US, United States +Ctrl blog, https://feed.ctrl.blog/latest.atom, en-US, United States +drkhsh, https://drkhsh.at/atom.xml, en-US, Austria +Redecentralize Blog, https://redecentralize.org/blog/feed.rss, en-US, United States +Ctrl blog: WordPress, https://feed.ctrl.blog/topic/wordpress.atom, en-US, United States +Ctrl blog: HTTP Caching, https://feed.ctrl.blog/topic/http-caching.atom, en-US, United States +Ctrl blog: Email, https://feed.ctrl.blog/topic/email.atom, en-US, United States +Ctrl blog: Search engines, https://feed.ctrl.blog/topic/search-engines.atom, en-US, United States +Ctrl blog: Distributed web, https://feed.ctrl.blog/topic/distributed-web.atom, en-US, United States +Ctrl blog: VPN, https://feed.ctrl.blog/topic/vpn.atom, en-US, United States +Ctrl blog: Web Browsers, https://feed.ctrl.blog/topic/web-browsers.atom, en-US, United States +Ctrl blog: Networking, https://feed.ctrl.blog/topic/networking.atom, en-US, United States +Ctrl blog: DNS, https://feed.ctrl.blog/topic/dns.atom, en-US, United States +Ctrl blog: Web Monetization, https://feed.ctrl.blog/topic/web-monetization.atom, en-US, United States +Ctrl blog: HTML, https://feed.ctrl.blog/topic/html.atom, en-US, United States +Ctrl blog: Browser Extensions, https://feed.ctrl.blog/topic/browser-extensions.atom, en-US, United States +Ctrl blog: P2P, https://feed.ctrl.blog/topic/p2p.atom, en-US, United States +Ctrl blog: Syndication feeds, https://feed.ctrl.blog/topic/syndication-feeds.atom, en-US, United States +Ctrl blog: Wi-Fi, https://feed.ctrl.blog/topic/wi-fi.atom, en-US, United States + diff --git a/datasets/news/local.csv b/datasets/news/local.csv index 82c640b..537d62a 100644 --- a/datasets/news/local.csv +++ b/datasets/news/local.csv @@ -1,2 +1,2 @@ name, url, language, country -Tampa Free Press, https://www.tampafp.com/feed/, en-US, USA +Tampa Free Press, https://www.tampafp.com/feed/, en-US, United States diff --git a/datasets/news/misc.csv b/datasets/news/misc.csv index afa0a14..f51fcaa 100644 --- a/datasets/news/misc.csv +++ b/datasets/news/misc.csv @@ -1,3 +1,6 @@ name, url, language, country Inhaltsangabe.info, https://www.inhaltsangabe.info/feed, de-DE, Germany Kasparov, https://www.kasparov.com/feed/, en-US, United States +Ctrl blog: Metadata, https://feed.ctrl.blog/topic/metadata.atom, en-US, United States +Ctrl blog: Compression, https://feed.ctrl.blog/topic/compression.atom, en-US, United States +Ctrl blog: Backup, https://feed.ctrl.blog/topic/backup.atom, en-US, United States diff --git a/datasets/news/p2p.csv b/datasets/news/p2p.csv new file mode 100644 index 0000000..50e5f6c --- /dev/null +++ b/datasets/news/p2p.csv @@ -0,0 +1,4 @@ +name, url, language, country +Ctrl blog: P2P, https://feed.ctrl.blog/topic/p2p.atom, en-US, United States +OpenNews.opennet.ru: Общая лента новостей, https://www.opennet.ru/opennews/opennews_all_utf.rss, ru-RU, Russia +Redecentralize Blog, https://redecentralize.org/blog/feed.rss, en-US, United States diff --git a/datasets/news/people.csv b/datasets/news/people.csv index 72721bd..0fe5666 100644 --- a/datasets/news/people.csv +++ b/datasets/news/people.csv @@ -9,10 +9,13 @@ PureTryOut, https://mastodon.fam-ribbers.com/@bart.rss, en-US, Netherlands Tristan B. Velloza Kildaire, https://gleasonator.com/@deavmi, en-ZA, South Africa Blog on Bart Ribbers - PureTryOut, https://fam-ribbers.com/blog/index.xml, en-US, Netherlands ollieparanoid, https://ollieparanoid.github.io/feed.xml, en-US, United States -Oliver Smith, https://fosstodon.org/@ollieparanoid, en-US, United States +Oliver Smith, https://fosstodon.org/@ollieparanoid, en-US, Germany +drkhsh, https://drkhsh.at/atom.xml, en-US, Austria +Codemadness, https://codemadness.org/atom.xml, en-US, United States Keywan Tonekaboni, https://social.heise.de/@ktn.rss, de-DE, Germany keywan, https://chaos.social/@keywan.rss, de-DE, Germany foreverliketh.is, https://foreverliketh.is/blog/index.xml, en-US, United States +out there in space, https://dataswamp.org/~lich/atom.xml, en-US, United States unique hazards may exist, https://uniquehazards.com/feed.xml, en-US, United States Aphrodite.dev, https://www.aphrodite.dev/~blog/feed.xml, en-US, United States a walkaway story, http://xj-ix.luxe/feed.atom, en-US, United States @@ -32,3 +35,7 @@ Interconnected (Matt Webb), https://interconnected.org/home/feed, en-US, United metasyn.pw, https://metasyn.pw/rss.xml, en-US, United States Mika Naylor, https://hordburh.autophagy.io/@mika.rss, en-US, United States rezmason, https://merveilles.town/@rezmason.rss, en-US, United States +alexander cobleigh, https://cblgh.org/all.xml, en-US, United States +alexander cobleigh (updates), https://cblgh.org/updates.xml, en-US, United States +Daniel Aleksandersen, https://mastodon.daniel.priv.no/@da.rss, en-US, United States +Laslo Hunhold, https://laslo.hunhold.de/index.xml, en-US, Germany diff --git a/datasets/news/privacy.csv b/datasets/news/privacy.csv index 83a27ea..86e26cb 100644 --- a/datasets/news/privacy.csv +++ b/datasets/news/privacy.csv @@ -3,7 +3,9 @@ The Logs, https://www.flu0r1ne.net/logs/rss.xml, en-US, United States Necuno Solutions, https://necunos.com/feed.xml, en-US, Finland ollieparanoid, https://ollieparanoid.github.io/feed.xml, en-US, United States FSFE News, https://fsfe.org/news/news.en.rss, en-US, Germany +OpenNews.opennet.ru: Общая лента новостей, https://www.opennet.ru/opennews/opennews_all_utf.rss, ru-RU, Russia FSFE News (DE), https://fsfe.org/news/news.de.rss, de-DE, Germany FSFE News (FR), https://fsfe.org/news/news.fr.rss, fr-FR, Germany EFF Action Center, https://act.eff.org/action.atom, en-US, United States Spread Privacy, https://spreadprivacy.com/rss/, en-US, United States +Ctrl blog: Privacy, https://feed.ctrl.blog/topic/privacy.atom, en-US, United States diff --git a/datasets/news/relationship.csv b/datasets/news/relationship.csv index 24abb1b..ed516b1 100644 --- a/datasets/news/relationship.csv +++ b/datasets/news/relationship.csv @@ -1,4 +1,4 @@ name, url, language, country -Knowledge For Men, https://www.knowledgeformen.com/feed/, en-US, USA +Knowledge For Men, https://www.knowledgeformen.com/feed/, en-US, United States ynet - יחסים, https://www.ynet.co.il/Integration/StoryRss3925.xml, he-IL, Israel - +Seeking Blog, https://blog.seeking.com/feed/, en-US, United States diff --git a/datasets/news/security.csv b/datasets/news/security.csv index 01c5ad0..90693a7 100644 --- a/datasets/news/security.csv +++ b/datasets/news/security.csv @@ -1,3 +1,5 @@ name, url, language, country -The Organic Prepper, https://www.theorganicprepper.com/feed/, en-US, USA -The Logs, https://www.flu0r1ne.net/logs/rss.xml, en-US, USA +The Organic Prepper, https://www.theorganicprepper.com/feed/, en-US, United States +The Logs, https://www.flu0r1ne.net/logs/rss.xml, en-US, United States +Ctrl blog: Security, https://feed.ctrl.blog/topic/security.atom, en-US, United States +drkhsh, https://drkhsh.at/atom.xml, en-US, Austria diff --git a/datasets/news/technology.csv b/datasets/news/technology.csv index e9d0c1a..779fb5a 100644 --- a/datasets/news/technology.csv +++ b/datasets/news/technology.csv @@ -1,14 +1,19 @@ name, url, language, country +Redecentralize Blog, https://redecentralize.org/blog/feed.rss, en-US, United States Developpez, https://www.developpez.com/index/atom, fr-FR, France The Logs, https://www.flu0r1ne.net/logs/rss.xml, en-US, United States CryptoSlate, https://cryptoslate.com/feed/, en-US, United States +Codemadness, https://codemadness.org/atom.xml, en-US, United States Daily Stormer, https://dailystormer.in/feed/, en-US, United States Futurism, https://futurism.com/feed, en-US, United States +drkhsh, https://drkhsh.at/atom.xml, en-US, Austria Automation Rhapsody, https://automationrhapsody.com/feed/, en-US, United States Deep Thoughts by Raymond Hettinger, https://rhettinger.wordpress.com/feed/, en-US, United States Chiportal, https://chiportal.co.il/feed/, he-IL, Israel Hackaday, https://hackaday.com/feed/, en-US, United States +LZone | Devops, https://lzone.de/feed/devops.xml, en-US, Germany Hacker News, https://news.ycombinator.com/rss, en-US, United States +Laslo Hunhold, https://laslo.hunhold.de/index.xml, en-US, Germany Hacker News: Front Page, https://hnrss.org/frontpage, en-US, United States Amethyst Reese, https://noswap.com/feed.xml, en-US, United States Necuno Solutions, https://necunos.com/feed.xml, en-US, Finland @@ -22,3 +27,5 @@ AlternativeTo News, https://feed.alternativeto.net/news/all/, en-US, United Stat Ηρακλής Παπαθεοδώρου • heracl.es, https://heracl.es/el/feed.xml, el-GR, Greece Heracles Papatheodorou • heracl.es, https://heracl.es/feed.xml, en-US, Greece lectronice :: now, https://now.lectronice.com/feed.xml, en-US, United States +Ctrl blog: Advertisement Technology, https://feed.ctrl.blog/topic/advertisement-technology.atom, en-US, United States +OpenNews.opennet.ru: Общая лента новостей, https://www.opennet.ru/opennews/opennews_all_utf.rss, ru-RU, Russia diff --git a/datasets/news/telecom.csv b/datasets/news/telecom.csv index 3b104d3..8a672a9 100644 --- a/datasets/news/telecom.csv +++ b/datasets/news/telecom.csv @@ -1,3 +1,4 @@ name, url, language, country The XMPP Blog on XMPP, https://xmpp.org/feeds/all.atom.xml, en-US, Worldwide +Redecentralize Blog, https://redecentralize.org/blog/feed.rss, en-US, United States ollieparanoid, https://ollieparanoid.github.io/feed.xml, en-US, United States diff --git a/datasets/news/xmpp.csv b/datasets/news/xmpp.csv index 4590b03..1a82a51 100644 --- a/datasets/news/xmpp.csv +++ b/datasets/news/xmpp.csv @@ -1,2 +1,3 @@ name, url, language, country The XMPP Blog on XMPP, https://xmpp.org/feeds/all.atom.xml, en-US, Worldwide +Swift IM, https://swift.im/wordpress/index.php/feed/, en-US, Worldwide diff --git a/datasets/podcasts/culture.csv b/datasets/podcasts/culture.csv index d4cfa23..a505921 100644 --- a/datasets/podcasts/culture.csv +++ b/datasets/podcasts/culture.csv @@ -1,6 +1,6 @@ name, url, language, country -American Dissident Voices, https://nationalvanguard.org/category/american-dissident-voices/feed/, en-US, USA -Radio 3Fourteen, https://redice.tv/rss/radio-3fourteen, en-US, USA +American Dissident Voices, https://nationalvanguard.org/category/american-dissident-voices/feed/, en-US, United States +Radio 3Fourteen, https://redice.tv/rss/radio-3fourteen, en-US, United States The National Archives - Podcast Series, https://www.nationalarchives.gov.uk/rss/podcasts.xml, en-UK, United Kingdom -Oracle Broadcasting Recent Shows, http://www.oraclebroadcasting.com/rss_recent.php, en-US, USA -Speak Free Radio, https://speakfreeradio.com/feed/, en-US, USA +Oracle Broadcasting Recent Shows, http://www.oraclebroadcasting.com/rss_recent.php, en-US, United States +Speak Free Radio, https://speakfreeradio.com/feed/, en-US, United States diff --git a/datasets/podcasts/technology.csv b/datasets/podcasts/technology.csv index 455108c..bf48452 100644 --- a/datasets/podcasts/technology.csv +++ b/datasets/podcasts/technology.csv @@ -3,3 +3,5 @@ The Corbett Report, https://www.corbettreport.com/feed/, en-US, Japan postmarketOS, https://cast.postmarketos.org/feed.rss, en-US, Germany Software Freedom Podcast, http://fsfe.org/news/podcast-opus.en.rss, en-US, Germany Software Freedom Podcast, http://fsfe.org/news/podcast-opus.en.rss, en-US, Germany +Redecentralize Blog, https://redecentralize.org/blog/feed.rss, en-US, United States +// aNONradio //, https://anonradio.net/feed/, en-US, Worldwide diff --git a/datasets/projects/chat.csv b/datasets/projects/chat.csv new file mode 100644 index 0000000..b23d33a --- /dev/null +++ b/datasets/projects/chat.csv @@ -0,0 +1,8 @@ +name, url, language, country +sscall, https://git.2f30.org/sscall/atom.xml, en-US, Worldwide +Swift IM, https://swift.im/wordpress/index.php/feed/, en-US, Worldwide +Kaidan, https://www.kaidan.im/atom.xml, en-US, Worldwide +Dino, https://dino.im/index.xml, en-US, Worldwide +ratox, https://git.2f30.org/ratox/atom.xml, en-US, Worldwide +buzz, https://git.2f30.org/buzz/atom.xml, en-US, Worldwide +mIRC, https://www.mirc.com/feed/, en-US, Worldwide diff --git a/datasets/projects/encryption.csv b/datasets/projects/encryption.csv new file mode 100644 index 0000000..1cc5f8a --- /dev/null +++ b/datasets/projects/encryption.csv @@ -0,0 +1,2 @@ +name, url, language, country +pass, https://git.2f30.org/pass/atom.xml, en-US, Worldwide diff --git a/datasets/projects/firewall.csv b/datasets/projects/firewall.csv new file mode 100644 index 0000000..81d34a3 --- /dev/null +++ b/datasets/projects/firewall.csv @@ -0,0 +1,2 @@ +name, url, language, country +pfsense, https://www.netgate.com/blog/rss.xml, en-US, Worldwide diff --git a/datasets/projects/forums.csv b/datasets/projects/forums.csv index d2e7644..8c6d024 100644 --- a/datasets/projects/forums.csv +++ b/datasets/projects/forums.csv @@ -1,3 +1,12 @@ name, url, language, country camen design, https://camendesign.com/rss, en-US, United States -nodebb, https://nodebb.org/feed/, en-US, United States +nodebb, https://nodebb.org/feed/, en-US, Worldwide +Phorum, https://www.phorum.org/phorum5/feed.php?64,type=rss, en-US, Worldwide +phpBB, https://www.phpbb.com/feeds/rss/, en-US, Worldwide +ElkArte, https://www.elkarte.net/community/index.php?board=21.0;action=.xml;type=rss2;limit=5, en-US, Worldwide +MyBB, https://blog.mybb.com/feed/, en-US, Worldwide +Discourse, https://blog.discourse.org/rss/, en-US, Worldwide +Simple Machines, https://www.simplemachines.org/community/index.php?action=.xml;type=atom, en-US, Worldwide +FluxBB, https://fluxbb.org/forums/extern.php?action=feed&fid=1&order=posted&type=atom, en-US, Worldwide +Invision Community News, https://invisioncommunity.com/rss/1-invision-community-news.xml/, en-US, Worldwide +Askbot, https://askbot.org/en/feeds/rss/, en-US, Chile diff --git a/datasets/projects/internet.csv b/datasets/projects/internet.csv index 9a87952..de303e6 100644 --- a/datasets/projects/internet.csv +++ b/datasets/projects/internet.csv @@ -3,6 +3,16 @@ DownThemAll!, https://www.downthemall.org/feed, en-US, Worldwide Falkon - KDE web browser, https://www.falkon.org/atom.xml, en-US, Czech What's Up, Fraidycat?, https://fraidyc.at/blog/feed.xml, en-US, Worldwide geomyidae, branch HEAD, gopher://bitreich.org:70/0/scm/geomyidae/atom.xml, en-US, United States -rclone - rsync for cloud storage, https://rclone.org/index.xml, en-US, United States +rclone - rsync for cloud storage, https://rclone.org/index.xml, en-US, Worldwide Feedbin, https://feedbin.com/blog/atom.xml, en-US, United States -Silvio Rizzi (reederapp.com), https://gloria.social/@rizzi.rss, en-US, United States +Silvio Rizzi (reederapp.com), https://gloria.social/@rizzi.rss, en-US, Worldwide +lighty, https://redmine.lighttpd.net/news.atom, en-US, Worldwide +lighttpd, https://www.lighttpd.net/feed/atom.xml, en-US, Worldwide +Cabal, https://mastodon.social/@cabal.rss, en-US, Worldwide +JSON Feed, https://www.jsonfeed.org/feed.xml, en-US, Worldwide +Liferea, https://lzone.de/feed/liferea.xml, en-US, Germany +sscall, https://git.2f30.org/sscall/atom.xml, en-US, Worldwide +Swift IM, https://swift.im/wordpress/index.php/feed/, en-US, Worldwide +Kaidan, https://www.kaidan.im/atom.xml, en-US, Worldwide +Dino, https://dino.im/index.xml, en-US, Worldwide +Vivaldi Browser, https://vivaldi.com/feed/, en-US, United States diff --git a/datasets/projects/issue_tracker.csv b/datasets/projects/issue_tracker.csv new file mode 100644 index 0000000..50e9f17 --- /dev/null +++ b/datasets/projects/issue_tracker.csv @@ -0,0 +1,2 @@ +name, url, language, country +Redmine, https://www.redmine.org/news.atom, en-US, Worldwide diff --git a/datasets/projects/multimedia.csv b/datasets/projects/multimedia.csv index 7dbaacc..e4ac088 100644 --- a/datasets/projects/multimedia.csv +++ b/datasets/projects/multimedia.csv @@ -1,3 +1,5 @@ name, url, language, country mosu's Matroska stuff, https://www.bunkus.org/blog/feed/, en-US, Worldwide - +nausea, https://git.2f30.org/nausea/atom.xml, en-US, Worldwide +sad, https://git.2f30.org/sad/atom.xml, en-US, Worldwide +MOC - music on console, http://moc.daper.net/node/feed, en-US, New Zealand diff --git a/datasets/projects/office.csv b/datasets/projects/office.csv index 305b7ac..5085756 100644 --- a/datasets/projects/office.csv +++ b/datasets/projects/office.csv @@ -1,2 +1,5 @@ name, url, language, country Justine Smithies, https://fosstodon.org/@JustineSmithies.rss, en-US, United States +Invoice Ninja, https://www.invoiceninja.org/feed/, en-US, Worldwide +catpoint, https://git.2f30.org/catpoint/atom.xml, en-US, Worldwide +Sunflower, https://sunflower-fm.org/feed/, en-US, Worldwide diff --git a/datasets/projects/operating_system.csv b/datasets/projects/operating_system.csv index 3dd99b3..4b2c227 100644 --- a/datasets/projects/operating_system.csv +++ b/datasets/projects/operating_system.csv @@ -3,3 +3,4 @@ NixOS, https://nixos.org/blog/announcements-rss.xml, en-US, USA ReactOS, https://reactos.org/index.xml, en-US, Germany Salix OS, https://forum.salixos.org/app.php/feed/news, en-US, Greece postmarketOS, https://postmarketos.org/blog/feed.atom, en-US, Germany +cynix, https://git.2f30.org/cynix/atom.xml, en-US, Worldwide diff --git a/datasets/projects/p2p.csv b/datasets/projects/p2p.csv new file mode 100644 index 0000000..ea0a703 --- /dev/null +++ b/datasets/projects/p2p.csv @@ -0,0 +1,2 @@ +name, url, language, country +Cabal, https://mastodon.social/@cabal.rss, en-US, Worldwide diff --git a/datasets/projects/programming_language.csv b/datasets/projects/programming_language.csv new file mode 100644 index 0000000..715e323 --- /dev/null +++ b/datasets/projects/programming_language.csv @@ -0,0 +1,2 @@ +name, url, language, country +Ruby, https://www.ruby-lang.org/en/feeds/news.rss, en-US, Worldwide diff --git a/datasets/projects/system.csv b/datasets/projects/system.csv new file mode 100644 index 0000000..38b39cb --- /dev/null +++ b/datasets/projects/system.csv @@ -0,0 +1,5 @@ +name, url, language, country +sinit, https://git.2f30.org/sinit/atom.xml, en-US, Worldwide +xbattmon, https://git.2f30.org/xbattmon/atom.xml, en-US, Worldwide +go-bgp, https://git.2f30.org/go-bgp/atom.xml, en-US, Worldwide +fatbase, https://git.2f30.org/fatbase/atom.xml, en-US, Worldwide diff --git a/datasets/projects/terminal.csv b/datasets/projects/terminal.csv new file mode 100644 index 0000000..ea1444b --- /dev/null +++ b/datasets/projects/terminal.csv @@ -0,0 +1,5 @@ +name, url, language, country +skroll, https://git.2f30.org/skroll/atom.xml, en-US, Worldwide +buzz, https://git.2f30.org/buzz/atom.xml, en-US, Worldwide +sscall, https://git.2f30.org/sscall/atom.xml, en-US, Worldwide +MOC - music on console, http://moc.daper.net/node/feed, en-US, New Zealand diff --git a/datasets/projects/visualization.csv b/datasets/projects/visualization.csv index ac0c989..fce9dd2 100644 --- a/datasets/projects/visualization.csv +++ b/datasets/projects/visualization.csv @@ -1,2 +1,3 @@ name, url, language, country VTK - The Visualization Toolkit, https://vtk.org/feed/, en-US, USA +nausea, https://git.2f30.org/nausea/atom.xml, en-US, Worldwide diff --git a/datasets/projects/website.csv b/datasets/projects/website.csv index da6fddb..b067c8f 100644 --- a/datasets/projects/website.csv +++ b/datasets/projects/website.csv @@ -14,3 +14,4 @@ TYPO3, https://typo3.org/rss, en-US, Worldwide WordPress, https://wordpress.org/news/feed/, en-US, Worldwide Foswiki, https://foswiki.org/Home/WebRss, en-US, Worldwide Eleventy, https://www.11ty.dev/blog/feed.xml, en-US, Worldwide +bliper, https://git.2f30.org/bliper/atom.xml, en-US, Worldwide diff --git a/datasets/projects/wifi.csv b/datasets/projects/wifi.csv new file mode 100644 index 0000000..0061792 --- /dev/null +++ b/datasets/projects/wifi.csv @@ -0,0 +1,3 @@ +name, url, language, country +wificurse, https://git.2f30.org/wificurse/atom.xml, en-US, Worldwide +Aircrack-ng, https://aircrack-ng.blogspot.com/feeds/posts/default, en-US, Worldwide diff --git a/datasets/videos/technology.csv b/datasets/videos/technology.csv index f34872b..ca50185 100644 --- a/datasets/videos/technology.csv +++ b/datasets/videos/technology.csv @@ -5,4 +5,5 @@ Films By Kris, https://filmsbykris.com/rss.xml, en-US, USA Blender Video, https://video.blender.org/feeds/videos.xml, en-US, United States Framatube, https://framatube.org/feeds/videos.xml, fr-FR, France Framasoft, https://framatube.org/feeds/videos.xml?accountId=3&sort=-publishedAt, fr-FR, France +Redecentralize Blog, https://redecentralize.org/blog/feed.rss, en-US, United States FSFE, https://media.fsfe.org/feeds/videos.xml?accountId=4, de-DE, Germany diff --git a/datasets/wiki/computing.csv b/datasets/wiki/computing.csv index 35b4059..765889e 100644 --- a/datasets/wiki/computing.csv +++ b/datasets/wiki/computing.csv @@ -1,2 +1,3 @@ name, url, language, country [ ChaoticWiki ] Content for /., https://wiki.chaotic.ninja/.rss_full, en-US, Worldwide +Archiveteam - Recent changes [en], https://wiki.archiveteam.org/index.php?title=Special:RecentChanges&feed=atom, en-US, Worldwide diff --git a/datasets/wiki/data.csv b/datasets/wiki/data.csv new file mode 100644 index 0000000..9a3555b --- /dev/null +++ b/datasets/wiki/data.csv @@ -0,0 +1,2 @@ +name, url, language, country +Archiveteam - Recent changes [en], https://wiki.archiveteam.org/index.php?title=Special:RecentChanges&feed=atom, en-US, Worldwide diff --git a/datasets/wiki/wifi.csv b/datasets/wiki/wifi.csv new file mode 100644 index 0000000..d0fadd7 --- /dev/null +++ b/datasets/wiki/wifi.csv @@ -0,0 +1,2 @@ +name, url, language, country +Recent Commits to aircrack-ng:master, https://github.com/aircrack-ng/aircrack-ng/commits/master.atom, en-US, Worldwide diff --git a/slixfeed/datahandler.py b/slixfeed/datahandler.py index 5d58275..56a1bd3 100644 --- a/slixfeed/datahandler.py +++ b/slixfeed/datahandler.py @@ -8,6 +8,10 @@ FIXME 1) feed_mode_scan doesn't find feed for https://www.blender.org/ even though it should be according to the pathnames dictionary. +TODO + +1) Support Gemini and Gopher. + """ import aiohttp @@ -185,7 +189,11 @@ async def download_updates(db_file, url=None): ) if reject_list: # print(">>> REJECTED", title) - summary = "REJECTED" + summary = ( + "REJECTED {}".format( + reject_list.upper() + ) + ) # summary = "" read_status = 1 entry = ( @@ -622,7 +630,11 @@ async def feed_mode_request(db_file, url, tree): except: feed_name = urlsplit(feed).netloc feed_addr = feed - feed_amnt = len(feeds[feed].entries) + # AttributeError: 'str' object has no attribute 'entries' + try: + feed_amnt = len(feeds[feed].entries) + except: + continue if feed_amnt: positive = 1 msg += ( diff --git a/slixfeed/filterhandler.py b/slixfeed/filterhandler.py index 968829d..ad68762 100644 --- a/slixfeed/filterhandler.py +++ b/slixfeed/filterhandler.py @@ -47,6 +47,23 @@ async def set_filter(newwords, keywords): return val async def is_listed(db_file, type, string): + """ + Check keyword match. + + Parameters + ---------- + db_file : str + Path to database file. + type : str + "allow" or "deny". + string : str + String. + + Returns + ------- + Matched keyword or None. + + """ # async def reject(db_file, string): # async def is_blacklisted(db_file, string): filter_type = "filter-" + type @@ -61,7 +78,8 @@ async def is_listed(db_file, type, string): continue if i in string.lower(): # print(">>> ACTIVATE", i) - return 1 + # return 1 + return i else: return None diff --git a/slixfeed/sqlitehandler.py b/slixfeed/sqlitehandler.py index baa6ae1..ffa76a4 100644 --- a/slixfeed/sqlitehandler.py +++ b/slixfeed/sqlitehandler.py @@ -969,13 +969,25 @@ async def remove_nonexistent_entries(db_file, feed, source): "FROM entries " "WHERE entries.id = :ix" ) - cur.execute(sql, (ix,)) + try: + cur.execute(sql, (ix,)) + except: + print( + "ERROR DB inset from entries " + "into archive at index", ix + ) sql = ( "DELETE " "FROM entries " "WHERE id = :ix" ) - cur.execute(sql, (ix,)) + try: + cur.execute(sql, (ix,)) + except: + print( + "ERROR DB deleting entries " + "from entries at index", ix + ) async def get_feeds(db_file): @@ -1223,9 +1235,9 @@ async def search_entries(db_file, query): """ FIXME Error due to missing date, but it appears that date is present: -this is source: https://blog.heckel.io/feed/ -this is date: 2008-05-13T13:51:50+00:00 -no result. this is source: https://blog.heckel.io/feed/ +ERROR DATE: source = https://blog.heckel.io/feed/ +ERROR DATE: date = 2008-05-13T13:51:50+00:00 +ERROR DATE: result = https://blog.heckel.io/feed/ """ async def check_entry_exist(db_file, source, eid=None, title=None, link=None, date=None): @@ -1282,8 +1294,8 @@ async def check_entry_exist(db_file, source, eid=None, "timestamp": date }).fetchone() except: - print(await datetimehandler.current_time(), "ERROR: date for:", source) - print(await datetimehandler.current_time(), "ERROR: date for:", date) + print(await datetimehandler.current_time(), "ERROR DATE: source =", source) + print(await datetimehandler.current_time(), "ERROR DATE: date =", date) else: sql = ( "SELECT id " @@ -1300,7 +1312,7 @@ async def check_entry_exist(db_file, source, eid=None, else: None except: - print(await datetimehandler.current_time(), "ERROR: result for", source) + print(await datetimehandler.current_time(), "ERROR DATE: result =", source) async def set_settings_value(db_file, key_value): diff --git a/slixfeed/taskhandler.py b/slixfeed/taskhandler.py index 91b194d..9fe15a5 100644 --- a/slixfeed/taskhandler.py +++ b/slixfeed/taskhandler.py @@ -66,28 +66,38 @@ await taskhandler.start_tasks( ) """ -async def start_tasks(self, jid, tasks): +async def start_tasks_xmpp(self, jid, tasks): task_manager[jid] = {} for task in tasks: + print("task") + print(task) + print("tasks") + print(tasks) + # breakpoint() match task: case "check": task_manager[jid]["check"] = asyncio.create_task( check_updates(jid) ) - await task_manager[jid]["check"] case "status": task_manager[jid]["status"] = asyncio.create_task( send_status(self, jid) ) - await task_manager[jid]["status"] case "interval": task_manager[jid]["interval"] = asyncio.create_task( send_update(self, jid) ) - await task_manager[jid]["interval"] + # for task in task_manager[jid].values(): + # print("task_manager[jid].values()") + # print(task_manager[jid].values()) + # print("task") + # print(task) + # print("jid") + # print(jid) + # breakpoint() + # await task - -async def clean_tasks(jid, tasks): +async def clean_tasks_xmpp(jid, tasks): for task in tasks: # if task_manager[jid][task]: try: @@ -164,6 +174,7 @@ async def task_jid(self, jid): async def send_update(self, jid, num=None): + print(await datetimehandler.current_time(), jid, "def send_update") """ Send news items as messages. @@ -224,6 +235,7 @@ async def send_update(self, jid, num=None): async def send_status(self, jid): + print(await datetimehandler.current_time(), jid, "def send_status") """ Send status message. @@ -345,6 +357,7 @@ async def refresh_task(self, jid, callback, key, val=None): # TODO Take this function out of # async def check_updates(jid): + print(await datetimehandler.current_time(), jid, "def check_updates") """ Start calling for update check up. diff --git a/slixfeed/xmpphandler.py b/slixfeed/xmpphandler.py index eb41af4..eb95a4e 100644 --- a/slixfeed/xmpphandler.py +++ b/slixfeed/xmpphandler.py @@ -144,8 +144,16 @@ class Slixfeed(slixmpp.ClientXMPP): print("def presence_available", presence["from"].bare) if presence["from"].bare not in self.boundjid.bare: jid = presence["from"].bare - await taskhandler.clean_tasks(jid, ["interval", "status", "check"]) - await taskhandler.task_jid(self, jid) + await taskhandler.clean_tasks_xmpp( + jid, + ["interval", "status", "check"] + ) + await taskhandler.start_tasks_xmpp( + self, + jid, + ["interval", "status", "check"] + ) + # await taskhandler.task_jid(self, jid) # main_task.extend([asyncio.create_task(taskhandler.task_jid(jid))]) # print(main_task) @@ -280,7 +288,7 @@ class Slixfeed(slixmpp.ClientXMPP): jid = presence["from"].bare if presence["type"] == "unavailable": print(">>> unavailable:", jid) - await taskhandler.clean_tasks( + await taskhandler.clean_tasks_xmpp( jid, ["interval", "status", "check"] ) @@ -299,11 +307,11 @@ class Slixfeed(slixmpp.ClientXMPP): # # print(task_manager[jid]) elif presence["show"] in ("away", "dnd", "xa"): print(">>> away, dnd, xa:", jid) - await taskhandler.clean_tasks( + await taskhandler.clean_tasks_xmpp( jid, ["interval"] ) - await taskhandler.start_tasks( + await taskhandler.start_tasks_xmpp( self, jid, ["status", "check"] @@ -465,16 +473,24 @@ class Slixfeed(slixmpp.ClientXMPP): ) # action = "> " + message + "\n" + action # FIXME Make the taskhandler to update status message - await taskhandler.refresh_task( + # await taskhandler.refresh_task( + # self, + # jid, + # taskhandler.send_status, + # "status", + # 20 + # ) + # NOTE This would show the number of new unread entries + await taskhandler.clean_tasks_xmpp( + jid, + ["status"] + ) + # await taskhandler.send_status(jid) + await taskhandler.start_tasks_xmpp( self, jid, - taskhandler.send_status, - "status", - 20 + ["status"] ) - # NOTE This would show the number of new unread entries - # await taskhandler.clean_tasks(jid, ["status"]) - # await taskhandler.send_status(jid) case _ if message_lowercase.startswith("feeds"): query = message[6:] if query: @@ -524,20 +540,29 @@ class Slixfeed(slixmpp.ClientXMPP): action = "Missing value." case _ if message_lowercase.startswith("next"): num = message[5:] - await taskhandler.refresh_task( + await taskhandler.clean_tasks_xmpp( + jid, + ["interval", "status"] + ) + await taskhandler.start_tasks_xmpp( self, jid, - taskhandler.send_update, - "interval", - num - ) - await taskhandler.refresh_task( - self, - jid, - taskhandler.send_status, - "status", - 20 + ["interval", "status"] ) + # await taskhandler.refresh_task( + # self, + # jid, + # taskhandler.send_update, + # "interval", + # num + # ) + # await taskhandler.refresh_task( + # self, + # jid, + # taskhandler.send_status, + # "status", + # 20 + # ) # await taskhandler.refresh_task(jid, key, val) case _ if message_lowercase.startswith("quantum"): key = message[:7] @@ -576,12 +601,21 @@ class Slixfeed(slixmpp.ClientXMPP): sqlitehandler.remove_feed, ix ) - await taskhandler.refresh_task( + # await taskhandler.refresh_task( + # self, + # jid, + # taskhandler.send_status, + # "status", + # 20 + # ) + await taskhandler.clean_tasks_xmpp( + jid, + ["status"] + ) + await taskhandler.start_tasks_xmpp( self, jid, - taskhandler.send_status, - "status", - 20 + ["status"] ) else: action = "Missing feed ID." @@ -609,7 +643,12 @@ class Slixfeed(slixmpp.ClientXMPP): sqlitehandler.set_settings_value, [key, val] ) - asyncio.create_task(taskhandler.task_jid(self, jid)) + # asyncio.create_task(taskhandler.task_jid(self, jid)) + await taskhandler.start_tasks_xmpp( + self, + jid, + ["interval", "status", "check"] + ) action = "Updates are enabled." # print(await datetimehandler.current_time(), "task_manager[jid]") # print(task_manager[jid]) @@ -654,7 +693,7 @@ class Slixfeed(slixmpp.ClientXMPP): sqlitehandler.set_settings_value, [key, val] ) - await taskhandler.clean_tasks(jid, ["interval"]) + await taskhandler.clean_tasks_xmpp(jid, ["interval"]) self.send_presence( pshow="xa", pstatus="Send \"Start\" to receive news.",