Merge branch 'main' of https://github.com/simosathan9/blockly_unix

public/blocks/argumentBlock.js

@@ -9,7 +9,7 @@ var argumentBlock = {
       text: 'argument' // default text for the input
     }
   ],
-  extensions: ['restrict_argumentsCreate_to_argument'],
+  extensions: ['restrict_args_block'],
   output: 'String',
   style: 'Function inputs',
   tooltip: '%{BKY_ARGUMENT_TOOLTIP}',

public/blocks/lnBlock.js

@@ -54,7 +54,27 @@ var lnBlock = {
   ],
   style: 'Filesystem Operations',
   tooltip: '%{BKY_LN_TOOLTIP}',
-  helpUrl: 'https://linux.die.net/man/1/ln'
+  helpUrl: 'https://linux.die.net/man/1/ln',
+  generateCommand: function (block) {
+    let lnCommand = 'ln ';
+    const symbolic = block.getFieldValue('symbolic') === 'TRUE';
+    const force = block.getFieldValue('force') === 'TRUE';
+    const interactive = block.getFieldValue('interactive') === 'TRUE';
+
+    if (symbolic) lnCommand += ' -s ';
+    if (force) lnCommand += ' -f ';
+    if (interactive) lnCommand += ' -i ';
+
+    const sourceArgsBlock = block.getInputTargetBlock('SOURCE');
+    const targetArgsBlock = block.getInputTargetBlock('TARGET');
+    lnCommand +=
+      handleArgumentsBlocks(sourceArgsBlock) +
+      ' ' +
+      handleArgumentsBlocks(targetArgsBlock);
+
+    generatedCommand = lnCommand;
+    return generatedCommand;
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([lnBlock]);

public/blocks/mvBlock.js

@@ -48,7 +48,34 @@ var mvBlock = {
   ],
   style: 'Filesystem Operations',
   tooltip: 'Μετακινεί ή μετονομάζει αρχεία.',
-  helpUrl: 'https://linux.die.net/man/1/mv'
+  helpUrl: 'https://linux.die.net/man/1/mv',
+
+  generateCommand: function (block) {
+    let mvCommand = 'mv '; // Start the mv command
+
+    // Handle options
+    const notPromptConfirmation =
+      block.getFieldValue('not_prompt_confirmation') === 'TRUE';
+    const promptConfirmation =
+      block.getFieldValue('prompt_confirmation') === 'TRUE';
+    const notOverwrite = block.getFieldValue('not_overwrite') === 'TRUE';
+
+    if (notPromptConfirmation) mvCommand += '-f '; // Add -f for no prompt
+    if (promptConfirmation) mvCommand += '-i '; // Add -i for prompt
+    if (notOverwrite) mvCommand += '-n '; // Add -n for no overwrite
+
+    // Get source and destination blocks
+    const sourceArgsBlock = block.getInputTargetBlock('SOURCE');
+    const targetArgsBlock = block.getInputTargetBlock('DEST');
+
+    // Append arguments (source and destination paths)
+    mvCommand +=
+      handleArgumentsBlocks(sourceArgsBlock) +
+      ' ' +
+      handleArgumentsBlocks(targetArgsBlock);
+
+    return mvCommand; // Return the generated mv command
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([mvBlock]);

public/blocks/rmBlock.js

@@ -53,7 +53,27 @@ var rmBlock = {
   extensions: [],
   style: 'Filesystem Operations',
   tooltip: '%{BKY_RM_TOOLTIP}',
-  helpUrl: 'https://linux.die.net/man/1/rm'
+  helpUrl: 'https://linux.die.net/man/1/rm',
+
+  generateCommand: function (block) {
+    let rmCommand = 'rm ';
+    const force = block.getFieldValue('force') === 'TRUE';
+    const requestConfirmation =
+      block.getFieldValue('request_confirmation') === 'TRUE';
+    const removeDirectory = block.getFieldValue('remove_directory') === 'TRUE';
+    const recursive = block.getFieldValue('recursive') === 'TRUE';
+
+    if (force) rmCommand += '-f ';
+    if (requestConfirmation) rmCommand += '-i ';
+    if (removeDirectory) rmCommand += '-d ';
+    if (recursive) rmCommand += '-R ';
+
+    const argumentBlock = block.getInputTargetBlock('ARGUMENT');
+    rmCommand += ' ' + handleArgumentsBlocks(argumentBlock);
+
+    generatedCommand = rmCommand;
+    return generatedCommand;
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([rmBlock]);

public/blocks/sedBlock.js

@@ -47,7 +47,40 @@ var sedBlock = {
   previousStatement: 'Action',
   nextStatement: 'Action',
   tooltip: '%{BKY_SED_TOOLTIP}',
-  helpUrl: '%{BKY_SED_HELPURL}' // URL to further information or documentation.
+  helpUrl: '%{BKY_SED_HELPURL}', // URL to further information or documentation.
+  generateCommand: function (block) {
+    let sedCommand = handleBlock(block); // Basic sed command
+
+    // Handle pattern and replacement
+    let patternBlock = block.getInputTargetBlock('regPattern');
+    let replacementText = block.getFieldValue('regReplaceText');
+
+    if (!patternBlock) {
+      console.error('Pattern block is missing');
+      return '';
+    }
+
+    let pattern = patternBlock.getFieldValue('regPattern');
+    if (typeof replacementText === 'undefined' || replacementText === '') {
+      console.error('Replacement text is missing or empty');
+      return '';
+    }
+
+    // Escape slashes in pattern and replacement
+    pattern = pattern.replace(/\//g, '\\/');
+    replacementText = replacementText.replace(/\//g, '\\/');
+    const hasGlobalFlag = block.getFieldValue('globally') === 'TRUE';
+
+    sedCommand = `sed -E 's/${pattern}/${replacementText}/${hasGlobalFlag ? 'g' : ''}'`;
+
+    let previousBlock = block.getPreviousBlock();
+    if (previousBlock && previousBlock.type === 'filenamesCreate') {
+      const filenames = handleFilenamesBlocks(previousBlock);
+      sedCommand += ` ${filenames}`;
+    }
+
+    generatedCommand = sedCommand;
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([sedBlock]);

public/blocks/touchBlock.js

@@ -58,7 +58,29 @@ var touchBlock = {
   extensions: ['validate_touch_time_d', 'restrict_touch_to_argumentsCreate'],
   style: 'Filesystem Operations',
   tooltip: '%{BKY_TOUCH_TOOLTIP}',
-  helpUrl: '%{BKY_TOUCH_HELPURL}' // URL to further information or documentation.
+  helpUrl: '%{BKY_TOUCH_HELPURL}', // URL to further information or documentation.
+  generateCommand: function (block) {
+    let touchCommand = 'touch'; // Start with the basic touch command
+
+    // Check each option and append to the command if selected
+    const notCreateFile = block.getFieldValue('not_create_file') === 'TRUE';
+    const changeAccessTime = block.getFieldValue('access_time') === 'TRUE';
+    const changeModificationTime =
+      block.getFieldValue('modification_time') === 'TRUE';
+    const rawTimestamp = block.getFieldValue('change_time_d');
+    const argumentBlock = block.getInputTargetBlock('argument');
+
+    if (notCreateFile) touchCommand += ' -c';
+    if (changeAccessTime) touchCommand += ' -a';
+    if (changeModificationTime) touchCommand += ' -m';
+    if (rawTimestamp) {
+      const formattedTimestamp = rawTimestamp.replace(' ', 'T');
+      touchCommand += ` -d ${formattedTimestamp}`;
+    }
+    generatedCommand =
+      touchCommand + ' ' + handleArgumentsBlocks(argumentBlock);
+    return generatedCommand;
+  }
 };
 
 Blockly.defineBlocksWithJsonArray([touchBlock]);