Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Move weather.json config to /kolibrios

Browse Source 
Weather app was moved to /kolibrios a year ago, move its config there
too. There is no reason for the config to be in img since nobody in img
uses it.

Also, update Weather to look for its config not only in /sys but also
in /kolibrios.

git-svn-id: svn://kolibrios.org@9820 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2022-05-23 22:47:22 +00:00
parent bcd3970446
commit f483bc78e4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Tupfile.lua
View File

@ -67,7 +67,6 @@ img_files = {
{"SETTINGS/NETWORK.INI", "common/settings/network.ini"}, {"SETTINGS/NETWORK.INI", "common/settings/network.ini"},
{"SETTINGS/SYSTEM.INI", "common/settings/system.ini"}, {"SETTINGS/SYSTEM.INI", "common/settings/system.ini"},
{"SETTINGS/TASKBAR.INI", "common/settings/taskbar.ini"}, {"SETTINGS/TASKBAR.INI", "common/settings/taskbar.ini"},
{"SETTINGS/weather.json", PROGS .. "/other/Weather/weather.json"},
} }
-- For russian build, add russian-only files. -- For russian build, add russian-only files.
@ -726,6 +725,7 @@ tup.append_table(extra_files, {
{"kolibrios/utils/kruler", PROGS .. "/other/kruler/kruler"}, {"kolibrios/utils/kruler", PROGS .. "/other/kruler/kruler"},
{"kolibrios/media/qr_tool", PROGS .. "/media/qr_tool/qr_tool"}, {"kolibrios/media/qr_tool", PROGS .. "/media/qr_tool/qr_tool"},
{"kolibrios/utils/weather", PROGS .. "/other/Weather/weather"}, {"kolibrios/utils/weather", PROGS .. "/other/Weather/weather"},
{"kolibrios/settings/weather.json", PROGS .. "/other/Weather/weather.json"},
{"kolibrios/utils/man2html", PROGS .."/other/man2html/man2html"}, {"kolibrios/utils/man2html", PROGS .."/other/man2html/man2html"},
}) })
end -- tup.getconfig('NO_TCC') ~= 'full' end -- tup.getconfig('NO_TCC') ~= 'full'

9
programs/other/Weather/weather.c
View File

@ -44,7 +44,8 @@ unsigned WINDOW_W = 230;
#define IMAGE_URL "openweathermap.org/img/w/%s.png" #define IMAGE_URL "openweathermap.org/img/w/%s.png"
Image *blend=NULL; Image *blend=NULL;
const char *config_name = "/sys/Settings/weather.json"; const char *config1_name = "/sys/Settings/weather.json";
const char *config2_name = "/kolibrios/Settings/weather.json";
unsigned char char_size=1; unsigned char char_size=1;
uint64_t auto_update_time = 0; uint64_t auto_update_time = 0;
@ -227,11 +228,15 @@ void redraw_gui() // Перересовываем интерфейс
void get_config(char **city, char **token, char **units) // Загружаем конфиг void get_config(char **city, char **token, char **units) // Загружаем конфиг
{ {
ksys_ufile_t config_j = _ksys_load_file(config_name); ksys_ufile_t config_j;
config_j = _ksys_load_file(config1_name);
if(!config_j.size){
config_j = _ksys_load_file(config2_name);
if(!config_j.size){ if(!config_j.size){
notify_show("'Configuration file not found!' -E"); notify_show("'Configuration file not found!' -E");
exit(0); exit(0);
} }
}
json_value* value =json_parse (config_j.data, config_j.size); // Парсим конфиг json_value* value =json_parse (config_j.data, config_j.size); // Парсим конфиг
for(int i=0; i<value->u.object.length; i++){ for(int i=0; i<value->u.object.length; i++){