oops
This commit is contained in:
parent
867bab1050
commit
fc69565f4d
1 changed files with 14 additions and 17 deletions
|
@ -71,6 +71,7 @@ namespace os {
|
||||||
using enum std::launch;
|
using enum std::launch;
|
||||||
using package::GetTotalCount;
|
using package::GetTotalCount;
|
||||||
using util::types::Future, util::types::Err;
|
using util::types::Future, util::types::Err;
|
||||||
|
using enum util::error::DracErrorCode;
|
||||||
|
|
||||||
Future<Result<String>> hostFut = std::async(async, GetHost);
|
Future<Result<String>> hostFut = std::async(async, GetHost);
|
||||||
Future<Result<String>> kernelFut = std::async(async, GetKernelVersion);
|
Future<Result<String>> kernelFut = std::async(async, GetKernelVersion);
|
||||||
|
@ -85,24 +86,20 @@ namespace os {
|
||||||
Future<Result<weather::WeatherReport>> wthrFut = std::async(config.weather.enabled ? async : deferred, [&config]() -> Result<weather::WeatherReport> {
|
Future<Result<weather::WeatherReport>> wthrFut = std::async(config.weather.enabled ? async : deferred, [&config]() -> Result<weather::WeatherReport> {
|
||||||
return config.weather.enabled && config.weather.service
|
return config.weather.enabled && config.weather.service
|
||||||
? config.weather.service->getWeatherInfo()
|
? config.weather.service->getWeatherInfo()
|
||||||
: Err(DracError(util::error::DracErrorCode::ApiUnavailable, "Weather API disabled"));
|
: Err(DracError(ApiUnavailable, "Weather API disabled"));
|
||||||
});
|
});
|
||||||
|
|
||||||
{
|
this->date = getDate();
|
||||||
using enum util::error::DracErrorCode;
|
this->host = hostFut.get();
|
||||||
|
this->kernelVersion = kernelFut.get();
|
||||||
this->date = getDate();
|
this->osVersion = osFut.get();
|
||||||
this->host = hostFut.get();
|
this->memInfo = memFut.get();
|
||||||
this->kernelVersion = kernelFut.get();
|
this->desktopEnv = deFut.get();
|
||||||
this->osVersion = osFut.get();
|
this->windowMgr = wmFut.get();
|
||||||
this->memInfo = memFut.get();
|
this->diskUsage = diskFut.get();
|
||||||
this->desktopEnv = deFut.get();
|
this->shell = shellFut.get();
|
||||||
this->windowMgr = wmFut.get();
|
this->packageCount = pkgFut.get();
|
||||||
this->diskUsage = diskFut.get();
|
this->weather = config.weather.enabled ? wthrFut.get() : Err(DracError(ApiUnavailable, "Weather API disabled"));
|
||||||
this->shell = shellFut.get();
|
this->nowPlaying = config.nowPlaying.enabled ? npFut.get() : Err(DracError(ApiUnavailable, "Now Playing API disabled"));
|
||||||
this->packageCount = pkgFut.get();
|
|
||||||
this->weather = config.weather.enabled ? wthrFut.get() : Err(DracError(util::error::DracErrorCode::ApiUnavailable, "Weather API disabled"));
|
|
||||||
this->nowPlaying = config.nowPlaying.enabled ? npFut.get() : Err(DracError(util::error::DracErrorCode::ApiUnavailable, "Now Playing API disabled"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} // namespace os
|
} // namespace os
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue