Merge pull request #4182 from Ark74/upd_site_code

holta · web-flow · commit 3dffa3714d4a · 2025-12-18T18:24:41.000-05:00
[code] update fetch page and download url for new codg hosting changes.
diff --git a/.github/workflows/tests/expected_state_medium.yml b/.github/workflows/tests/expected_state_medium.yml
@@ -24,3 +24,4 @@ awstats_installed: True
 matomo_installed: True
 captiveportal_installed: True
 calibreweb_installed: True
+code_installed: True
diff --git a/roles/code/defaults/main.yml b/roles/code/defaults/main.yml
@@ -2,7 +2,8 @@
 # 64-bit support for now, leaving room for future 32-bit support.
 
 # URL & Regular Expressions
-code_download_url: https://appdevforall.org/apk_repo
+code_fetch_apk_url: https://www.appdevforall.org/codeonthego
+code_download_url: https://download.appdevforall.org
 code_apk_32bit_pattern: "CodeOnTheGo-.*?armv7a\\.apk"
 code_apk_64bit_pattern: "CodeOnTheGo-.*?armv8a\\.apk"
 
diff --git a/roles/code/tasks/install.yml b/roles/code/tasks/install.yml
@@ -21,12 +21,12 @@
   when: code_apk_release_name is undefined
   block:
 
-    - name: Fetch APK index page from {{ code_download_url }}/
+    - name: Fetch APK index page from {{ code_fetch_apk_url }}/
       uri:
-        url: "{{ code_download_url }}/"
+        url: "{{ code_fetch_apk_url }}/"
         return_content: true
       register: apk_index
-      failed_when: apk_index.status != 200 and apk_index.status != 403
+      failed_when: apk_index.status not in [200, 403, 404]
 
     - name: Mark 'code' role as blocked by CDN
       set_fact:
@@ -68,6 +68,7 @@
             | regex_findall(code_apk_64bit_pattern)
             | sort
             | last
+            | default('')
           }}
       when: code_blocked_by_cdn is undefined
 
@@ -79,12 +80,19 @@
             | regex_findall(code_apk_32bit_pattern)
             | sort
             | last
+            | default('')
           }}
       when: code_blocked_by_cdn is undefined
 
+    - name: Fail if no apk is found on fetched page.
+      fail:
+        msg: Could not find expected APK link in page. (Status = {{ apk_index.status }})
+      when: code_apk_64bit_filename | length == 0
+      #ignore_errors: yes
+
 - name: Get CodeOnTheGo version number
   set_fact:
-    cotg_version: "{{ code_apk_64bit_filename | regex_search('CodeOnTheGo-release([0-9.]+)', '\\1') }}"
+    cotg_version: "{{ (code_apk_64bit_filename | regex_findall('CodeOnTheGo-release([0-9]+(?:\\.[0-9]+)*)') | first) }}"
   when: code_blocked_by_cdn is undefined
 
 - name: "Show resolved APK release name"
diff --git a/roles/code/templates/content/en.md.j2 b/roles/code/templates/content/en.md.j2
@@ -49,8 +49,7 @@ If you want to get details about the latest release; please visit [https://www.a
 
 Find some useful resources online to interact with the community of users and developers behind Code on the Go.
 
-- [Online APK repo](https://appdevforall.org/apk_repo/)
-- [Repo archive](https://appdevforall.org/apk_repo/archive/)
+- [Online Release Website](https://www.appdevforall.org/codeonthego/)
 - [GitHub Issues page](https://github.com/appdevforall/CodeOnTheGo/issues)
 - [Telegram Official Channel](https://t.me/CodeOnTheGoOfficial)
 - [Telegram Discussion Group](https://t.me/CodeOnTheGoDiscussions)
diff --git a/roles/code/templates/content/es.md.j2 b/roles/code/templates/content/es.md.j2
@@ -48,8 +48,7 @@ Si desea conocer los detalles acerca de la versión mas reciente; por favor visi
 
 Encuentre algunos recursos útiles en línea para interactuar con la comunidad de usuarios y desarrolladores detrás de Code on the Go.
 
-- [Repositorio APK en línea](https://appdevforall.org/apk_repo/)
-- [Archivo del repositorio](https://appdevforall.org/apk_repo/archive/)
+- [Página en línea de Publicaciones](https://www.appdevforall.org/codeonthego/)
 - [Pagina de Incidencias de GitHub](https://github.com/appdevforall/CodeOnTheGo/issues)
 - [Canal Oficial de Telegram](https://t.me/CodeOnTheGoOfficial)
 - [Grupo de Discusión de Telegram](https://t.me/CodeOnTheGoDiscussions)
