Skip to content

Commit 1f87a09

Browse files
committed
parse: add modules only and members extended name version
1 parent 6034bdc commit 1f87a09

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

src/main.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ Read the manual "customfetch.1" or the autogenerated config file for more infos
158158
static STRING_IF_ANDROID_APP_ELSE(void) modules_list()
159159
{
160160
constexpr std::string_view list(R"(
161-
MODULE ONLY
161+
--------------------------------------------------------[ MODULE ONLY ]------------------------------------------------------------------------
162162
Should be used as like as $<module>
163+
NOTE: module "title_sep" as an extended name version called "title_separator"
163164
164165
Syntax:
165166
# maybe comments of the module
@@ -213,12 +214,12 @@ colors_symbol(symbol):
213214
colors_light_symbol(symbol):
214215
light color palette with specific symbol
215216
216-
--------------------------------------------------------------------------------------------------------------------------------
217+
--------------------------------------------------------[ MODULE MEMBERS ]------------------------------------------------------------------------
217218
218-
MODULE MEMBERS
219219
Should be used as like as $<module.member>
220-
NOTE: there are modules such as "user.de_version" that may slow down customfetch because of querying things like the DE version
221-
customfetch is still fast tho :)
220+
NOTE: module members such as "os.pkgs" or "disk.used_perc" have an extended name version
221+
"os.pkgs" == "os.packages"
222+
any module member that has "perc" can be replaced with "percentage"
222223
223224
Syntax:
224225
# maybe comments of the module

src/parse.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,6 +1147,7 @@ void addValueFromModuleMember(const std::string& moduleName, const std::string&
11471147

11481148
case "kernel_name"_fnv1a16: SYSINFO_INSERT(query_system.kernel_name()); break;
11491149
case "kernel_version"_fnv1a16: SYSINFO_INSERT(query_system.kernel_version()); break;
1150+
case "packages"_fnv1a16:
11501151
case "pkgs"_fnv1a16: SYSINFO_INSERT(query_system.pkgs_installed(config)); break;
11511152
case "initsys_name"_fnv1a16: SYSINFO_INSERT(query_system.os_initsys_name()); break;
11521153
case "initsys_version"_fnv1a16: SYSINFO_INSERT(query_system.os_initsys_version()); break;
@@ -1435,6 +1436,7 @@ void addValueFromModuleMember(const std::string& moduleName, const std::string&
14351436
SYSINFO_INSERT(str);
14361437

14371438
} break;
1439+
14381440
case "used"_fnv1a16:
14391441
SYSINFO_INSERT(fmt::format("{:.2f} {}", byte_units.at(USED).num_bytes, byte_units.at(USED).unit));
14401442
break;
@@ -1447,11 +1449,13 @@ void addValueFromModuleMember(const std::string& moduleName, const std::string&
14471449
SYSINFO_INSERT(fmt::format("{:.2f} {}", byte_units.at(FREE).num_bytes, byte_units.at(FREE).unit));
14481450
break;
14491451

1452+
case "free_percentage"_fnv1a16:
14501453
case "free_perc"_fnv1a16:
14511454
SYSINFO_INSERT(get_and_color_percentage(query_disk.free_amount(), query_disk.total_amount(),
14521455
parse_args, true));
14531456
break;
14541457

1458+
case "used_percentage"_fnv1a16:
14551459
case "used_perc"_fnv1a16:
14561460
SYSINFO_INSERT(
14571461
get_and_color_percentage(query_disk.used_amount(), query_disk.total_amount(), parse_args));
@@ -1503,11 +1507,13 @@ void addValueFromModuleMember(const std::string& moduleName, const std::string&
15031507
SYSINFO_INSERT(fmt::format("{:.2f} {}", byte_units.at(USED).num_bytes, byte_units.at(USED).unit));
15041508
break;
15051509

1510+
case "free_percentage"_fnv1a16:
15061511
case "free_perc"_fnv1a16:
15071512
SYSINFO_INSERT(get_and_color_percentage(query_ram.swap_free_amount(), query_ram.swap_total_amount(),
15081513
parse_args, true));
15091514
break;
15101515

1516+
case "used_percentage"_fnv1a16:
15111517
case "used_perc"_fnv1a16:
15121518
SYSINFO_INSERT(get_and_color_percentage(query_ram.swap_used_amount(), query_ram.swap_total_amount(),
15131519
parse_args));
@@ -1559,11 +1565,13 @@ void addValueFromModuleMember(const std::string& moduleName, const std::string&
15591565
SYSINFO_INSERT(fmt::format("{:.2f} {}", byte_units.at(FREE).num_bytes, byte_units.at(FREE).unit));
15601566
break;
15611567

1568+
case "free_percentage"_fnv1a16:
15621569
case "free_perc"_fnv1a16:
15631570
SYSINFO_INSERT(
15641571
get_and_color_percentage(query_ram.free_amount(), query_ram.total_amount(), parse_args, true));
15651572
break;
15661573

1574+
case "used_percentage"_fnv1a16:
15671575
case "used_perc"_fnv1a16:
15681576
SYSINFO_INSERT(
15691577
get_and_color_percentage(query_ram.used_amount(), query_ram.total_amount(), parse_args));
@@ -1591,6 +1599,7 @@ void addValueFromModuleMember(const std::string& moduleName, const std::string&
15911599
{
15921600
switch (moduleMember_hash)
15931601
{
1602+
case "percentage"_fnv1a16:
15941603
case "perc"_fnv1a16:
15951604
SYSINFO_INSERT(get_and_color_percentage(query_battery.perc(), 100, parse_args, true));
15961605
break;
@@ -1658,7 +1667,7 @@ void addValueFromModule(const std::string& moduleName, parse_args_t& parse_args)
16581667
}
16591668
}
16601669

1661-
else if (moduleName == "title_sep")
1670+
else if (moduleName == "title_sep" || moduleName == "title_separator")
16621671
{
16631672
if (sysInfo.find(moduleName) == sysInfo.end())
16641673
sysInfo.insert({ moduleName, {} });

0 commit comments

Comments
 (0)