mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcd4l/weather: fix creation of data files for first run

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae4338d710
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-20 (Wed, 20 Mar 2019)

Origin message was:
------------------
- lcd4l/weather: fix creation of data files for first run

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-03-20 15:27:15 +01:00
parent 56c2f4b7f1
commit 63b3f21d98
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/lcd4l.cpp
View File

@@ -104,8 +104,8 @@ extern CPictureViewer *g_PicViewer;
#define FCOLOR2 LCD_DATADIR "fcolor2" #define FCOLOR2 LCD_DATADIR "fcolor2"
#define PBCOLOR LCD_DATADIR "pbcolor" #define PBCOLOR LCD_DATADIR "pbcolor"
#define WEATHER_TEMP LCD_DATADIR "weather_temp" #define WEATHER_TEMP LCD_DATADIR "weather_temp"
#define WEATHER_ICON LCD_DATADIR "weather_icon" #define WEATHER_ICON LCD_DATADIR "weather_icon"
#define FLAG_LCD4LINUX "/tmp/.lcd4linux" #define FLAG_LCD4LINUX "/tmp/.lcd4linux"
#define PIDFILE "/var/run/lcd4linux.pid" #define PIDFILE "/var/run/lcd4linux.pid"
@@ -253,8 +253,8 @@ void CLCD4l::Init()
m_Start = "00:00"; m_Start = "00:00";
m_End = "00:00"; m_End = "00:00";
m_wtemp = ""; m_wtemp = "";
m_wicon = ""; m_wicon = "";
if (!access(LCD_DATADIR, F_OK) == 0) if (!access(LCD_DATADIR, F_OK) == 0)
mkdir(LCD_DATADIR, 0755); mkdir(LCD_DATADIR, 0755);
@@ -1016,7 +1016,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
strcpy(m_Duration, Duration); strcpy(m_Duration, Duration);
} }
if (g_settings.weather_enabled && CWeather::getInstance()->checkUpdate()) if (g_settings.weather_enabled && CWeather::getInstance()->checkUpdate(firstRun))
{ {
std::string wtemp = CWeather::getInstance()->getActTemp(); std::string wtemp = CWeather::getInstance()->getActTemp();
std::string wicon = CWeather::getInstance()->getActIcon(); std::string wicon = CWeather::getInstance()->getActIcon();

4
src/driver/lcd4l.h
View File

@@ -126,8 +126,8 @@ class CLCD4l
std::string m_fcolor2; std::string m_fcolor2;
std::string m_pbcolor; std::string m_pbcolor;
std::string m_wtemp; std::string m_wtemp;
std::string m_wicon; std::string m_wicon;
}; };
#endif #endif

4
src/gui/weather.cpp
View File

@@ -79,10 +79,10 @@ void CWeather::setCoords(std::string new_coords, std::string new_city)
} }
} }
bool CWeather::checkUpdate() bool CWeather::checkUpdate(bool forceUpdate)
{ {
time_t current_time = time(NULL); time_t current_time = time(NULL);
if (difftime(current_time,last_time) > MINUTES) if (forceUpdate || (difftime(current_time,last_time) > MINUTES))
return GetWeatherDetails(); return GetWeatherDetails();
else else
return false; return false;

2
src/gui/weather.h
View File

@@ -61,7 +61,7 @@ public:
static CWeather* getInstance(); static CWeather* getInstance();
CWeather(); CWeather();
~CWeather(); ~CWeather();
bool checkUpdate(); bool checkUpdate(bool forceUpdate = false);
void setCoords(std::string new_coords, std::string new_city = "Unknown"); void setCoords(std::string new_coords, std::string new_city = "Unknown");
void show(int x = 50, int y = 50); void show(int x = 50, int y = 50);
void hide(); void hide();