WIP

Author: GordonSmith

.github/instructions/esp-service-interface.instructions.md

@@ -10,6 +10,11 @@ applyTo: '**/*.ecm'
 - Increment the `version` and `default_client_version` attributes of the `ESPservice` element.
 - Include the `exceptions_inline` attribute in any new `ESPresponse` and `ESPmethod` element.
 
+## Version Bumping
+- Always bump the `ESPservice` `version` and `default_client_version` when changing request/response schemas or behavior.
+- Use the next sequential version string (for example, if current is 1.67, bump to 1.68).
+- Keep changes backward compatible; do not remove or change existing fields without a version gate.
+
 ## Naming Conventions
 - Use `PascalCase` for element names.
 - Use lower case for native types such as `string`, `integer`, `boolean`, etc.

dali/base/dadfs.cpp

@@ -14127,11 +14127,15 @@ static IPropertyTreeIterator *deserializeFileAttrIterator(MemoryBuffer& mb, unsi
 
             if (options.includeField(DFUQResultField::size))
             {
-                // JCSMORE - I am not sure what the point of this is, with or without it, a blank @size does not affect sort order
-                // and EclWatch seems to use the @size (DFUQResultField::origsize) for size column anyway
-                // See special handling in SerializeFileAttrOptions::readFields() to include origsize if size is requested
+                // Size field is notionally the size on disk
                 const char *propName = getDFUQResultFieldName(DFUQResultField::size);
-                attr->setPropInt64(propName, attr->getPropInt64(getDFUQResultFieldName(DFUQResultField::origsize), -1));//Sort the files with empty size to front
+                attr->setPropInt64(propName, isCompressed(*attr) ? attr->getPropInt64(getDFUQResultFieldName(DFUQResultField::compressedsize), -1) : attr->getPropInt64(getDFUQResultFieldName(DFUQResultField::origsize), -1));
+            }
+
+            if (options.includeField(DFUQResultField::origsize))
+            {
+                const char *propName = getDFUQResultFieldName(DFUQResultField::origsize);
+                attr->setPropInt64(propName, attr->getPropInt64(getDFUQResultFieldName(DFUQResultField::origsize), -1));
             }
 
             if (options.includeField(DFUQResultField::recordcount))

esp/services/ws_dfu/ws_dfuService.cpp

@@ -3769,6 +3769,8 @@ void CWsDfuEx::setDFUQuerySortOrder(IEspDFUQueryRequest& req, StringBuffer& sort
     static const std::unordered_map<std::string_view, std::string_view> legacyMappings =
     {
         {"FileSize", "@DFUSFsize"},
+        {"Size", "@origsize"},
+        {"CompressedFileSize", "@compressedSize"},
         {"ContentType", "@kind"},
         {"IsCompressed", "@compressed"},
         {"Records", "@recordcount"},