Indicate symlink in the icon

Author: glebm

fileLister.cpp

@@ -34,7 +34,7 @@ const bool CFileLister::list(const std::string &p_path)
     // Read dir
     std::string l_file("");
     std::string l_fileFull("");
-    struct stat l_stat;
+    struct stat st;
     struct dirent *l_dirent = readdir(l_dir);
     while (l_dirent != NULL)
     {
@@ -44,19 +44,29 @@ const bool CFileLister::list(const std::string &p_path)
         {
             // Stat the file
             l_fileFull = p_path + "/" + l_file;
-            if (stat(l_fileFull.c_str(), &l_stat) == -1)
+            if (lstat(l_fileFull.c_str(), &st) == -1)
             {
-                std::cerr << "CFileLister::list: Error stat " << l_fileFull << std::endl;
+                std::cerr << "CFileLister::list: Error lstat " << l_fileFull << std::endl;
             }
             else
             {
+                const bool is_symlink = S_ISLNK(st.st_mode);
+                auto tfile = T_FILE(l_file, is_symlink);
+                if (tfile.is_symlink) {
+                    // Follow the link.
+                    if (stat(l_fileFull.c_str(), &st) == -1) {
+                        st.st_size = 0;  // Invalid symlink.
+                    }
+                }
+                tfile.m_size = st.st_size;
+
                 // Check type
-                if (S_ISDIR(l_stat.st_mode))
+                if (S_ISDIR(st.st_mode))
                     // It's a directory
-                    m_listDirs.push_back(T_FILE(l_file, l_stat.st_size));
+                    m_listDirs.push_back(std::move(tfile));
                 else
                     // It's a file
-                    m_listFiles.push_back(T_FILE(l_file, l_stat.st_size));
+                    m_listFiles.push_back(std::move(tfile));
             }
         }
         // Next
@@ -68,7 +78,7 @@ const bool CFileLister::list(const std::string &p_path)
     sort(m_listFiles.begin(), m_listFiles.end(), compareNoCase);
     sort(m_listDirs.begin(), m_listDirs.end(), compareNoCase);
     // Add "..", always at the first place
-    m_listDirs.insert(m_listDirs.begin(), T_FILE("..", 0));
+    m_listDirs.insert(m_listDirs.begin(), T_FILE("..", /*is_symlink=*/false, 0));
     return true;
 }
 

fileLister.h

@@ -9,14 +9,16 @@
 struct T_FILE
 {
     T_FILE(void) : m_size(0) {}
-    T_FILE(const std::string &p_name, const unsigned long int &p_size)
-        : m_name(p_name),
+    T_FILE(std::string p_name, bool is_symlink, unsigned long int p_size = 0)
+        : m_name(std::move(p_name)),
+          is_symlink(is_symlink),
           m_ext(File_utils::getLowercaseFileExtension(p_name)),
           m_size(p_size) {}
     T_FILE(const T_FILE &p_source) = default;
     T_FILE &operator=(const T_FILE &p_source) = default;
     std::string m_name;
     std::string m_ext;
+    bool is_symlink;
     unsigned long int m_size;
 };
 

panel.cpp

@@ -22,6 +22,7 @@ CPanel::CPanel(const std::string &p_path, const Sint16 p_x):
     m_iconImg(CResourceManager::instance().getSurface(CResourceManager::T_SURFACE_FILE_IMAGE)),
     m_iconIpk(CResourceManager::instance().getSurface(CResourceManager::T_SURFACE_FILE_INSTALLABLE_PACKAGE)),
     m_iconOpk(CResourceManager::instance().getSurface(CResourceManager::T_SURFACE_FILE_PACKAGE)),
+    m_iconIsSymlink(CResourceManager::instance().getSurface(CResourceManager::T_SURFACE_FILE_IS_SYMLINK)),
     m_iconUp(CResourceManager::instance().getSurface(CResourceManager::T_SURFACE_UP)),
     m_cursor1(CResourceManager::instance().getSurface(CResourceManager::T_SURFACE_CURSOR1)),
     m_cursor2(CResourceManager::instance().getSurface(CResourceManager::T_SURFACE_CURSOR2)),
