Merge pull request #59 from flameshikari/dev

merge dev into master

.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 * * *'

src/distros/clonezilla/scraper.py

@@ -6,15 +6,19 @@ def init():
     values = []
     branches = ['alternative', 'stable']
     regexp_version = re.compile(r'Clonezilla live version: <font color=.?red.?>(.*)<\/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)

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

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):
 

src/distros/puppy/info.json

@@ -1,4 +1,4 @@
 {
     "name": "Puppy Linux",
-    "url": "https://puppylinux.com"
+    "url": "https://puppylinux-woof-ce.github.io"
 }

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