updatte
This commit is contained in:
parent
4d1e69bbe5
commit
ee61c994ac
23
src/main.cpp
23
src/main.cpp
|
@ -47,26 +47,27 @@ fn GetDate() -> string {
|
|||
}
|
||||
|
||||
fn main() -> int {
|
||||
using WeatherOutput = Weather::WeatherOutput;
|
||||
|
||||
const Config& config = Config::getInstance();
|
||||
|
||||
if (config.getNowPlaying().getEnabled())
|
||||
fmt::println("{}", GetNowPlaying());
|
||||
|
||||
fmt::println("Hello {}!", config.getGeneral().getName());
|
||||
fmt::println("Installed RAM: {:.2f}", BytesToGiB {GetMemInfo()});
|
||||
fmt::println("Today is: {}", GetDate());
|
||||
|
||||
Weather::WeatherOutput json = config.getWeather().getWeatherInfo();
|
||||
WeatherOutput json = config.getWeather().getWeatherInfo();
|
||||
|
||||
const long temp = std::lround(json.main.temp);
|
||||
const string townName = json.name;
|
||||
|
||||
fmt::println("It is {}°F in {}", temp, townName);
|
||||
|
||||
const char* version = GetOSVersion();
|
||||
const string name = config.getGeneral().getName();
|
||||
const bool nowPlayingEnabled = config.getNowPlaying().getEnabled();
|
||||
|
||||
fmt::println("Hello {}!", name);
|
||||
fmt::println("Today is: {}", GetDate());
|
||||
fmt::println("It is {}°F in {}", temp, townName);
|
||||
fmt::println("Installed RAM: {:.2f}", BytesToGiB {GetMemInfo()});
|
||||
fmt::println("{}", version);
|
||||
|
||||
if (nowPlayingEnabled)
|
||||
fmt::println("{}", GetNowPlaying());
|
||||
|
||||
delete[] version;
|
||||
delete &config;
|
||||
|
||||
|
|
|
@ -67,10 +67,17 @@ using MRMediaRemoteGetNowPlayingInfoFunction = void (*)(
|
|||
|
||||
NSOperatingSystemVersion osVersion = [processInfo operatingSystemVersion];
|
||||
|
||||
NSString* version = [NSString stringWithFormat:@"%ld.%ld.%ld",
|
||||
NSString* version;
|
||||
if (osVersion.patchVersion == 0) {
|
||||
version = [NSString stringWithFormat:@"%ld.%ld",
|
||||
osVersion.majorVersion,
|
||||
osVersion.minorVersion];
|
||||
} else {
|
||||
version = [NSString stringWithFormat:@"%ld.%ld.%ld",
|
||||
osVersion.majorVersion,
|
||||
osVersion.minorVersion,
|
||||
osVersion.patchVersion];
|
||||
}
|
||||
|
||||
// Dictionary to map macOS versions to their respective names
|
||||
NSDictionary<NSNumber*, NSString*>* versionNames =
|
||||
|
|
Loading…
Reference in a new issue