Merge branch 'repology:master' into wip/apertis

repology · Oct 4, 2023 · 8700a0c · 8700a0c
2 parents 64fe6ed + 99381f7
commit 8700a0c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/repology/linkformatter.py b/repology/linkformatter.py
@@ -26,9 +26,10 @@
 
 _FILTERS: dict[str, Callable[[str], str]] = {
     'lowercase': lambda x: x.lower(),
-    'firstletter': lambda x: x.lower()[0],
-    'libfirstletter': lambda x: x.lower()[:4] if x.lower().startswith('lib') else x.lower()[0],
-    'stripdmo': lambda x: x[:-4] if x.endswith('-dmo') else x,
+    'first_letter': lambda x: x.lower()[0],
+    'lib_or_first_letter': lambda x: x.lower()[:4] if x.lower().startswith('lib') else x.lower()[0],
+    'py_or_first_letter': lambda x: x.lower()[:2] if x.lower().startswith('py') else x.lower()[0],
+    'strip_dmo': lambda x: x[:-4] if x.endswith('-dmo') else x,
     'basename': lambda x: x.rsplit('/', 1)[-1],
     'dirname': lambda x: x.rsplit('/', 1)[0],
     'dec': lambda x: str(_safe_int(x) - 1),

diff --git a/repos.d/deb/mx.yaml b/repos.d/deb/mx.yaml
@@ -23,7 +23,7 @@
       subrepo: {{sub}}
       packagelinks:
         - type: PACKAGE_SOURCES
-          url: 'http://mxrepo.com/mx/repo/pool/{{sub}}/{srcname|libfirstletter}/{srcname}/'
+          url: 'http://mxrepo.com/mx/repo/pool/{{sub}}/{srcname|lib_or_first_letter}/{srcname}/'
     {% endfor %}
   repolinks:
     - desc: MX Linux
@@ -51,7 +51,7 @@
         class: DebianSourcesParser
       packagelinks:
         - type: PACKAGE_SOURCES
-          url: 'http://mxrepo.com/mx/testrepo/pool/test/{srcname|libfirstletter}/{srcname}/'
+          url: 'http://mxrepo.com/mx/testrepo/pool/test/{srcname|lib_or_first_letter}/{srcname}/'
   repolinks:
     - desc: MX Linux
       url: https://mxlinux.org/

diff --git a/repos.d/deb/pardus.yaml b/repos.d/deb/pardus.yaml
@@ -78,7 +78,7 @@
       url: https://www.pardus.org.tr/
   packagelinks:
     - type: PACKAGE_SOURCES
-      url: 'http://depo.pardus.org.tr/pardus/pool/{subrepo}/{srcname|libfirstletter}/{srcname}/'
+      url: 'http://depo.pardus.org.tr/pardus/pool/{subrepo}/{srcname|lib_or_first_letter}/{srcname}/'
   groups: [ all, production, pardus ]
 {% endmacro %}
 

diff --git a/repos.d/solus.yaml b/repos.d/solus.yaml
@@ -17,13 +17,13 @@
       parser:
         class: SolusIndexParser
   repolinks:
-    - desc: Solus home
+    - desc: Solus Home
       url: https://getsol.us/
   packagelinks:
     - type: PACKAGE_SOURCES
-      url: 'https://dev.getsol.us/source/{srcname}/'
+      url: 'https://github.com/getsolus/packages/tree/main/packages/{srcname|py_or_first_letter}/{srcname}/'
     - type: PACKAGE_RECIPE
-      url: 'https://dev.getsol.us/source/{srcname}/browse/master/package.yml'
+      url: 'https://github.com/getsolus/packages/blob/main/packages/{srcname|py_or_first_letter}/{srcname}/package.yml'
     - type: PACKAGE_RECIPE_RAW
-      url: 'https://dev.getsol.us/source/{srcname}/browse/master/package.yml?view=raw'
+      url: 'https://raw.githubusercontent.com/getsolus/packages/main/packages/{srcname|py_or_first_letter}/{srcname}/package.yml'
   groups: [ all, production ]