From e0e9d467aeb64f97e87735195a2a1135848cd0be Mon Sep 17 00:00:00 2001
From: Mathias Lesauvage <lesauvage.mathias@gmx.com>
Date: Sun, 26 Apr 2026 20:37:29 +0200
Subject: [PATCH] Added UK country split in the country list

---
 assets/country_flag/eng.png     | Bin 0 -> 374 bytes
 assets/country_flag/sct.png     | Bin 0 -> 1093 bytes
 assets/country_flag/wls.png     | Bin 0 -> 3202 bytes
 src/Helpers/TSHCountryHelper.py |  99 +++++++++++++++++++++++++++++++-
 4 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100755 assets/country_flag/eng.png
 create mode 100755 assets/country_flag/sct.png
 create mode 100755 assets/country_flag/wls.png

diff --git a/assets/country_flag/eng.png b/assets/country_flag/eng.png
new file mode 100755
index 0000000000000000000000000000000000000000..aed9845a1a172f6a6bc0942135285c51191de400
GIT binary patch
literal 374
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBN!VDzaUNx)&QY`6?zK#qG8~eHcB(ehe3dtTp
zz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}LEt;1lBd|NsAgzkc2J
z@j1=FaE5{5-=9B!fBd-Z?R_UC<W5k~MM=psXU=qQF9tb+G0EHAg<Jmmkpn;udx@v7
zEBgyBRz_1Z^(W7c0EPTLT^vI!PA4Zgu=SkM({p3u*>P}1)4{b0B9bklyLZf3zKFxH
zM4|cIQ9Zpd<A4^4p1_9A?r!5%9L?N}4*aYvvYr=avoL2F9C@~aNlTM~fm^xm=ZCIa
zi-1O}mbgZgq$HN4S|t~y0x1R~10xe%Ljzp{(+~qgD^p`DQxk0i11kfAEm7YEQ8eV{
ar(~v8;?{7K-G41m1B0ilpUXO@geCxIXmv&a

literal 0
HcmV?d00001

diff --git a/assets/country_flag/sct.png b/assets/country_flag/sct.png
new file mode 100755
index 0000000000000000000000000000000000000000..fd1c8b0978f8b0940fbb83d574df7b91cefefd5c
GIT binary patch
literal 1093
zcmV-L1iJf)P)<h;3K|Lk000e1NJLTq002M$001ip0{{R3|Ac;Z00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0003*
zP)t-s|NsBn>GxBZ+yrOL0A$MmX3XsK`-ivZ8FbJ9Wy}5k{>0q#Mv&SAXUv7R<`;9&
z_WAw&{r<w*@<fi=17^%yo!-pg^#1<->+}19wB{Cb&;Vo0A9&K0zv=S#{QUj?zuEFZ
zjoAWb%m!%8RG8e*<MrwC`hT+J6mrladeWG|>ht*gz1Q(Si`W2V%m-=BSDM|@<o4+C
z`h2kD6LHTYd()f4>h$>h`~Cj9)$u%v*aBtC2x-k)oZi&s_U7>Vd9LIVaL*-t)1JiZ
z_4)n#{QkGp@HvRr0cFbwYRz4q-qz;!<?s1+tm6=G&nJD;p~md`{QkAl@HdCo32Mz?
zpx@Z&_v7yQa;oAFZq6xx)TGGl_xk<$`~A1m@Cs|qW1-*L>Gv#v)TYYq3vAA2qu|`?
z_%4CfsLSmDV#*qH(9F!t_7C3600001VoOIvYf@#Um;e9(2XskIMF;2#1pziWoOY;|
z00060Nkl<ZNXNBSYg<7<5Z*F}wuCO|Mo}pxy5B|Nq=*V#Q4+=f{{cBq%A8{>k9nF;
z=j_b9^X~4<&M@{VJ-s@RIu_9N_Arg;4Sm2nbLY@!(6ct_A21GfL;?nl1N}@SdXxEY
z5**AXRd@^f9vU7Q{euLIjtmc}+^se{`X3vg_>BaIiSaRHZns(4<dnmSmZoQ1?jI4j
z+ch(djGd0DNhZPU+&m`XSy&X4;IO#h!QtoUW<g?#!n?GLN%&SoB)EIUhr=%~d6hs7
z0Lc%5)iq3FePdHgg2U#<Iu5_K8UVla381LAws(+vcW?hdg}@K?_jZxN&h}O_1p5kb
z7(BuxLgC{U2@c2M5DtG7Jp9tKmeENhii~3NX}oE}<EL^AsiKjS7C1w@JUdU|6iZ&D
z6gv*7izHr8oS&f+VtAvFzQl=nb)AWG9?x7~;ncfKs}2|gG!U}68yxKR?*9Jn7O&jo
zvg!*`0Vog;k9lNYC>9IoH~;vcy<ZJL1L5hp#D0*{^HW=rY5^38mvUa@o-e-$a=aa&
zf$&<Xw)<Bruc8_e04NY|?-sSY<^4@uVnP6k*XptwK(5!sRsJ6gsAoXD1!^7;Gm%;g
z#A>9z2gDbN`X&-zWolobb|z|XBzI@>e1KE0s|f{3cQewrP^UENoY?iG`T<WYc}u~k
zAzA<c03~!qSaf7zbY(hYa%Ew3WdJfTGBhnQFfA}OR4_3*H8eUkH!CnOIxsM2Zua#6
z001R)MObuXVRU6WZEs|0W_bWIFfuePF)%GKHB>M$IyE#pH8(3TFgh?W7Bfys00000
LNkvXXu0mjfL2MLJ

literal 0
HcmV?d00001

diff --git a/assets/country_flag/wls.png b/assets/country_flag/wls.png
new file mode 100755
index 0000000000000000000000000000000000000000..12d676f846a07271e13ffcf250d4426f39c4cf5d
GIT binary patch
literal 3202
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

literal 0
HcmV?d00001

diff --git a/src/Helpers/TSHCountryHelper.py b/src/Helpers/TSHCountryHelper.py
index 6fafc2418..06e05f624 100644
--- a/src/Helpers/TSHCountryHelper.py
+++ b/src/Helpers/TSHCountryHelper.py
@@ -17,6 +17,7 @@
 from .TSHDictHelper import deep_get
 from ..TournamentDataProvider import TournamentDataProvider
 from .TSHLocaleHelper import TSHLocaleHelper
+import json
 import orjson
 from loguru import logger
 import countryflag
@@ -27,6 +28,97 @@ class TSHCountryHelperSignals(QObject):
     countriesUpdated = Signal()
 
 
+class TSHUKHandler(QObject):
+    uk_data = {
+                "ENG": {
+                    "name": "England",
+                    "iso3": "GB-ENG",
+                    "iso2": "ENG",
+                    "translations": {
+                        "fr": "Angleterre",
+                    },
+                    "latitude": "52.53102140",
+                    "longitude": "-1.26490620",
+                    "states": []
+                },
+                "SCT": {
+                    "name": "Scotland",
+                    "iso3": "GB-SCT",
+                    "iso2": "SCT",
+                    "translations": {
+                        "fr": "Écosse",
+                    },
+                    "latitude": "56.78611120",
+                    "longitude": "-4.11405180",
+                    "states": []
+                },
+                "WLS": {
+                    "name": "Wales",
+                    "iso3": "GB-WLS",
+                    "iso2": "WLS",
+                    "translations": {
+                        "fr": "Pays de Galles",
+                    },
+                    "latitude": "52.29281160",
+                    "longitude": "-3.73893000",
+                    "states": []
+                },
+                "NIR": {
+                    "name": "Northern Ireland",
+                    "iso3": "GB-NIR",
+                    "iso2": "NIR",
+                    "translations": {
+                        "fr": "Irlande du Nord",
+                    },
+                    "latitude": "54.58598360",
+                    "longitude": "-6.95915540",
+                    "states": []
+                }
+            }
+
+    def __init__(self) -> None:
+        super().__init__()
+    
+    def AddUKCountries(self):
+        try:
+            f = open("./assets/countries+states+cities.json",
+                        'r', encoding='utf-8')
+            countries_json = orjson.loads(f.read())
+            f.close()
+
+            checked_countries = self.uk_data.keys()
+            found_countries = []
+            found_northern_ireland = False
+            for c in countries_json:
+                ccode = c.get("iso2") if not c.get("iso2").isdigit() else "".join([
+                        word[0] for word in re.split(r'\s+|-', c.get("name"))])
+                if ccode in checked_countries:
+                    found_countries.append(ccode)
+
+            # Add new countries
+            for key in checked_countries:
+                if key not in found_countries:
+                    countries_json.append(self.uk_data[key])
+            
+            print("Writing file")
+
+            with open("./assets/countries+states+cities.json",
+                        'wt', encoding="utf-8") as f:
+                f.write(json.dumps(countries_json, indent=2))
+            
+            print("File written")
+        except:
+            logger.error(f"An error has occured when adding the data for UK countries - {traceback.format_exc()}")
+
+    def GetUKEmoji(ccode, emoji):
+        if ccode == "ENG":
+            emoji = "🏴󠁧󠁢󠁥󠁮󠁧󠁿"
+        if ccode == "SCT":
+            emoji = "🏴󠁧󠁢󠁳󠁣󠁴󠁿"
+        if ccode == "WLS":
+            emoji = "🏴󠁧󠁢󠁷󠁬󠁳󠁿"
+        return emoji
+
 class TSHCountryHelper(QObject):
     instance: "TSHCountryHelper" = None
 
@@ -35,6 +127,7 @@ class TSHCountryHelper(QObject):
     cities = {}
     countryModel = None
     signals = TSHCountryHelperSignals()
+    uk_handler = TSHUKHandler()
 
     def __init__(self) -> None:
         super().__init__()
@@ -62,6 +155,8 @@ def validate(filename):
                 orjson.loads(f.read())
                 return True
 
+        logger.info("Updating data_countries file...")
+
         DownloadDialog(
             url=url,
             filename=str(out_file),
@@ -69,7 +164,7 @@ def validate(filename):
             validator=validate,
         ).exec()
 
-        logger.info("Updating data_countries file...")
+        TSHCountryHelper.uk_handler.AddUKCountries()
         TSHCountryHelper.LoadCountries()
         logger.info("data_countries file updated.")
 
@@ -95,7 +190,7 @@ def GetBasicCountryInfo(country_code):
             data["emoji"] = countryflag.getflag(TSHCountryHelper.countries[country_code]["code"])
         except InvalidCountryError:
             # logger.warning(f'The following country could not be found in the countryflag library: {TSHCountryHelper.countries[country_code]["code"]}')
-            data["emoji"] = None
+            data["emoji"] = TSHUKHandler.GetUKEmoji(TSHCountryHelper.countries[country_code]["code"], None)
         
         return data