diff --git a/app/icon_set.py b/app/icon_set.py index d95a5c0..e99219c 100644 --- a/app/icon_set.py +++ b/app/icon_set.py @@ -9,7 +9,7 @@ from app.settings import COLORABLE_ICON_SETS from app.settings import ICON_SET_LANGUAGE from app.settings import IMAGE_FOLDER -from app.settings import LEGACY_ICON_SETS +from app.settings import UNLISTED_SETS def get_icon_set(icon_set_name): @@ -32,7 +32,7 @@ def get_all_icon_sets(): for root, dirs, files in os.walk(IMAGE_FOLDER): for icon_set_name in dirs: # icons of legacy icon sets are still available, but the icon set will not be listed - if icon_set_name not in LEGACY_ICON_SETS: + if icon_set_name not in UNLISTED_SETS: icon_sets.append(get_icon_set(icon_set_name)) return icon_sets diff --git a/app/settings.py b/app/settings.py index a4929ca..35d853a 100644 --- a/app/settings.py +++ b/app/settings.py @@ -15,7 +15,9 @@ ) COLORABLE_ICON_SETS = ['default'] -LEGACY_ICON_SETS = ['babs'] +LEGACY_ICON_SETS = [] +UNRELEASED_SETS = ['babs-de', 'babs-fr', 'babs-it'] +UNLISTED_SETS = LEGACY_ICON_SETS + UNRELEASED_SETS ICON_SET_LANGUAGE = {'babs-de': 'de', 'babs-fr': 'fr', 'babs-it': 'it'} DEFAULT_COLOR = {"r": '255', "g": '0', "b": '0'} DEFAULT_ICON_SIZE = 48 diff --git a/tests/unit_tests/test_all_icons.py b/tests/unit_tests/test_all_icons.py index e3a8704..00b692b 100644 --- a/tests/unit_tests/test_all_icons.py +++ b/tests/unit_tests/test_all_icons.py @@ -13,7 +13,7 @@ from app.settings import COLORABLE_ICON_SETS from app.settings import DEFAULT_ICON_SIZE from app.settings import IMAGE_FOLDER -from app.settings import LEGACY_ICON_SETS +from app.settings import UNLISTED_SETS from tests.unit_tests.base_test import ServiceIconsUnitTests @@ -158,10 +158,8 @@ def test_all_icon_sets_endpoint(self): self.assertIn('items', response.json) self.assertTrue(response.json['items']) icon_sets_from_endpoint = response.json['items'] - self.assertEqual( - len(icon_sets_from_endpoint), len(self.all_icon_sets) - len(LEGACY_ICON_SETS) - ) - for legacy_icon_set in LEGACY_ICON_SETS: + self.assertEqual(len(icon_sets_from_endpoint), len(self.all_icon_sets) - len(UNLISTED_SETS)) + for legacy_icon_set in UNLISTED_SETS: self.assertNotIn( legacy_icon_set, icon_sets_from_endpoint, msg="Icon set should not be listed" )