Merge pull request #349 from adobe/couzteau/preview-images-with-size

add file size to file stat

Author: bchintx

appshell/appshell_extensions.cpp

@@ -237,7 +237,7 @@ class ProcessMessageDelegate : public ClientHandler::ProcessMessageDelegate {
                 error = Rename(oldName, newName);
             }
           // No additional response args for this function
-        } else if (message_name == "GetFileModificationTime") {
+        } else if (message_name == "GetFileInfo") {
             // Parameters:
             //  0: int32 - callback id
             //  1: string - filename
@@ -249,13 +249,15 @@ class ProcessMessageDelegate : public ClientHandler::ProcessMessageDelegate {
             if (error == NO_ERROR) {
                 ExtensionString filename = argList->GetString(1);
                 uint32 modtime;
+                double size;
                 bool isDir;
 
-                error = GetFileModificationTime(filename, modtime, isDir);
+                error = GetFileInfo(filename, modtime, isDir, size);
 
                 // Set response args for this function
                 responseArgs->SetInt(2, modtime);
                 responseArgs->SetBool(3, isDir);
+                responseArgs->SetInt(4, size);
             }
         } else if (message_name == "ReadFile") {
             // Parameters:

appshell/appshell_extensions.js

@@ -267,17 +267,18 @@ if (!appshell.app) {
      *                 
      * @return None. This is an asynchronous call that sends all return information to the callback.
      */
-    native function GetFileModificationTime();
+    native function GetFileInfo();
     appshell.fs.stat = function (path, callback) {
-        GetFileModificationTime(function (err, modtime, isDir) {
+        GetFileInfo(function (err, modtime, isDir, size) {
             callback(err, {
                 isFile: function () {
                     return !isDir;
                 },
                 isDirectory: function () {
                     return isDir;
                 },
-                mtime: new Date(modtime * 1000) // modtime is seconds since 1970, convert to ms
+                mtime: new Date(modtime * 1000), // modtime is seconds since 1970, convert to ms
+                size: new Number(size)
             });
         }, path);
     };

appshell/appshell_extensions_gtk.cpp

@@ -286,14 +286,15 @@ int Rename(ExtensionString oldName, ExtensionString newName)
     }
 }
 
-int GetFileModificationTime(ExtensionString filename, uint32& modtime, bool& isDir)
+int GetFileInfo(ExtensionString filename, uint32& modtime, bool& isDir, double& size)
 {
     struct stat buf;
     if(stat(filename.c_str(),&buf)==-1)
         return ConvertLinuxErrorCode(errno);
 
     modtime = buf.st_mtime;
     isDir = S_ISDIR(buf.st_mode);
+    size = (double)buf.st_size;
 
     return NO_ERROR;
 }

appshell/appshell_extensions_mac.mm

@@ -432,7 +432,7 @@ int32 Rename(ExtensionString oldName, ExtensionString newName)
     return ConvertNSErrorCode(error, false);
 }
 
-int32 GetFileModificationTime(ExtensionString filename, uint32& modtime, bool& isDir)
+int32 GetFileInfo(ExtensionString filename, uint32& modtime, bool& isDir, double& size)
 {
     NSString* path = [NSString stringWithUTF8String:filename.c_str()];
     BOOL isDirectory;
@@ -447,7 +447,8 @@ int32 GetFileModificationTime(ExtensionString filename, uint32& modtime, bool& i
     NSDictionary* fileAttribs = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error];
     NSDate *modDate = [fileAttribs valueForKey:NSFileModificationDate];
     modtime = [modDate timeIntervalSince1970];
-    
+    NSNumber *filesize = [fileAttribs valueForKey:NSFileSize];
+    size = [filesize doubleValue];
     return ConvertNSErrorCode(error, true);
 }
 

appshell/appshell_extensions_platform.h

@@ -95,7 +95,7 @@ int32 MakeDir(ExtensionString path, int32 mode);
 
 int32 Rename(ExtensionString oldName, ExtensionString newName);
 
-int32 GetFileModificationTime(ExtensionString filename, uint32& modtime, bool& isDir);
+int32 GetFileInfo(ExtensionString filename, uint32& modtime, bool& isDir, double& size);
 
 int32 ReadFile(ExtensionString filename, ExtensionString encoding, std::string& contents);
 

appshell/appshell_extensions_win.cpp

@@ -654,23 +654,24 @@ int32 Rename(ExtensionString oldName, ExtensionString newName)
     return NO_ERROR;
 }
 
-int32 GetFileModificationTime(ExtensionString filename, uint32& modtime, bool& isDir)
+int32 GetFileInfo(ExtensionString filename, uint32& modtime, bool& isDir, double& size)
 {
-    DWORD dwAttr = GetFileAttributes(filename.c_str());
-
-    if (dwAttr == INVALID_FILE_ATTRIBUTES) {
-        return ConvertWinErrorCode(GetLastError()); 
-    }
-
-    isDir = ((dwAttr & FILE_ATTRIBUTE_DIRECTORY) != 0);
 
     WIN32_FILE_ATTRIBUTE_DATA   fad;
     if (!GetFileAttributesEx(filename.c_str(), GetFileExInfoStandard, &fad)) {
         return ConvertWinErrorCode(GetLastError());
     }
 
+    DWORD dwAttr = fad.dwFileAttributes;
+    isDir = ((dwAttr & FILE_ATTRIBUTE_DIRECTORY) != 0);
+
     modtime = FiletimeToTime(fad.ftLastWriteTime);
 
+    LARGE_INTEGER size_tmp;
+    size_tmp.HighPart = fad.nFileSizeHigh;
+    size_tmp.LowPart = fad.nFileSizeLow;
+    size = size_tmp.QuadPart;
+
     return NO_ERROR;
 }