query: disk: fix querying of disks types you don't want in $<auto.disk>

Author: Toni500github

android/app/src/main/java/org/toni/customfetch_android/TestConfigFragment.kt

@@ -25,16 +25,13 @@
 
 package org.toni.customfetch_android
 
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
-import android.text.SpannableString
 import android.text.TextPaint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
 import org.toni.customfetch_android.databinding.TestConfigFragmentBinding
 import org.toni.customfetch_android.widget.customfetchRender

include/config.hpp

@@ -345,7 +345,13 @@ layout-padding-top = 0
 # Usually in neofetch/fastfetch, when your terminal size is too small,
 # to render some text in 1 line, they don't wrap those lines, instead they truncate them.
 # Enable/Disable if you want this
-wrap-lines = false
+)#"
+#if !ANDROID_APP
+R"#(wrap-lines = false)#"
+#else
+R"#(wrap-lines = true)#"
+#endif
+R"#(
 
 # Used in disk, ram and swap modules.
 # If true, we're going to use the SI standard byte unit (1kB == 1000 bytes)

src/query/linux/disk.cpp

@@ -180,8 +180,6 @@ static std::string format_auto_query_string(std::string str, const struct mntent
 
 Disk::Disk(const std::string& path, systemInfo_t& queried_paths, parse_args_t& parse_args, const bool auto_module)
 {
-    const Config& config = parse_args.config;
-
     if (queried_paths.find(path) != queried_paths.end() && !is_live_mode)
     {
         m_disk_infos.device       = getInfoFromName(queried_paths, path, "device");
@@ -219,10 +217,14 @@ Disk::Disk(const std::string& path, systemInfo_t& queried_paths, parse_args_t& p
             if (!is_physical_device(pDevice))
                 continue;
 
+            m_disk_infos.types_disk = get_disk_type(pDevice);
+            if (!(parse_args.config.auto_disks_types & m_disk_infos.types_disk))
+                continue;
+
             parse_args.no_more_reset = false;
             debug("pDevice->mnt_dir = {} && pDevice->mnt_fsname = {}", pDevice->mnt_dir, pDevice->mnt_fsname);
             m_disks_formats.push_back(
-                parse(format_auto_query_string(config.auto_disks_fmt, pDevice), parse_args)
+                parse(format_auto_query_string(parse_args.config.auto_disks_fmt, pDevice), parse_args)
             );
         }
 
@@ -237,7 +239,7 @@ Disk::Disk(const std::string& path, systemInfo_t& queried_paths, parse_args_t& p
         if (path == pDevice->mnt_dir || path == pDevice->mnt_fsname)
         {
             m_disk_infos.types_disk = get_disk_type(pDevice);
-            if (!(config.auto_disks_types & m_disk_infos.types_disk))
+            if (!(parse_args.config.auto_disks_types & m_disk_infos.types_disk))
                 continue;
 
             m_disk_infos.typefs   = pDevice->mnt_type;