From 6ec062ccd58a264221a4fb2db271ae65b997d7b9 Mon Sep 17 00:00:00 2001 From: flameshikari Date: Wed, 24 Jul 2024 13:46:05 +0500 Subject: [PATCH 1/5] upgrade scraper: Puppy Linux --- src/distros/puppy/info.json | 2 +- src/distros/puppy/scraper.py | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/distros/puppy/info.json b/src/distros/puppy/info.json index c7937f0..ea89ce8 100644 --- a/src/distros/puppy/info.json +++ b/src/distros/puppy/info.json @@ -1,4 +1,4 @@ { "name": "Puppy Linux", - "url": "https://puppylinux.com" + "url": "https://puppylinux-woof-ce.github.io" } diff --git a/src/distros/puppy/scraper.py b/src/distros/puppy/scraper.py index dbc2f87..40eba84 100644 --- a/src/distros/puppy/scraper.py +++ b/src/distros/puppy/scraper.py @@ -4,15 +4,27 @@ def init(): values = [] - exceptions = ['distro.ibiblio.org'] - regexp_version = re.compile(r'-(\d+\.\d+(\.\d+)?)') - url_base = 'https://puppylinux-woof-ce.github.io/' + regexp_version = re.compile(r'-(\d+\.\d+(-\d+)?)') + distros = [ + 'BionicPup32', + 'BookwormPup32', + 'BookwormPup64', + 'FocalPup32', + 'JammyPup32', + 'NoblePup32', + 'VoidPup32', + 'VoidPup64', + 'S15Pup32', + 'S15Pup64' + ] - for iso_url in get.urls(url_base, exclude=exceptions): - - iso_arch = get.arch(iso_url) - iso_size = get.size(iso_url) - iso_version = re.search(regexp_version, iso_url).group(1) - values.append((iso_url, iso_arch, iso_size, iso_version)) + for distro in distros: + url_base = f'https://sourceforge.net/projects/pb-gh-releases/files/{distro}_release/' + for iso_url in get.urls(url_base): + iso_size = iso_url['size'] + iso_url = iso_url['url'] + iso_arch = get.arch(iso_url) + iso_version = re.search(regexp_version, iso_url).group(1) + values.append((iso_url, iso_arch, iso_size, iso_version)) return values From bd5d20f52b842304bf364951119e6a56c58f77e3 Mon Sep 17 00:00:00 2001 From: flameshikari Date: Wed, 24 Jul 2024 13:58:29 +0500 Subject: [PATCH 2/5] upgrade scraper: CloneZilla --- src/distros/clonezilla/scraper.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/distros/clonezilla/scraper.py b/src/distros/clonezilla/scraper.py index 7775c3e..38863f1 100644 --- a/src/distros/clonezilla/scraper.py +++ b/src/distros/clonezilla/scraper.py @@ -6,15 +6,19 @@ def init(): values = [] branches = ['alternative', 'stable'] regexp_version = re.compile(r'Clonezilla live version: (.*)<\/font>') - url_base = 'https://sourceforge.net/projects/clonezilla/files/clonezilla_live_{}/{}' + url_base = 'https://sourceforge.net/projects/clonezilla/files/clonezilla_live_{}/{}/' url_version = 'https://clonezilla.org/downloads/download.php?branch={}' for branch in branches: response = rq.get(url_version.format(branch)) iso_version = re.search(regexp_version, str(response.text)).group(1) - for iso_url in get.urls(url_base.format(branch, iso_version)): + try: + iso_urls = get.urls(url_base.format(branch, iso_version)) + except: + continue + for iso_url in iso_urls: iso_size = iso_url['size'] iso_url = iso_url['url'] iso_arch = get.arch(iso_url) From a23f8a655ccfa4eceb81f2e75013aac11189c893 Mon Sep 17 00:00:00 2001 From: flameshikari Date: Wed, 24 Jul 2024 14:00:08 +0500 Subject: [PATCH 3/5] upgrade scraper: ParrotOS --- src/distros/parrotos/scraper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/distros/parrotos/scraper.py b/src/distros/parrotos/scraper.py index 3853fc5..2273693 100644 --- a/src/distros/parrotos/scraper.py +++ b/src/distros/parrotos/scraper.py @@ -5,7 +5,7 @@ def init(): values = [] regexp_version = re.compile(r'-(\d+(.\d+(.\d+)?)?)') - url_base = 'https://mirror.truenetwork.ru/parrot/iso/' + url_base = 'https://mirror.truenetwork.ru/parrot/iso/current/' for iso_url in get.urls(url_base): From 0f586003ff1f3bc59d819298ca7582e3709e0e3a Mon Sep 17 00:00:00 2001 From: flameshikari Date: Wed, 24 Jul 2024 14:05:53 +0500 Subject: [PATCH 4/5] upgrade scraper: Manjaro --- src/distros/manjaro/scraper.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/distros/manjaro/scraper.py b/src/distros/manjaro/scraper.py index 8cfead4..3ca0662 100644 --- a/src/distros/manjaro/scraper.py +++ b/src/distros/manjaro/scraper.py @@ -5,13 +5,17 @@ def init(): values = [] regexp_version = re.compile(r'-(\d+\.\d+(.\d+)?)') - url_base = 'https://manjaro.org/downloads/' + url_bases = [ + 'https://manjaro.org/products/download/x86', + 'https://manjaro-sway.download/' + ] - for iso_url in get.urls(url_base): + for url_base in url_bases: + for iso_url in get.urls(url_base): - iso_arch = get.arch(iso_url) - iso_size = get.size(iso_url) - iso_version = re.search(regexp_version, iso_url).group(1) - values.append((iso_url, iso_arch, iso_size, iso_version)) + iso_arch = 'x86_64' + iso_size = get.size(iso_url) + iso_version = re.search(regexp_version, iso_url).group(1) + values.append((iso_url, iso_arch, iso_size, iso_version)) return values From 4680c574be009ba602ab0fe7e32d5d8ad1956566 Mon Sep 17 00:00:00 2001 From: flameshikari Date: Wed, 24 Jul 2024 14:06:27 +0500 Subject: [PATCH 5/5] prevent build on push in master --- .github/workflows/builder.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index ab5b8a9..37cdbec 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -1,9 +1,9 @@ name: 'Builder' on: - push: - branches: - - master + # push: + # branches: + # - master schedule: # 19:00 GMT (00:00 UTC+5) - cron: '0 19 * * *'