File Manager: Add Compress & Extract archive support

emhttp/plugins/dynamix/BrowseButton.page

@@ -48,7 +48,7 @@ const dfm = {
   draggable:  false,
   previous: '',
   height: 0,
-  tsize: {0: 0, 1: 6, 2: 3, 3: 3, 4: 3, 11: 2, 12: 2, 14: 0, 15: 3},
+  tsize: {0: 0, 1: 6, 2: 3, 3: 3, 4: 3, 11: 2, 12: 2, 14: 0, 15: 3, 16: 6, 17: 1},
 };
 var dfm_read = {};
 
@@ -136,7 +136,7 @@ function dfm_createSource(source) {
       if (i < 10) {
         $('<option></option>').text(object).prop('selected', i==0).appendTo(select);
       } else {
-        select.append('<option>&lt;_(more)_&gt; ...</option>');
+        select.append('<option>(+' + (source.length - 9) + ' _(more)_)</option>');
         break;
       }
     }
@@ -148,9 +148,8 @@ function dfm_createSource(source) {
 function dfm_showProgress(data) {
   if (!data) return 0;
 
-  // Try to parse as JSON first
   try {
-    let parsed = JSON.parse(data);
+    let parsed = data;
 
     // Handle search results (action 15 with results array)
     if (parsed.action === 15 && Array.isArray(parsed.results)) {
@@ -237,9 +236,9 @@ function dfm_showProgress(data) {
       }
 
       // Build footer text (progress info only)
-      // Show footer for actions with actual progress: delete (1,6), copy (3,8), move (4,9), search (15)
+      // Show footer for actions with actual progress: delete (1,6), copy (3,8), move (4,9), search (15), compress (16), extract (17)
       // No footer for quick operations: create (0), rename (2,7), chown (11), chmod (12)
-      let showFooter = [1, 3, 4, 6, 8, 9, 15].includes(parsed.action);
+      let showFooter = [1, 3, 4, 6, 8, 9, 15, 16, 17].includes(parsed.action);
       if (showFooter) {
         let footerText = parsed.text[1] || parsed.text[0] || '';
         dfm_footer('write', footerText, $icon);
@@ -250,8 +249,7 @@ function dfm_showProgress(data) {
 
     }
   } catch(e) {
-    // Not JSON, log error
-    console.error('Failed to parse status as JSON:', e, data);
+    console.error('dfm_showProgress: unexpected data format', e, data);
     return 0;
   }
 }
@@ -288,7 +286,9 @@ function dfm_makeDialog(open) {
   }
   dfm.window = $('#dfm_dialogWindow');
   if (dfm.window.dialog('instance') !==  undefined) dfm.dialog = dfm.window.dialog('isOpen');
-  var dfm_source = dfm_read.source.split('\r').slice(0,9);
+  // Guard against dfm_read.source being undefined (e.g. mode:'read' returned empty data
+  // due to a timing race). filter(Boolean) removes empty strings from split results.
+  var dfm_source = (dfm_read.source || '').split('\r').filter(Boolean);
   switch (dfm_read.action) {
   case 0: // create folder/object
     dfm.window.html($('#dfm_templateCreateFolder').html());
@@ -307,14 +307,14 @@ function dfm_makeDialog(open) {
     dfm.window.html($('#dfm_templateCopyFolder').html());
     dfm.window.find('#dfm_target').val(dfm_read.target).prop('disabled',true);
     dfm.window.find('#dfm_sparse').prop('checked',dfm_read.sparse ? true : false);
-    dfm.window.find('#dfm_exist').prop('checked',dfm_read.exist ? false : true);
+    dfm.window.find('#dfm_overwrite').prop('checked',dfm_read.exist ? false : true);
     dfm.height = 630;
     break;
   case 4: // move folder/object
     dfm.window.html($('#dfm_templateMoveFolder').html());
     dfm.window.find('#dfm_target').val(dfm_read.target).prop('disabled',true);
     dfm.window.find('#dfm_sparse').prop('checked',dfm_read.sparse ? true : false);
-    dfm.window.find('#dfm_exist').prop('checked',dfm_read.exist ? false : true);
+    dfm.window.find('#dfm_overwrite').prop('checked',dfm_read.exist ? false : true);
     dfm.height = 630;
     break;
   case 6: // delete file
@@ -325,14 +325,14 @@ function dfm_makeDialog(open) {
     dfm.window.html($('#dfm_templateCopyFile').html());
     dfm.window.find('#dfm_target').val(dfm_read.target).prop('disabled',true);
     dfm.window.find('#dfm_sparse').prop('checked',dfm_read.sparse ? true : false);
-    dfm.window.find('#dfm_exist').prop('checked',dfm_read.exist ? false : true);
+    dfm.window.find('#dfm_overwrite').prop('checked',dfm_read.exist ? false : true);
     dfm.height = 630;
     break;
   case 9: // move file
     dfm.window.html($('#dfm_templateMoveFile').html());
     dfm.window.find('#dfm_target').val(dfm_read.target).prop('disabled',true);
     dfm.window.find('#dfm_sparse').prop('checked',dfm_read.sparse ? true :false);
-    dfm.window.find('#dfm_exist').prop('checked',dfm_read.exist ? false : true);
+    dfm.window.find('#dfm_overwrite').prop('checked',dfm_read.exist ? false : true);
     dfm.height = 630;
     break;
   case 11: // change owner
@@ -354,13 +354,25 @@ function dfm_makeDialog(open) {
     dfm.window.find('.dfm_text').html('').css({'line-height':'normal'});
     dfm.height = 630;
     break;
+  case 16: // compress
+    dfm.window.html($('#dfm_templateCompress').html());
+    dfm.window.find('#dfm_target').val(dfm_read.target).prop('disabled',true);
+    dfm.window.find('#dfm_format').val(dfm_read.format || 'zip').prop('disabled',true);
+    dfm.window.find('#dfm_archive_name').val(dfm_read.archive_name || '').prop('disabled',true);
+    dfm.height = 630;
+    break;
+  case 17: // extract
+    dfm.window.html($('#dfm_templateExtract').html());
+    dfm.window.find('#dfm_target').val(dfm_read.target).prop('disabled',true);
+    dfm.height = 630;
+    break;
   }
   dfm.window.find('#dfm_source').attr('size',Math.min(dfm.tsize[dfm_read.action],dfm_source.length));
   dfm_createSource(dfm_source);
   dfm.window.find('#dfm_sparse').prop('disabled',true);
-  dfm.window.find('#dfm_exist').prop('disabled',true);
+  dfm.window.find('#dfm_overwrite').prop('disabled',true);
   dfm.window.find('.dfm_sparse').css({'opacity':'0.5'});
-  dfm.window.find('.dfm_exist').css({'opacity':'0.5'});
+  dfm.window.find('.dfm_overwrite').css({'opacity':'0.5'});
   dfm.window.dialog({
     classes: {'ui-dialog': 'ui-dfm'},
     autoOpen: open || dfm.dialog,
@@ -378,7 +390,7 @@ function dfm_makeDialog(open) {
           dfm.window.find('.dfm_text').html("_(Running)_...");
           dfm_footer('hide');
           dfm_fileManager('start');
-          $.post('/webGui/include/Control.php',{mode:'file',action:15,title:encodeURIComponent(dfm_read.title),source:encodeURIComponent(dfm_read.source),target:encodeURIComponent(dfm_target),hdlink:'',sparse:'',exist:'',zfs:''});
+          $.post('/webGui/include/Control.php',{mode:'file',action:15,title:encodeURIComponent(dfm_read.title),source:encodeURIComponent(dfm_read.source),target:encodeURIComponent(dfm_target),hdlink:'',sparse:'',overwrite:0,zfs:''});
         } else {
           return;
         }
@@ -416,8 +428,10 @@ nchan_filemanager.on('message', function(msg) {
     dfm_fileManager('stop');
     dfm.window.find('.dfm_text').addClass('orange-text').css('white-space', 'pre-line').text(data.error);
     dfm.window.find('#dfm_target').prop('disabled',false);
+    dfm.window.find('#dfm_format').prop('disabled',false);
+    dfm.window.find('#dfm_archive_name').prop('disabled',false);
     dfm.window.find('#dfm_sparse').prop('disabled',false);
-    dfm.window.find('#dfm_exist').prop('disabled',false);
+    dfm.window.find('#dfm_overwrite').prop('disabled',false);
     dfm.window.find('#dfm_owner').prop('disabled',false);
     dfm.window.find('#dfm_group').prop('disabled',false);
     dfm.window.find('#dfm_other').prop('disabled',false);

emhttp/plugins/dynamix/include/Control.php

@@ -185,7 +185,7 @@ function quoted($name) {return is_array($name) ? implode(' ',array_map('escape',
       }
 
       // Update popular destinations when dequeuing a job
-      if (in_array((int)($data['action'] ?? 0), [3, 4, 8, 9]) && !empty($data['target'] ?? '')) {
+      if (in_array((int)($data['action'] ?? 0), [3, 4, 8, 9, 16, 17]) && !empty($data['target'] ?? '')) {
         updatePopularDestinations($data['target']);
       }
 
@@ -241,19 +241,32 @@ function quoted($name) {return is_array($name) ? implode(' ',array_map('escape',
     'target' => rawurldecode($_POST['target'] ?? ''),
     'H' => empty($_POST['hdlink']) ? '' : 'H',
     'sparse' => empty($_POST['sparse']) ? '' : '--sparse',
-    'exist' => empty($_POST['exist']) ? '--ignore-existing' : '',
+    'overwrite' => empty($_POST['overwrite']) ? 0 : 1,
     'zfs' => rawurldecode($_POST['zfs'] ?? '')
   ];
+  // Add compress-specific parameters
+  if ($data['action'] === 16) {
+    $data['format'] = rawurldecode($_POST['format'] ?? 'zip');
+    $data['archive_name'] = rawurldecode($_POST['archive_name'] ?? '');
+  }
   if (isset($_POST['task'])) {
     // add task to queue
     $data['task'] = rawurldecode($_POST['task']);
     file_put_contents($jobs, json_encode($data)."\n", FILE_APPEND);
   } else {
     // start operation
+    // For cancel (action=99), preserve target_tmp from existing active JSON so
+    // the worker can clean up the partial compress tmp file
+    if ($data['action'] === 99 && file_exists($active)) {
+      $existing = json_decode(file_get_contents($active), true);
+      if (!empty($existing['target_tmp'])) {
+        $data['target_tmp'] = $existing['target_tmp'];
+      }
+    }
     file_put_contents($active, json_encode($data));
     // Update popular destinations only when an operation actually starts
-    // Action types: 3=copy folder, 4=move folder, 8=copy file, 9=move file
-    if (in_array((int)$data['action'], [3, 4, 8, 9]) && !empty($data['target'])) {
+    // Action types: 3=copy folder, 4=move folder, 8=copy file, 9=move file, 16=compress, 17=extract
+    if (in_array((int)$data['action'], [3, 4, 8, 9, 16, 17]) && !empty($data['target'])) {
       updatePopularDestinations($data['target']);
     }
   }

emhttp/plugins/dynamix/include/Templates.php

@@ -67,9 +67,9 @@
     <input type="checkbox" id="dfm_sparse" value="" onchange="this.value=this.checked?'1':''">
     <span class="dfm_sparse">_(Use sparse option)_</span>
   </label>
-  <label for="dfm_exist" class="inline-flex flex-wrap items-center gap-4">
-    <input type="checkbox" id="dfm_exist" value="" onchange="this.value=this.checked?'1':''">
-    <span class="dfm_exist">_(Overwrite existing files)_</span>
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing files)_</span>
   </label>
   <span class="dfm_text"></span>
 </span>
@@ -91,9 +91,9 @@
     <input type="checkbox" id="dfm_sparse" value="" onchange="this.value=this.checked?'1':''">
     <span class="dfm_sparse">_(Use sparse option)_</span>
   </label>
-  <label for="dfm_exist" class="inline-flex flex-wrap items-center gap-4">
-    <input type="checkbox" id="dfm_exist" value="" onchange="this.value=this.checked?'1':''">
-    <span class="dfm_exist">_(Overwrite existing files)_</span>
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing files)_</span>
   </label>
   <span class="dfm_text"></span>
 </span>
@@ -137,9 +137,9 @@
     <input type="checkbox" id="dfm_sparse" value="" onchange="this.value=this.checked?'1':''">
     <span class="dfm_sparse">_(Use sparse option)_</span>
   </label>
-  <label for="dfm_exist" class="inline-flex flex-wrap items-center gap-4">
-    <input type="checkbox" id="dfm_exist" value="" onchange="this.value=this.checked?'1':''">
-    <span class="dfm_exist">_(Overwrite existing files)_</span>
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing files)_</span>
   </label>
   <span class="dfm_text"></span>
 </span>
@@ -161,9 +161,9 @@
     <input type="checkbox" id="dfm_sparse" value="" onchange="this.value=this.checked?'1':''">
     <span class="dfm_sparse">_(Use sparse option)_</span>
   </label>
-  <label for="dfm_exist" class="inline-flex flex-wrap items-center gap-4">
-    <input type="checkbox" id="dfm_exist" value="" onchange="this.value=this.checked?'1':''">
-    <span class="dfm_exist">_(Overwrite existing files)_</span>
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing files)_</span>
   </label>
   <span class="dfm_text"></span>
 </span>
@@ -207,9 +207,9 @@
     <input type="checkbox" id="dfm_sparse" value="" onchange="this.value=this.checked?'1':''">
     <span class="dfm_sparse">_(Use sparse option)_</span>
   </label>
-  <label for="dfm_exist" class="inline-flex flex-wrap items-center gap-4">
-    <input type="checkbox" id="dfm_exist" value="" onchange="this.value=this.checked?'1':''">
-    <span class="dfm_exist">_(Overwrite existing files)_</span>
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing files)_</span>
   </label>
   <span class="dfm_text"></span>
 </span>
@@ -231,9 +231,9 @@
     <input type="checkbox" id="dfm_sparse" value="" onchange="this.value=this.checked?'1':''">
     <span class="dfm_sparse">_(Use sparse option)_</span>
   </label>
-  <label for="dfm_exist" class="inline-flex flex-wrap items-center gap-4">
-    <input type="checkbox" id="dfm_exist" value="" onchange="this.value=this.checked?'1':''">
-    <span class="dfm_exist">_(Overwrite existing files)_</span>
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing files)_</span>
   </label>
   <span class="dfm_text"></span>
 </span>
@@ -363,4 +363,64 @@ function getMode(file){
 </script>
 !-->
 </div>
+
+<div markdown="1" id="dfm_templateCompress">
+_(Source)_:
+: <span id="dfm_source"></span>
+
+_(Archive format)_:
+: <select id="dfm_format" onchange="updateArchiveName()">
+  <option value="zip">ZIP (_.zip_)</option>
+  <option value="tar">TAR (_.tar_)</option>
+  <option value="tar.gz">TAR.GZ (_.tar.gz_)</option>
+  <option value="tar.bz2">TAR.BZ2 (_.tar.bz2_)</option>
+  <option value="tar.xz">TAR.XZ (_.tar.xz_)</option>
+  <option value="tar.zst">TAR.ZST (_.tar.zst - recommended for appdata_)</option>
+  <option value="tar.lz4">TAR.LZ4 (_.tar.lz4_)</option>
+  <option value="gz" class="dfm_single_format">GZ (_.gz_)</option>
+  <option value="xz" class="dfm_single_format">XZ (_.xz_)</option>
+  <option value="bz2" class="dfm_single_format">BZ2 (_.bz2_)</option>
+  <option value="zst" class="dfm_single_format">ZST (_.zst_)</option>
+  <option value="lz4" class="dfm_single_format">LZ4 (_.lz4_)</option>
+</select>
+
+_(Archive name)_:
+: <input type="text" id="dfm_archive_name" autocomplete="off" spellcheck="false" value="">
+
+<wbr />
+: <span class="flex flex-col gap-4">
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing archive)_</span>
+  </label>
+
+  <span class="dfm_text"></span>
+</span>
+
+<wbr />
+: _(save to)_ ...
+
+_(Target folder)_:
+: <input type="text" id="dfm_target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickmatch="" data-pickroot="" data-picktop="">
+</div>
+
+<div markdown="1" id="dfm_templateExtract">
+_(Archive)_:
+: <span id="dfm_source"></span>
+
+<wbr />
+: <span class="flex flex-col gap-4">
+  <label for="dfm_overwrite" class="inline-flex flex-wrap items-center gap-4">
+    <input type="checkbox" id="dfm_overwrite" value="" onchange="this.value=this.checked?'1':''">
+    <span class="dfm_overwrite">_(Overwrite existing files)_</span>
+  </label>
+  <span class="dfm_text"></span>
+</span>
+
+<wbr />
+: _(extract to)_ ...
+
+_(Target folder)_:
+: <input type="text" id="dfm_target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickmatch="" data-pickroot="" data-picktop="">
+</div>
 </div>