cmdbox 0.5.1.1__tar.gz → 0.5.1.2__tar.gz

{cmdbox-0.5.1.1/cmdbox.egg-info → cmdbox-0.5.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.1.1
+Version: 0.5.1.2
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Author: hamacom2004jp

{cmdbox-0.5.1.1 → cmdbox-0.5.1.2}/cmdbox/version.py

@@ -3,7 +3,7 @@ import datetime
 dt_now = datetime.datetime(2025, 3, 27)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.5.1.1'
+__version__ = '0.5.1.2'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

{cmdbox-0.5.1.1 → cmdbox-0.5.1.2}/cmdbox/web/assets/cmdbox/list_cmd.js

@@ -15,7 +15,14 @@ const list_cmd_func = async () => {
         }
         elem.find('.cmd_title').text(row.title);
         elem.find('.cmd_mode').text(row.mode);
-        elem.find('.cmd_cmd').text(row.cmd)
+        elem.find('.cmd_cmd').text(row.cmd);
+        const tags_elem = elem.find('.cmd_tags');
+        if (row.tag && Array.isArray(row.tag)) {
+            row.tag.forEach(tag => {
+                if (tag=='') return;
+                tags_elem.append(`<span class="badge text-bg-secondary me-1"><svg class="bi bi-svg_tag" width="16" height="16" fill="currentColor"><use href="#svg_tag"></use></svg>${tag}</span>`);
+            });
+        }
         if (row.tag && Array.isArray(row.tag)) {
             const tags = new Set([...row.tag]);
             elem.find('.cmd_card').attr('data-tags', Array.from(tags).join(','));
@@ -24,49 +31,89 @@ const list_cmd_func = async () => {
     };
     py_list_cmd.forEach(row => {card_func(row, true)});
     py_list_cmd.forEach(row => {card_func(row, false)});
-    $('#cmd_item_tags').html('');
+    const cmd_item_tags = $('#cmd_item_tags').html('');
+    const tag_bot_click = (e) => {
+        const ct = $(e.currentTarget);
+        const cmd_items = $('#cmd_items').find('.cmd_card:not(.cmd_add)');
+        const andor_sw = ct.hasClass('andor_switch');
+        const and_val = $('#andor_switch').prop('checked');
+        // 選択中のボタンの場合は解除中にする
+        if (!andor_sw && ct.hasClass('btn-secondary')) {
+            ct.removeClass('btn-secondary');
+            ct.addClass('btn-outline-secondary');
+        }
+        // 解除中のボタンの場合は選択中にする
+        else if (!andor_sw && ct.hasClass('btn-outline-secondary')) {
+            ct.removeClass('btn-outline-secondary');
+            ct.addClass('btn-secondary');
+        }
+        // 選択中のタグを取得
+        const tags = new Set();
+        cmd_item_tags.find('.btn-tag').each((i, elem) => {
+            if ($(elem).hasClass('btn-secondary')) tags.add($(elem).attr('data-tag'));
+        });
+        // タグ無しボタンが選択された場合
+        if (ct.hasClass('btn_notag') && ct.hasClass('btn-secondary')) {
+            cmd_item_tags.find('.btn-tag').removeClass('btn-secondary').addClass('btn-outline-secondary');
+            cmd_items.parent().hide();
+            cmd_items.each((i, elem) => {
+                const el = $(elem);
+                const itags = el.attr('data-tags');
+                if (itags) return;
+                el.parent().show();
+            });
+            return;
+        }
+        // notagボタンの選択を解除
+        if (!andor_sw) $('#btn_notag').removeClass('btn-secondary').addClass('btn-outline-secondary');
+        // タグがない場合は全て表示
+        if (tags.size == 0) {
+            cmd_items.parent().show();
+            return;
+        }
+        // タグがある場合はタグに一致するものだけ表示
+        cmd_items.parent().hide();
+        cmd_items.each((i, elem) => {
+            const el = $(elem);
+            // andorチェックされている場合はすべてのタグを含むものを表示
+            if (and_val) {
+                const itags = el.attr('data-tags');
+                if (!itags) return;
+                const etags = itags.split(',');
+                if (etags.filter(tag => tags.has(tag)).length == tags.size) el.parent().show();
+                return;
+            }
+            // andorチェックされていない場合はいずれかのタグを含むものを表示
+            tags.forEach(tag => {
+                const itags = el.attr('data-tags');
+                if (!itags) return;
+                else if (itags.split(',').includes(tag)) el.parent().show();
+            });
+        });
+    };
+    // タグボタンを追加
     py_list_cmd.forEach(row => {
         if (!row.tag || !Array.isArray(row.tag)) return;
-        const cmd_item_tags = $('#cmd_item_tags');
         row.tag.forEach(tag => {
             if (tag=='') return;
             if (cmd_item_tags.find(`[data-tag="${tag}"]`).length > 0) return;
             const elem = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn-tag me-2">${tag}</button>`);
             elem.attr('data-tag', tag);
             elem.text(tag);
-            elem.click((e) => {
-                const ct = $(e.currentTarget);
-                const cmd_items = $('#cmd_items').find('.cmd_card:not(.cmd_add)');
-                if (ct.hasClass('btn-secondary')) {
-                    ct.removeClass('btn-secondary');
-                    ct.addClass('btn-outline-secondary');
-                }
-                else if (ct.hasClass('btn-outline-secondary')) {
-                    ct.removeClass('btn-outline-secondary');
-                    ct.addClass('btn-secondary');
-                }
-                const tags = new Set();
-                cmd_item_tags.find('.btn-tag').each((i, elem) => {
-                    if ($(elem).hasClass('btn-secondary')) tags.add($(elem).attr('data-tag'));
-                });
-                if (tags.size == 0) {
-                    cmd_items.parent().show();
-                    return;
-                }
-                cmd_items.parent().hide();
-                tags.forEach(tag => {
-                    cmd_items.each((i, elem) => {
-                        const el = $(elem);
-                        const itags = el.attr('data-tags');
-                        if (!itags) return;
-                        else if (itags.split(',').includes(tag)) el.parent().show();
-                    });
-                });
-            });
+            elem.click(tag_bot_click);
             cmd_item_tags.append(elem);
         });
-        
     });
+    // タグ未選択ボタンを追加
+    const noselect_bot = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn_notag me-2" id="btn_notag">no tag</button>`);
+    noselect_bot.click(tag_bot_click);
+    cmd_item_tags.append(noselect_bot);
+    // and/orスイッチを追加
+    const andor_bot = $(`<div class="form-check form-switch text-secondary d-inline-block"/>`);
+    andor_bot.append('<input class="form-check-input andor_switch" type="checkbox" id="andor_switch">');
+    andor_bot.append('<label class="form-check-label" for="andor_switch">or / and</label>');
+    andor_bot.find('#andor_switch').click(tag_bot_click);
+    cmd_item_tags.append(andor_bot);
 }
 // コマンドファイルの取得が出来た時の処理
 const list_cmd_func_then = () => {

{cmdbox-0.5.1.1 → cmdbox-0.5.1.2}/cmdbox/web/assets/cmdbox/list_pipe.js

@@ -45,7 +45,8 @@ list_pipe_func_then = () => {
                 const option = $('<option></option>');
                 pipe_cmd_select.append(option);
                 option.attr('value', cmd['title']);
-                option.text(`${cmd['title']}(mode=${cmd['mode']}, cmd=${cmd['cmd']})`);
+                const tag = cmd['tag'] ? `, tag=${cmd['tag']}` : '';
+                option.text(`${cmd['title']}(mode=${cmd['mode']}, cmd=${cmd['cmd']}${tag})`);
             });
             cmd_select_template.find('.add_buton').click((e) => {
                 cmd_select_template_func($(e.currentTarget), py_list_cmd);

{cmdbox-0.5.1.1 → cmdbox-0.5.1.2}/cmdbox/web/gui.html

@@ -51,6 +51,10 @@
         <symbol id="svg_magic_btn" viewBox="0 0 16 16">
             <path d="M9.5 2.672a.5.5 0 1 0 1 0V.843a.5.5 0 0 0-1 0zm4.5.035A.5.5 0 0 0 13.293 2L12 3.293a.5.5 0 1 0 .707.707zM7.293 4A.5.5 0 1 0 8 3.293L6.707 2A.5.5 0 0 0 6 2.707zm-.621 2.5a.5.5 0 1 0 0-1H4.843a.5.5 0 1 0 0 1zm8.485 0a.5.5 0 1 0 0-1h-1.829a.5.5 0 0 0 0 1zM13.293 10A.5.5 0 1 0 14 9.293L12.707 8a.5.5 0 1 0-.707.707zM9.5 11.157a.5.5 0 0 0 1 0V9.328a.5.5 0 0 0-1 0zm1.854-5.097a.5.5 0 0 0 0-.706l-.708-.708a.5.5 0 0 0-.707 0L8.646 5.94a.5.5 0 0 0 0 .707l.708.708a.5.5 0 0 0 .707 0l1.293-1.293Zm-3 3a.5.5 0 0 0 0-.706l-.708-.708a.5.5 0 0 0-.707 0L.646 13.94a.5.5 0 0 0 0 .707l.708.708a.5.5 0 0 0 .707 0z"/>
         </symbol>
+        <symbol id="svg_tag" viewBox="0 0 16 16">
+            <path d="M6 4.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m-1 0a.5.5 0 1 0-1 0 .5.5 0 0 0 1 0"/>
+            <path d="M2 1h4.586a1 1 0 0 1 .707.293l7 7a1 1 0 0 1 0 1.414l-4.586 4.586a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 1 6.586V2a1 1 0 0 1 1-1m0 5.586 7 7L13.586 9l-7-7H2z"/>
+        </symbol>
     </svg>
     <!-- ナビゲーションバー -->
     <nav class="navbar navbar-expand-sm fixed-top p-2">
@@ -133,7 +137,8 @@
                             <div class="d-flex">
                                 <h5 class="cmd_title card-title d-inline-block">Card title</h5>
                             </div>
-                            <h6 class="card-subtitle mb-2 text-muted">mode:<span class="cmd_mode"></span>, cmd:<span class="cmd_cmd"></span></h6>
+                            <h6 class="card-subtitle mb-2">mode:<span class="cmd_mode"></span>, cmd:<span class="cmd_cmd"></span></h6>
+                            <h6 class="card-subtitle text-end"><span class="cmd_tags text-secondary"></span></h6>
                         </div>
                     </div>
                 </div>

{cmdbox-0.5.1.1 → cmdbox-0.5.1.2/cmdbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.1.1
+Version: 0.5.1.2
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Author: hamacom2004jp