diff --git a/README.md b/README.md index e5c773db2..42dd876d9 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ All categories not listed here should work without needing a specific implementa #### Available Modules ``` -Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resolution, DE, WM, WMTheme, Theme, Icons, Font, Cursor, Terminal, Terminal Font, CPU, CPUUsage, GPU, Memory, Disk, Battery, LocalIP, PublicIP, Player, Song, Locale, Colors, Break, Custom +Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resolution, DE, WM, WMTheme, Theme, Icons, Font, Cursor, Terminal, Terminal Font, CPU, CPUUsage, GPU, Memory, Disk, Battery, Player, Song, LocalIP, PublicIP, Locale, Colors, Break, Custom ``` ##### Logos diff --git a/src/fastfetch.h b/src/fastfetch.h index 68946cf27..a463e44f7 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -503,10 +503,10 @@ void ffPrintMemory(FFinstance* instance); void ffPrintDisk(FFinstance* instance); void ffPrintBattery(FFinstance* instance); void ffPrintLocale(FFinstance* instance); -void ffPrintLocalIp(FFinstance* instance); -void ffPrintPublicIp(FFinstance* instance); void ffPrintPlayer(FFinstance* instance); void ffPrintSong(FFinstance* instance); +void ffPrintLocalIp(FFinstance* instance); +void ffPrintPublicIp(FFinstance* instance); void ffPrintColors(FFinstance* instance); #endif diff --git a/src/flashfetch.c b/src/flashfetch.c index 98c4ac1a8..013f8da3b 100644 --- a/src/flashfetch.c +++ b/src/flashfetch.c @@ -45,10 +45,10 @@ int main(int argc, char** argv) ffPrintMemory(&instance); ffPrintDisk(&instance); ffPrintBattery(&instance); - //ffPrintLocalIp(&instance); - //ffPrintPublicIp(&instance); //ffPrintPlayer(&instance); //ffPrintSong(&instance); + //ffPrintLocalIp(&instance); + //ffPrintPublicIp(&instance); ffPrintLocale(&instance); ffPrintBreak(&instance); ffPrintColors(&instance); diff --git a/tests/performance.c b/tests/performance.c index e4e136959..7a7b0a8ec 100644 --- a/tests/performance.c +++ b/tests/performance.c @@ -10,7 +10,7 @@ clock_gettime(CLOCK_REALTIME, &end); \ long nanos = end.tv_nsec - start.tv_nsec; \ printf("\033[F"); \ - for(uint8_t i = 0; i < 110; i++) printf("\033[C"); \ + for(uint8_t i = 0; i < 125; i++) printf("\033[C"); \ printf("%08ldns\n", nanos); \ } \ @@ -28,12 +28,14 @@ int main(int argc, char** argv) FASTFETCH_TEST_PERFORMANCE( puts("Configuration"); ffLoadLogo(&instance); - ffStrbufSet(&instance.config.color, &instance.config.logoColors[0]); - instance.config.showErrors = true; - instance.config.recache = argc == 1; - instance.config.cacheSave = false; ) + ffStrbufSet(&instance.config.color, &instance.config.logoColors[0]); + instance.config.showErrors = true; + instance.config.recache = argc == 1; + instance.config.cacheSave = false; + ffStrbufSetS(&instance.config.songFormat, "{}"); //Otherwise the line is too long + FASTFETCH_TEST_PERFORMANCE( puts("Thread starting"); ffStartDetectionThreads(&instance); @@ -45,6 +47,7 @@ int main(int argc, char** argv) FASTFETCH_TEST_PERFORMANCE(ffPrintHost(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintKernel(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintUptime(&instance)) + FASTFETCH_TEST_PERFORMANCE(ffPrintProcesses(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintPackages(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintShell(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintResolution(&instance)) @@ -57,10 +60,15 @@ int main(int argc, char** argv) FASTFETCH_TEST_PERFORMANCE(ffPrintTerminal(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintTerminalFont(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintCPU(&instance)) + //FASTFETCH_TEST_PERFORMANCE(ffPrintCPUUsage(&instance)) // Doesn't make sense, contains a sleep call FASTFETCH_TEST_PERFORMANCE(ffPrintGPU(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintMemory(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintDisk(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintBattery(&instance)) + FASTFETCH_TEST_PERFORMANCE(ffPrintPlayer(&instance)) + FASTFETCH_TEST_PERFORMANCE(ffPrintSong(&instance)) + FASTFETCH_TEST_PERFORMANCE(ffPrintLocalIp(&instance)) + FASTFETCH_TEST_PERFORMANCE(ffPrintPublicIp(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintLocale(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintBreak(&instance)) FASTFETCH_TEST_PERFORMANCE(ffPrintColors(&instance)) diff --git a/tests/performance.sh b/tests/performance.sh index e7c7e7a00..df6eb7809 100755 --- a/tests/performance.sh +++ b/tests/performance.sh @@ -1,7 +1,6 @@ #!/bin/env sh -rm -rf tests/build/ -mkdir -p tests/build/ -cd tests/build/ -cmake ../.. +mkdir -p build/ +cd build +cmake .. cmake --build . --target fastfetch-test-performance -j$(nproc) ./fastfetch-test-performance "$@" diff --git a/tests/strbuf.sh b/tests/strbuf.sh index 4b981f56b..93ae379ff 100755 --- a/tests/strbuf.sh +++ b/tests/strbuf.sh @@ -1,7 +1,6 @@ #!/bin/env sh -rm -rf tests/build/ -mkdir -p tests/build/ -cd tests/build/ -cmake ../.. +mkdir -p build/ +cd build +cmake .. cmake --build . --target fastfetch-test-strbuf -j$(nproc) ./fastfetch-test-strbuf "$@"