Stat, feat: reduce members in Stat, support APIs about detecting device type.

Author: richardo2016

fibjs/include/Stat.h

@@ -83,8 +83,11 @@ class Stat : public Stat_base {
     virtual result_t isReadable(bool& retVal);
     virtual result_t isExecutable(bool& retVal);
     virtual result_t isHidden(bool& retVal);
+    virtual result_t isBlockDevice(bool& retVal);
+    virtual result_t isCharacterDevice(bool& retVal);
     virtual result_t isDirectory(bool& retVal);
     virtual result_t isFile(bool& retVal);
+    virtual result_t isFIFO(bool& retVal);
     virtual result_t isSymbolicLink(bool& retVal);
     virtual result_t isMemory(bool& retVal);
     virtual result_t isSocket(bool& retVal);
@@ -97,21 +100,21 @@ class Stat : public Stat_base {
     void init();
     void init(Stat_base* st);
 
-public:
-    exlib::string name;
+private:
     int64_t dev, rdev;
     int64_t ino;
-    int64_t mode;
+    uint64_t m_mode;
     int64_t nlink;
     int64_t uid, gid;
-    int64_t size;
     int64_t blksize;
     int64_t blocks;
+
+public:
+    exlib::string name;
+    int64_t size;
     date_t mtime, atime, ctime, birthtime;
     int64_t mtimeNs, atimeNs, ctimeNs, birthtimeNs;
-    bool m_isBlockDevice, m_isCharacterDevice, m_isFIFO;
-    bool m_isWritable, m_isReadable, m_isExecutable, m_isHidden;
-    bool m_isDirectory, m_isFile, m_isSymbolicLink;
+    bool m_isHidden;
     bool m_isMemory, m_isSocket;
 };
 }

fibjs/include/ifs/Stat.h

