Merge pull request #57 from flameshikari/dev

merge dev into master

src/distros/cachyos/info.json

@@ -0,0 +1,4 @@
+{
+    "name": "CachyOS",
+    "url": "https://cachyos.org"
+}

src/distros/cachyos/scraper.py

@@ -0,0 +1,17 @@
+from main import *  # noqa
+
+
+def init():
+
+    values = []
+    regexp_version = re.compile(r'-(\d+)')
+    url_base = 'https://mirror.cachyos.org/ISO/'
+
+    for iso_url in get.urls(url_base, recurse=True):
+
+        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))
+
+    return values

src/distros/endeavouros/scraper.py

@@ -1,14 +1,16 @@
 from main import *  # noqa
+from datetime import datetime
 
 
 def init():
 
     values = []
-    regexp_version = re.compile(r'[-_](\d+[-_]\d+(_R\d+)?)')
-    url_base = 'https://mirror.moson.org/endeavouros/iso/'
+    regexp_version = re.compile(r'-(\d+\.\d+\.\d+)')
+    url_base = 'http://md.mirrors.hacktegic.com/endeavouros/iso/'
+    year = str(datetime.now().year)
 
     for iso_url in get.urls(url_base):
-
+        if not year in iso_url: continue
         iso_arch = "x86_64"
         iso_size = get.size(iso_url)
         iso_version = re.search(regexp_version, iso_url).group(1).replace('-', '_')

src/distros/nobara/info.json

@@ -0,0 +1,4 @@
+{
+    "name": "Nobara",
+    "url": "https://nobaraproject.org"
+}

src/distros/nobara/scraper.py

@@ -0,0 +1,16 @@
+from main import *  # noqa
+
+
+def init():
+
+    values = []
+    regexp_version = re.compile(r'Nobara-(\d+)-')
+    url_base = 'https://nobaraproject.org/download-nobara/'
+
+    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))
+
+    return values