RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:28:11 +00:00
Code Issues Activity Actions

GDirectoryModel: Add "modification time" column.

Browse source 
Fixes #373.
This commit is contained in:
Andreas Kling 2019-07-31 07:09:35 +02:00
parent 10b4c92e21
commit 993ab84a0d
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Libraries/LibGUI/GDirectoryModel.cpp
View file

@ -3,12 +3,13 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibCore/CDirIterator.h> #include <LibCore/CDirIterator.h>
#include <LibCore/CLock.h> #include <LibCore/CLock.h>
#include <LibGUI/GPainter.h>
#include <LibDraw/GraphicsBitmap.h> #include <LibDraw/GraphicsBitmap.h>
#include <LibGUI/GPainter.h>
#include <dirent.h> #include <dirent.h>
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
static CLockable<HashMap<String, RefPtr<GraphicsBitmap>>>& thumbnail_cache() static CLockable<HashMap<String, RefPtr<GraphicsBitmap>>>& thumbnail_cache()
@ -106,6 +107,8 @@ String GDirectoryModel::column_name(int column) const
return "Group"; return "Group";
case Column::Permissions: case Column::Permissions:
return "Mode"; return "Mode";
case Column::ModificationTime:
return "Modified";
case Column::Inode: case Column::Inode:
return "Inode"; return "Inode";
} }
@ -125,6 +128,8 @@ GModel::ColumnMetadata GDirectoryModel::column_metadata(int column) const
return { 50, TextAlignment::CenterLeft }; return { 50, TextAlignment::CenterLeft };
case Column::Group: case Column::Group:
return { 50, TextAlignment::CenterLeft }; return { 50, TextAlignment::CenterLeft };
case Column::ModificationTime:
return { 110, TextAlignment::CenterLeft };
case Column::Permissions: case Column::Permissions:
return { 60, TextAlignment::CenterLeft }; return { 60, TextAlignment::CenterLeft };
case Column::Inode: case Column::Inode:
@ -161,6 +166,18 @@ GIcon GDirectoryModel::icon_for(const Entry& entry) const
return m_file_icon; return m_file_icon;
} }
static String timestamp_string(time_t timestamp)
{
auto* tm = localtime(&timestamp);
return String::format("%4u-%02u-%02u %02u:%02u:%02u",
tm->tm_year + 1900,
tm->tm_mon + 1,
tm->tm_mday,
tm->tm_hour,
tm->tm_min,
tm->tm_sec);
}
static String permission_string(mode_t mode) static String permission_string(mode_t mode)
{ {
StringBuilder builder; StringBuilder builder;
@ -232,6 +249,8 @@ GVariant GDirectoryModel::data(const GModelIndex& index, Role role) const
return name_for_gid(entry.gid); return name_for_gid(entry.gid);
case Column::Permissions: case Column::Permissions:
return permission_string(entry.mode); return permission_string(entry.mode);
case Column::ModificationTime:
return entry.mtime;
case Column::Inode: case Column::Inode:
return (int)entry.inode; return (int)entry.inode;
} }
@ -251,6 +270,8 @@ GVariant GDirectoryModel::data(const GModelIndex& index, Role role) const
return name_for_gid(entry.gid); return name_for_gid(entry.gid);
case Column::Permissions: case Column::Permissions:
return permission_string(entry.mode); return permission_string(entry.mode);
case Column::ModificationTime:
return timestamp_string(entry.mtime);
case Column::Inode: case Column::Inode:
return (int)entry.inode; return (int)entry.inode;
} }
@ -289,6 +310,7 @@ void GDirectoryModel::update()
entry.uid = st.st_uid; entry.uid = st.st_uid;
entry.gid = st.st_gid; entry.gid = st.st_gid;
entry.inode = st.st_ino; entry.inode = st.st_ino;
entry.mtime = st.st_mtime;
auto& entries = S_ISDIR(st.st_mode) ? m_directories : m_files; auto& entries = S_ISDIR(st.st_mode) ? m_directories : m_files;
entries.append(move(entry)); entries.append(move(entry));

2
Libraries/LibGUI/GDirectoryModel.h
View file

@ -19,6 +19,7 @@ public:
Owner, Owner,
Group, Group,
Permissions, Permissions,
ModificationTime,
Inode, Inode,
__Count, __Count,
}; };
@ -43,6 +44,7 @@ public:
uid_t uid { 0 }; uid_t uid { 0 };
uid_t gid { 0 }; uid_t gid { 0 };
ino_t inode { 0 }; ino_t inode { 0 };
time_t mtime { 0 };
mutable RefPtr<GraphicsBitmap> thumbnail; mutable RefPtr<GraphicsBitmap> thumbnail;
bool is_directory() const { return S_ISDIR(mode); } bool is_directory() const { return S_ISDIR(mode); }
bool is_executable() const { return mode & S_IXUSR; } bool is_executable() const { return mode & S_IXUSR; }