@@ -109,6 +110,8 @@ void CPanel::render(const bool p_active) const
                 l_color = &Globals::g_colorTextNormal;
         }
         SDL_utils::applySurface(m_x, l_y, l_surfaceTmp, Globals::g_screen);
+        if (m_fileLister[l_i].is_symlink)
+            SDL_utils::applySurface(m_x, l_y, m_iconIsSymlink, Globals::g_screen);
         // Text
         SDL_Color l_bg;
         if (l_i == m_highlightedLine) {

panel.h

@@ -96,6 +96,7 @@ class CPanel
     SDL_Surface *m_iconImg;
     SDL_Surface *m_iconIpk;
     SDL_Surface *m_iconOpk;
+    SDL_Surface *m_iconIsSymlink;
     SDL_Surface *m_iconUp;
     SDL_Surface *m_cursor1;
     SDL_Surface *m_cursor2;

res/build-icons.sh

@@ -10,6 +10,7 @@ rsvg-convert -h 28 "${ICONS_DIR}/mimes/32/image-x-generic.svg" > file-image.png
 rsvg-convert -h 28 "${ICONS_DIR}/mimes/32/text-x-generic.svg" > file-text.png
 rsvg-convert -h 28 "${ICONS_DIR}/apps/32/synaptic.svg" > file-ipk.png
 rsvg-convert -h 28 "${ICONS_DIR}/mimes/32/package-x-generic.svg" > file-opk.png
+rsvg-convert -h 28 "${ICONS_DIR}/emblems/22/emblem-symbolic-link.svg" > file-is-symlink.png
 rsvg-convert -h 28 "${ICONS_DIR}/actions/24/go-up.svg" > up.png
 rsvg-convert -h 32 "${ICONS_DIR}/apps/32/system-file-manager.svg" > ../opkg/commander.png
 optipng -o9 *.png

res/file-is-symlink.png

@@ -63,6 +63,7 @@ CResourceManager::CResourceManager() : m_fonts(LoadFonts()) {
     m_surfaces[T_SURFACE_FILE_IMAGE] = LoadIcon(RES_DIR "file-image.png");
     m_surfaces[T_SURFACE_FILE_INSTALLABLE_PACKAGE] = LoadIcon(RES_DIR "file-ipk.png");
     m_surfaces[T_SURFACE_FILE_PACKAGE] = LoadIcon(RES_DIR "file-opk.png");
+    m_surfaces[T_SURFACE_FILE_IS_SYMLINK] = LoadIcon(RES_DIR "file-is-symlink.png");
     m_surfaces[T_SURFACE_UP] = LoadIcon(RES_DIR "up.png");
     m_surfaces[T_SURFACE_CURSOR1] = SDL_utils::createImage(screen.w / 2 * screen.ppu_x, LINE_HEIGHT * screen.ppu_y, SDL_MapRGB(Globals::g_screen->format, COLOR_CURSOR_1));
     m_surfaces[T_SURFACE_CURSOR2] = SDL_utils::createImage(screen.w / 2 * screen.ppu_x, LINE_HEIGHT * screen.ppu_y, SDL_MapRGB(Globals::g_screen->format, COLOR_CURSOR_2));

resourceManager.cpp

@@ -7,7 +7,7 @@
 #include <SDL_ttf.h>
 #include "sdl_ttf_multifont.h"
 
-#define NB_SURFACES 8
+#define NB_SURFACES 9
 
 class CResourceManager
 {
@@ -20,6 +20,7 @@ class CResourceManager
         T_SURFACE_FILE_IMAGE,
         T_SURFACE_FILE_INSTALLABLE_PACKAGE,
         T_SURFACE_FILE_PACKAGE,
+        T_SURFACE_FILE_IS_SYMLINK,
         T_SURFACE_UP,
         T_SURFACE_CURSOR1,
         T_SURFACE_CURSOR2