From 1db259284c2569220fdce07b95294b8f36abe387 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 2 Dec 2025 11:33:53 +0100
Subject: [PATCH] update.get_old_icon_filename() to document old naming scheme

---
 fdroidserver/update.py | 11 +++++++----
 tests/test_update.py   | 12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 887e59d3..6a99dd64 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -111,6 +111,11 @@ def px_to_dpi(px):
     return (int(px) * 160) / 48
 
 
+def get_old_icon_filename(appid, versionCode):
+    """Old pattern that uses a "." instead of "_" as separator."""
+    return f"{appid}.{versionCode}.png"
+
+
 def get_icon_dir(repodir, density):
     if density in ('0', '65534'):
         return os.path.join(repodir, "icons")
@@ -226,9 +231,7 @@ def delete_disabled_builds(apps, apkcache, repodirs):
             if not build.disable:
                 continue
             apkfilename = common.get_release_filename(app, build)
-            iconfilename = "%s.%s.png" % (
-                appid,
-                build.versionCode)
+            iconfilename = get_old_icon_filename(appid, build.versionCode)
             for repodir in repodirs:
                 files = [
                     os.path.join(repodir, apkfilename),
@@ -2046,7 +2049,7 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
                                 .format(apkfilename=apkfile) + str(e))
 
         # extract icons from APK zip file
-        iconfilename = "%s.%s.png" % (apk['packageName'], apk['versionCode'])
+        iconfilename = get_old_icon_filename(apk['packageName'], apk['versionCode'])
         try:
             empty_densities = extract_apk_icons(iconfilename, apk, apkzip, repodir)
         finally:
diff --git a/tests/test_update.py b/tests/test_update.py
index 623f48cc..567b8171 100755
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -1746,6 +1746,18 @@ class UpdateTest(unittest.TestCase):
         self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(' WhyIncludeWhitespace '))
         self.assertIsNotNone(fdroidserver.update.sanitize_funding_yml_entry(['first', 'second']))
 
+    def test_get_old_icon_filename_int(self):
+        self.assertEqual(
+            'com.example.21.png',
+            fdroidserver.update.get_old_icon_filename('com.example', 21),
+        )
+
+    def test_get_old_icon_filename_str(self):
+        self.assertEqual(
+            'com.example.21.png',
+            fdroidserver.update.get_old_icon_filename('com.example', '21'),
+        )
+
     def test_set_localized_text_entry(self):
         os.chdir(self.testdir)
         config = dict()