From 472bc4a2e36b6ba7a98f67859281690ed2287414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Sun, 29 Mar 2020 12:45:14 +0200 Subject: [PATCH] Sorting (#302) * Sorting * Fix typo --- .github/workflows/{Lint.yml => lint_jq.yml} | 4 ++-- .github/workflows/lint_sorted.yml | 12 ++++++++++++ appdaemon | 6 +++--- blacklist | 2 +- integration | 20 ++++++++++---------- netdaemon | 2 +- plugin | 10 +++++----- python_script | 2 +- scripts/is_sorted.py | 10 ++++++++++ scripts/sort.py | 11 +++++++++++ theme | 4 ++-- 11 files changed, 58 insertions(+), 25 deletions(-) rename .github/workflows/{Lint.yml => lint_jq.yml} (94%) create mode 100644 .github/workflows/lint_sorted.yml create mode 100644 scripts/is_sorted.py create mode 100644 scripts/sort.py diff --git a/.github/workflows/Lint.yml b/.github/workflows/lint_jq.yml similarity index 94% rename from .github/workflows/Lint.yml rename to .github/workflows/lint_jq.yml index 33f7993..20c67e9 100644 --- a/.github/workflows/Lint.yml +++ b/.github/workflows/lint_jq.yml @@ -1,9 +1,9 @@ -name: Lint +name: Lint [jq] on: [push, pull_request] jobs: push: - name: Actions + name: Lint with jq runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/lint_sorted.yml b/.github/workflows/lint_sorted.yml new file mode 100644 index 0000000..bceccb7 --- /dev/null +++ b/.github/workflows/lint_sorted.yml @@ -0,0 +1,12 @@ +name: Lint [sorted] +on: [push, pull_request] + +jobs: + push: + name: Make sure lists is sorted + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + + - name: Check lists + run: python3 scripts/is_sorted.py \ No newline at end of file diff --git a/appdaemon b/appdaemon index 71aa852..90a9a38 100644 --- a/appdaemon +++ b/appdaemon @@ -5,8 +5,8 @@ "apop880/Night-Mode", "apop880/SmartThings-Button", "apop880/White-Noise", - "badguy99/octocost", "badguy99/octoblock", + "badguy99/octocost", "benleb/ad-automoli", "benleb/ad-ench", "benleb/ad-healthcheck", @@ -25,8 +25,8 @@ "Petro31/ad_monitor_events", "Petro31/ad_multizone_media_control", "Petro31/ad_people_tracker", - "Petro31/ad_simple_door_bell", "Petro31/ad_seasonal_lights", + "Petro31/ad_simple_door_bell", "Petro31/ad_sunset_lights", "Petro31/ad_toggle_light", "Petro31/ad_who_used_the_door", @@ -39,4 +39,4 @@ "UbhiTS/ad-alexatalkingclock", "vash3d/nethassmo", "xaviml/controllerx" -] +] \ No newline at end of file diff --git a/blacklist b/blacklist index 9d3ad6f..cc842d8 100644 --- a/blacklist +++ b/blacklist @@ -57,4 +57,4 @@ "shaonianzhentan/ha-cloud-music", "tenly2000/HomeAssistant-Places", "xaviml/z2m_ikea_controller" -] +] \ No newline at end of file diff --git a/integration b/integration index b2aa15f..0c63e42 100644 --- a/integration +++ b/integration @@ -7,9 +7,9 @@ "albertogeniola/meross-homeassistant", "amaximus/bkk_stop", "amelchio/logbook_cache", - "andersonshatch/midea-ac-py", "And3rsL/Deebot-for-hassio", "And3rsL/VisonicAlarm-for-Hassio", + "andersonshatch/midea-ac-py", "Anonym-tsk/homeassistant-climate-xiaomi-remote", "arjenvrh/audi_connect_ha", "Armaell/home-assistant-custom-icons-loader", @@ -85,17 +85,19 @@ "gieljnssns/buienalarm-sensor-homeassistant", "gieljnssns/kostalpiko-sensor-homeassistant", "gregoryduckworth/GoogleGeocode-HASS", - "Hellowlol/ha-tide", "heinoldenhuis/home_assistant_area_waste", "heinoldenhuis/home_assistant_omnik_solar", + "Hellowlol/ha-tide", "herikw/home-assistant-custom-components", "heyajohnny/afvalinfo", "Home-Is-Where-You-Hang-Your-Hack/sensor.goveetemp_bt_hci", "isabellaalstrom/sensor.krisinformation", "ITTV-tools/homeassistant-kostalplenticore", + "JAAlperin/hass-bardolph", + "jaruba/ha-samsungtv-tizen", "JayBlackedOut/hass-nhlapi", - "jensweimann/awb", "jcwillox/hass-auto-backup", + "jensweimann/awb", "jihao/colorfulclouds-hass", "jihao/rokid-webhook-hass", "jihao/traccar-cn-hass", @@ -105,13 +107,12 @@ "jomwells/ambihue", "jomwells/ambilight-yeelight", "jomwells/ambilights", + "jonkristian/wasteplan_trv", "joogps/MQTT-Climate-Sync", "JurajNyiri/HomeAssistant-Atrea", "JurajNyiri/HomeAssistant-qBitTorrentAlternativeSpeed", "JurajNyiri/HomeAssistant-Tavos", "jxlarrea/ha-emfitqs", - "JAAlperin/hass-bardolph", - "jonkristian/wasteplan_trv", "kalanda/homeassistant-aemet-sensor", "kodi1/darksky_m", "kodi1/esp_wd", @@ -132,8 +133,8 @@ "lindell/home-assistant-tv4-play", "ljmerza/ha-email-sensor", "ljmerza/ha-our-groceries", - "lociii/homeassistant-digitalstrom", "lociii/homeassistant-csgo", + "lociii/homeassistant-digitalstrom", "LordBoos/discord_game", "lukas-hetzenecker/home-assistant-remote", "mammuth/ha-fritzbox-tools", @@ -178,16 +179,15 @@ "ReneNulschDE/mbapipy", "rgruebel/ha_zigbee2mqtt_networkmap", "roberodin/ha-samsungtv-custom", - "jaruba/ha-samsungtv-tizen", "RobHofmann/HomeAssistant-GreeClimateComponent", "RobHofmann/HomeAssistant-PhilipsAndroid2014", "robmarkcole/HASS-amazon-rekognition", "robmarkcole/HASS-Deepstack-face", "robmarkcole/HASS-Deepstack-object", "robmarkcole/HASS-Machinebox-Classificationbox", + "robmarkcole/HASS-Sighthound", "robmarkcole/Hue-remotes-HASS", "robmarkcole/Hue-sensors-HASS", - "robmarkcole/HASS-Sighthound", "rsnodgrass/hass-adtpulse", "rsnodgrass/hass-flo-water", "rsnodgrass/hass-integrations", @@ -226,8 +226,8 @@ "tomaae/homeassistant-mikrotik_router", "tuxuser/abfallapi_jumomind_ha", "tuxuser/abfallapi_regioit_ha", - "twrecked/hass-momentary", "twrecked/hass-aarlo", + "twrecked/hass-momentary", "twrecked/hass-virtual", "tybritten/ical-sensor-homeassistant", "vinteo/hass-opensprinkler", @@ -238,4 +238,4 @@ "xMrVizzy/Philips-AirPurifier", "zachowj/hass-node-red", "zha-ng/zha-map" -] +] \ No newline at end of file diff --git a/netdaemon b/netdaemon index cdd9c00..b3fc473 100644 --- a/netdaemon +++ b/netdaemon @@ -1,4 +1,4 @@ [ "hacs/ND-NotifyUpdates", "isabellaalstrom/ND-MotionSnapshot" -] +] \ No newline at end of file diff --git a/plugin b/plugin index 930f919..155cec4 100644 --- a/plugin +++ b/plugin @@ -25,9 +25,10 @@ "dooz127/swipe-glance-card", "enriqg9/dual-thermostat", "faeibson/lovelace-multiline-text-input-card", + "fineemb/lovelace-dc1-card", "fineemb/lovelace-fan-xiaomi", "fineemb/lovelace-thermostat-card", - "fineemb/lovelace-dc1-card", + "finity69x2/binary-control-button-row", "finity69x2/fan-control-entity-row", "finity69x2/light-brightness-preset-row", "gadgetchnnel/lovelace-card-preloader", @@ -61,8 +62,8 @@ "ljmerza/tracking-number-card", "ljmerza/travel-time-card", "marrobHD/firetv-card", - "marrobHD/tv-card", "marrobHD/rotel-card", + "marrobHD/tv-card", "maykar/custom-header", "maykar/lovelace-swipe-navigation", "Mofeywalker/openmensa-lovelace-card", @@ -101,6 +102,5 @@ "thomasloven/lovelace-template-entity-row", "twrecked/lovelace-hass-aarlo", "Villhellm/lovelace-animated-background", - "xMrVizzy/button-toolbar", - "finity69x2/binary-control-button-row" -] + "xMrVizzy/button-toolbar" +] \ No newline at end of file diff --git a/python_script b/python_script index 3c3626f..95dee02 100644 --- a/python_script +++ b/python_script @@ -5,4 +5,4 @@ "mf-social/ps-date-countdown", "pmazz/ps_hassio_entities", "Santobert/HA-UpdateClimate" -] +] \ No newline at end of file diff --git a/scripts/is_sorted.py b/scripts/is_sorted.py new file mode 100644 index 0000000..becd174 --- /dev/null +++ b/scripts/is_sorted.py @@ -0,0 +1,10 @@ +import json + +categories = ["blacklist", "appdaemon", "integration", "netdaemon", "plugin", "python_script", "theme"] + +for category in categories: + with open(category, "r") as cat_file: + content = json.loads(cat_file.read()) + if content != sorted(content, key=str.casefold): + print(f"{category} is not sorted correctly") + exit(1) \ No newline at end of file diff --git a/scripts/sort.py b/scripts/sort.py new file mode 100644 index 0000000..35941e9 --- /dev/null +++ b/scripts/sort.py @@ -0,0 +1,11 @@ +import json + +categories = ["blacklist", "appdaemon", "integration", "netdaemon", "plugin", "python_script", "theme"] + +for category in categories: + with open(category, "r") as cat_file: + content = json.loads(cat_file.read()) + + with open(category, "w") as cat_file: + cat_file.write(json.dumps(sorted(content, key=str.casefold), indent=2)) + diff --git a/theme b/theme index d380913..681fb7d 100644 --- a/theme +++ b/theme @@ -20,11 +20,11 @@ "JuanMTech/green_light_mode", "JuanMTech/orange_dark", "JuanMTech/orange_light", - "pbeckcom/green_slate_theme", "naofireblade/clear-theme", "naofireblade/clear-theme-dark", "Nihvel/your_name", + "pbeckcom/green_slate_theme", "Poeschl/slate_red", "seangreen2/slate_theme", "sinclairpaul/ha_purple_theme" -] +] \ No newline at end of file