@@ -44,7 +44,10 @@ class Stat_base : public object_base {
     virtual result_t isReadable(bool& retVal) = 0;
     virtual result_t isExecutable(bool& retVal) = 0;
     virtual result_t isHidden(bool& retVal) = 0;
+    virtual result_t isBlockDevice(bool& retVal) = 0;
+    virtual result_t isCharacterDevice(bool& retVal) = 0;
     virtual result_t isDirectory(bool& retVal) = 0;
+    virtual result_t isFIFO(bool& retVal) = 0;
     virtual result_t isFile(bool& retVal) = 0;
     virtual result_t isSymbolicLink(bool& retVal) = 0;
     virtual result_t isMemory(bool& retVal) = 0;
@@ -85,7 +88,10 @@ class Stat_base : public object_base {
     static void s_isReadable(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_isExecutable(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_isHidden(const v8::FunctionCallbackInfo<v8::Value>& args);
+    static void s_isBlockDevice(const v8::FunctionCallbackInfo<v8::Value>& args);
+    static void s_isCharacterDevice(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_isDirectory(const v8::FunctionCallbackInfo<v8::Value>& args);
+    static void s_isFIFO(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_isFile(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_isSymbolicLink(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_isMemory(const v8::FunctionCallbackInfo<v8::Value>& args);
@@ -101,7 +107,10 @@ inline ClassInfo& Stat_base::class_info()
         { "isReadable", s_isReadable, false },
         { "isExecutable", s_isExecutable, false },
         { "isHidden", s_isHidden, false },
+        { "isBlockDevice", s_isBlockDevice, false },
+        { "isCharacterDevice", s_isCharacterDevice, false },
         { "isDirectory", s_isDirectory, false },
+        { "isFIFO", s_isFIFO, false },
         { "isFile", s_isFile, false },
         { "isSymbolicLink", s_isSymbolicLink, false },
         { "isMemory", s_isMemory, false },
@@ -447,6 +456,36 @@ inline void Stat_base::s_isHidden(const v8::FunctionCallbackInfo<v8::Value>& arg
     METHOD_RETURN();
 }
 
+inline void Stat_base::s_isBlockDevice(const v8::FunctionCallbackInfo<v8::Value>& args)
+{
+    bool vr;
+
+    METHOD_NAME("Stat.isBlockDevice");
+    METHOD_INSTANCE(Stat_base);
+    METHOD_ENTER();
+
+    METHOD_OVER(0, 0);
+
+    hr = pInst->isBlockDevice(vr);
+
+    METHOD_RETURN();
+}
+
+inline void Stat_base::s_isCharacterDevice(const v8::FunctionCallbackInfo<v8::Value>& args)
+{
+    bool vr;
+
+    METHOD_NAME("Stat.isCharacterDevice");
+    METHOD_INSTANCE(Stat_base);
+    METHOD_ENTER();
+
+    METHOD_OVER(0, 0);
+
+    hr = pInst->isCharacterDevice(vr);
+
+    METHOD_RETURN();
+}
+
 inline void Stat_base::s_isDirectory(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     bool vr;
@@ -462,6 +501,21 @@ inline void Stat_base::s_isDirectory(const v8::FunctionCallbackInfo<v8::Value>&
     METHOD_RETURN();
 }
 
+inline void Stat_base::s_isFIFO(const v8::FunctionCallbackInfo<v8::Value>& args)
+{
+    bool vr;
+
+    METHOD_NAME("Stat.isFIFO");
+    METHOD_INSTANCE(Stat_base);
+    METHOD_ENTER();
+
+    METHOD_OVER(0, 0);
+
+    hr = pInst->isFIFO(vr);
+
+    METHOD_RETURN();
+}
+
 inline void Stat_base::s_isFile(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     bool vr;

fibjs/src/fs/Stat.cpp

@@ -54,7 +54,7 @@ void Stat::fill(exlib::string path, uv_stat_t* statbuf)
 
     dev = statbuf->st_dev;
     ino = statbuf->st_ino;
-    mode = statbuf->st_mode;
+    m_mode = statbuf->st_mode;
 
     nlink = statbuf->st_nlink;
 
@@ -80,26 +80,6 @@ void Stat::fill(exlib::string path, uv_stat_t* statbuf)
     birthtimeNs = (double)statbuf->st_birthtim.tv_nsec;
     birthtime = (double)statbuf->st_birthtim.tv_sec * 1000ll + (birthtimeNs / 1000000000.0);
 
-#ifdef _WIN32
-    m_isBlockDevice = false;
-
-    m_isCharacterDevice = false;
-    m_isFIFO = false;
-#else
-    m_isBlockDevice = S_ISBLK(statbuf->st_mode);
-    m_isCharacterDevice = S_ISCHR(statbuf->st_mode);
-    m_isFIFO = S_ISFIFO(statbuf->st_mode);
-#endif
-
-    m_isReadable = (S_IRUSR & statbuf->st_mode) != 0;
-    m_isWritable = (S_IWUSR & statbuf->st_mode) != 0;
-    m_isExecutable = (S_IXUSR & statbuf->st_mode) != 0;
-
-    m_isDirectory = (S_IFDIR & statbuf->st_mode) != 0;
-    m_isFile = (S_IFREG & statbuf->st_mode) != 0;
-
-    m_isSymbolicLink = S_ISLNK(statbuf->st_mode);
-
     m_isMemory = false;
     m_isSocket = false;
 }
@@ -108,7 +88,7 @@ void Stat::init()
 {
     name.resize(0);
     size = 0;
-    mode = 0;
+    m_mode = 0;
 
     mtime = 0;
     mtimeNs = 0;
@@ -121,22 +101,6 @@ void Stat::init()
 
     gid = 0;
     uid = 0;
-
-    m_isBlockDevice = false;
-    m_isCharacterDevice = false;
-    m_isFIFO = false;
-
-    m_isReadable = false;
-    m_isWritable = false;
-    m_isExecutable = false;
-
-    m_isDirectory = false;
-    m_isFile = false;
-
-    m_isSymbolicLink = false;
-
-    m_isMemory = false;
-    m_isSocket = false;
 }
 
 void Stat::init(Stat_base* st)
@@ -150,7 +114,7 @@ void Stat::init(Stat_base* st)
     size = d_tmp;
 
     st->get_mode(i32_tmp);
-    mode = i32_tmp;
+    m_mode = i32_tmp;
 
     st->get_mtime(mtime);
     st->get_atime(atime);
@@ -163,19 +127,6 @@ void Stat::init(Stat_base* st)
     st->get_uid(i32_tmp);
     uid = i32_tmp;
 
-    // st->isBlockDevice(m_isBlockDevice);
-    // st->isCharacterDevice(m_isCharacterDevice);
-    // st->isFIFO(m_isFIFO);
-
-    st->isReadable(m_isReadable);
-    st->isWritable(m_isWritable);
-    st->isExecutable(m_isExecutable);
-
-    st->isDirectory(m_isDirectory);
-    st->isFile(m_isFile);
-
-    st->isSymbolicLink(m_isSymbolicLink);
-
     st->isMemory(m_isMemory);
     st->isSocket(m_isSocket);
 }
@@ -200,7 +151,7 @@ result_t Stat::get_ino(int32_t& retVal)
 
 result_t Stat::get_mode(int32_t& retVal)
 {
-    retVal = mode;
+    retVal = m_mode;
     return 0;
 };
 
@@ -296,19 +247,22 @@ result_t Stat::get_birthtimeMs(double& retVal)
 
 result_t Stat::isWritable(bool& retVal)
 {
-    retVal = m_isWritable;
+    retVal = (S_IWUSR & m_mode) != 0;
+
     return 0;
 }
 
 result_t Stat::isReadable(bool& retVal)
 {
-    retVal = m_isReadable;
+    retVal = (S_IRUSR & m_mode) != 0;
+
     return 0;
 }
 
 result_t Stat::isExecutable(bool& retVal)
 {
-    retVal = m_isExecutable;
+    retVal = (S_IXUSR & m_mode) != 0;
+
     return 0;
 }
 
@@ -318,33 +272,71 @@ result_t Stat::isHidden(bool& retVal)
     return 0;
 }
 
+result_t Stat::isBlockDevice(bool& retVal)
+{
+#ifdef _WIN32
+    retVal = false;
+#else
+    retVal = S_ISBLK(m_mode);
+#endif
+
+    return 0;
+}
+
+result_t Stat::isCharacterDevice(bool& retVal)
+{
+#ifdef _WIN32
+    retVal = false;
+#else
+    retVal = S_ISCHR(m_mode);
+#endif
+
+    return 0;
+}
+
 result_t Stat::isDirectory(bool& retVal)
 {
-    retVal = m_isDirectory;
+    retVal = (S_IFDIR & m_mode) != 0;
+
+    return 0;
+}
+
+result_t Stat::isFIFO(bool& retVal)
+{
+#ifdef _WIN32
+    retVal = false;
+#else
+    retVal = S_ISFIFO(m_mode);
+#endif
+
     return 0;
 }
 
 result_t Stat::isFile(bool& retVal)
 {
-    retVal = m_isFile;
+    retVal = (S_IFREG & m_mode) != 0;
+
     return 0;
 }
 
 result_t Stat::isSymbolicLink(bool& retVal)
 {
-    retVal = m_isSymbolicLink;
+    retVal = S_ISLNK(m_mode);
+
     return 0;
 }
 
 result_t Stat::isMemory(bool& retVal)
 {
     retVal = m_isMemory;
+
     return 0;
 }
 
 result_t Stat::isSocket(bool& retVal)
 {
     retVal = m_isSocket;
+
     return 0;
 }
 }

idl/zh-cn/Stat.idl

@@ -81,11 +81,26 @@ interface Stat : object
      */
     Boolean isHidden();
 
+    /*! @brief 查询 Stat 是否描述了一个 block device
+     @return 为 true 表示描述了一个 block device
+     */
+    Boolean isBlockDevice();
+
+    /*! @brief 查询 Stat 是否描述了一个 character device
+     @return 为 true 表示描述了一个 character device
+     */
+    Boolean isCharacterDevice();
+
     /*! @brief 查询文件是否是目录
      @return 为 true 则是目录
      */
     Boolean isDirectory();
 
+    /*! @brief 查询 Stat 是否描述了一个 FIFO 管道
+     @return 为 true 表示描述了一个 FIFO 管道
+     */
+    Boolean isFIFO();
+
     /*! @brief 查询文件是否是文件
      @return 为 true 则是文件
      */