MoleditPy 2.3.0__py3-none-any.whl → 2.3.2__py3-none-any.whl

moleditpy/modules/constants.py

@@ -16,7 +16,7 @@ from PyQt6.QtGui import QFont, QColor
 from rdkit import Chem
 
 #Version
-VERSION = '2.3.0'
+VERSION = '2.3.2'
 
 ATOM_RADIUS = 18
 BOND_OFFSET = 3.5

moleditpy/modules/main_window_main_init.py

@@ -1452,18 +1452,22 @@ class MainWindowMainInit(object):
         # 1. Custom Plugin Openers
         # 1. Custom Plugin Openers
         if ext_with_dot in self.plugin_manager.file_openers:
-            opener = self.plugin_manager.file_openers[ext_with_dot]
-            try:
-                opener['callback'](file_path)
-                self.current_file_path = file_path
-                self.update_window_title()
-                return
-            except Exception as e:
-                print(f"Plugin opener failed: {e}")
-                QMessageBox.warning(self, "Plugin Error", f"Error opening file with plugin '{opener.get('plugin', 'Unknown')}':\n{e}")
-                # Fallback to standard logic if plugin fails? Or stop?
-                # Generally if a plugin claims it, we stop. But here we let it fall through if it errors?
-                # Let's simple check next.
+            openers = self.plugin_manager.file_openers[ext_with_dot]
+            # Iterate through openers (already sorted by priority)
+            for opener_info in openers:
+                try:
+                    callback = opener_info['callback']
+                    # Try to call the opener
+                    callback(file_path)
+                    
+                    self.current_file_path = file_path
+                    self.update_window_title()
+                    return # Success
+                except Exception as e:
+                    print(f"Plugin opener failed for '{opener_info.get('plugin', 'Unknown')}': {e}")
+                    # If this opener fails, try the next one or fall through to default
+                    continue
+        
         
         if file_ext in ['mol', 'sdf']:
             self.load_mol_file_for_3d_viewing(file_path)
@@ -1969,7 +1973,6 @@ class MainWindowMainInit(object):
                      a.setData(PLUGIN_ACTION_TAG)
                      menu.addAction(a)
 
-        # 5. Integrate File Openers into Import Menu
         # 5. Integrate File Openers into Import Menu
         if hasattr(self, 'import_menu') and self.plugin_manager.file_openers:
              # Add separator 
@@ -1978,16 +1981,32 @@ class MainWindowMainInit(object):
              
              # Group by Plugin Name
              plugin_map = {}
-             for ext, info in self.plugin_manager.file_openers.items():
-                 p_name = info.get('plugin', 'Plugin')
-                 if p_name not in plugin_map:
-                     plugin_map[p_name] = {}
-                 plugin_map[p_name][ext] = info['callback']
+             for ext, openers_list in self.plugin_manager.file_openers.items():
+                 # Handles potential multiple openers for same extension
+                 for info in openers_list:
+                     p_name = info.get('plugin', 'Plugin')
+                     if p_name not in plugin_map:
+                         plugin_map[p_name] = {}
+                     # We can only register one callback per plugin per extension in the menu for now.
+                     # Since we process them, let's just take the one present (if a plugin registers multiple openers for same ext - weird but ok)
+                     plugin_map[p_name][ext] = info['callback']
             
-             for p_name, ext_map in plugin_map.items():
+             for p_name, ext_map in sorted(plugin_map.items()):
                  # Create combined label: "Import .ext1/.ext2 (PluginName)..."
                  extensions = sorted(ext_map.keys())
                  ext_str = "/".join(extensions)
+                 
+                 # TRUNCATION LOGIC
+                 MAX_EXT_LEN = 30
+                 if len(ext_str) > MAX_EXT_LEN:
+                     # Find last slash within limit
+                     cutoff = ext_str.rfind('/', 0, MAX_EXT_LEN)
+                     if cutoff != -1:
+                        ext_str = ext_str[:cutoff] + "/..."
+                     else:
+                        # Fallback if first extension is super long (unlikely but safe)
+                        ext_str = ext_str[:MAX_EXT_LEN] + "..."
+                     
                  label = f"Import {ext_str} ({p_name})..."
                  
                  # Create combined filter: "PluginName Files (*.ext1 *.ext2)"

moleditpy/modules/main_window_ui_manager.py

@@ -313,12 +313,8 @@ class MainWindowUiManager(object):
                             event.acceptProposedAction()
                             return
                         
-                        # Plugin-registered file openers
-                        if self.plugin_manager and hasattr(self.plugin_manager, 'file_openers'):
-                            for ext in self.plugin_manager.file_openers.keys():
-                                if file_lower.endswith(ext):
-                                    event.acceptProposedAction()
-                                    return
+                        # 2. Plugin drop handlers (Drop専用ハンドラ)
+                        # プラグインが「Dropを受け入れる」と明示している場合のみ許可
                         
                         # Plugin drop handlers (accept more liberally for custom logic)
                         # A plugin drop handler might handle it, so accept

moleditpy/modules/plugin_interface.py

@@ -104,7 +104,7 @@ class PluginContext:
         """
         self._manager.register_optimization_method(self._plugin_name, method_name, callback)
 
-    def register_file_opener(self, extension: str, callback: Callable[[str], None]):
+    def register_file_opener(self, extension: str, callback: Callable[[str], None], priority: int = 0):
         """
         Register a handler for opening a specific file extension.
         
@@ -112,19 +112,11 @@ class PluginContext:
             extension: File extension including dot, e.g. ".xyz".
             callback: Function taking (file_path) -> None.
                       Should load the file into the main window.
+            priority: Higher priority handlers are tried first (default 0).
         """
-        self._manager.register_file_opener(self._plugin_name, extension, callback)
+        self._manager.register_file_opener(self._plugin_name, extension, callback, priority)
+
 
-    def register_file_opener(self, extension: str, callback: Callable[[str], None]):
-        """
-        Register a handler for opening a specific file extension.
-        
-        Args:
-            extension: File extension including dot, e.g. ".xyz".
-            callback: Function taking (file_path) -> None.
-                      Should load the file into the main window.
-        """
-        self._manager.register_file_opener(self._plugin_name, extension, callback)
 
     def add_analysis_tool(self, label: str, callback: Callable):
         """

moleditpy/modules/plugin_manager.py

@@ -46,7 +46,7 @@ class PluginManager:
         # Extended Registries (Added to prevent lazy initialization "monkey patching")
         self.export_actions = [] 
         self.optimization_methods = {}
-        self.file_openers = {}
+        self.file_openers = {} # ext -> list of {'plugin':..., 'callback':..., 'priority':...}
         self.analysis_tools = []
         self.save_handlers = {}
         self.load_handlers = {}
@@ -149,7 +149,6 @@ class PluginManager:
                 dest_path = os.path.join(self.plugin_dir, filename)
                 if os.path.exists(dest_path):
                     if os.path.isdir(dest_path):
-                        import shutil
                         shutil.rmtree(dest_path)
                 shutil.copy2(file_path, dest_path)
                 msg = f"Installed {filename}"
@@ -346,14 +345,23 @@ class PluginManager:
             'plugin': plugin_name, 'callback': callback, 'label': method_name
         }
 
-    def register_file_opener(self, plugin_name, extension, callback):
+    def register_file_opener(self, plugin_name, extension, callback, priority=0):
         # Normalize extension to lowercase
         ext = extension.lower()
         if not ext.startswith('.'):
             ext = '.' + ext
-        self.file_openers[ext] = {
-            'plugin': plugin_name, 'callback': callback
-        }
+            
+        if ext not in self.file_openers:
+            self.file_openers[ext] = []
+            
+        self.file_openers[ext].append({
+            'plugin': plugin_name, 
+            'callback': callback,
+            'priority': priority
+        })
+        
+        # Sort by priority descending
+        self.file_openers[ext].sort(key=lambda x: x['priority'], reverse=True)
 
     # Analysis Tools registration
     def register_analysis_tool(self, plugin_name, label, callback):

{moleditpy-2.3.0.dist-info → moleditpy-2.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy
-Version: 2.3.0
+Version: 2.3.2
 Summary: A cross-platform, simple, and intuitive molecular structure editor built in Python. It allows 2D molecular drawing and 3D structure visualization. It supports exporting structure files for input to DFT calculation software.
 Author-email: HiroYokoyama <titech.yoko.hiro@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{moleditpy-2.3.0.dist-info → moleditpy-2.3.2.dist-info}/RECORD

@@ -12,7 +12,7 @@ moleditpy/modules/bond_item.py,sha256=eVkEeKvM4igYI67DYxpey3FllqDyt_iWDo4VPYMhaP
 moleditpy/modules/bond_length_dialog.py,sha256=6bFPGssnqlgINuqpxLv-OhjMH3_hspnaH8QtorAyu2M,14782
 moleditpy/modules/calculation_worker.py,sha256=KiGQY7i-QCQofEoE0r65KoQgpEGFcbhmxWv6egfkUdc,42324
 moleditpy/modules/color_settings_dialog.py,sha256=Ow44BhCOLo0AFb6klO001k6B4drOgKX9DeNBQhZLp5o,15474
-moleditpy/modules/constants.py,sha256=J9rIFaD6tWxdMBzGcaYWovarEJy72gXD784k9WVahr8,4702
+moleditpy/modules/constants.py,sha256=wUyC8vBN2vsqgv6G_qfzdsCX3tOihY0xDCGYB9_B1O0,4702
 moleditpy/modules/constrained_optimization_dialog.py,sha256=REsk4ePsqNmAGPMTS_jckeM7jexrU3krwun8sKqKUCs,30062
 moleditpy/modules/custom_interactor_style.py,sha256=LDNODMJoNHGe1AUSrvqv6PdeJm-hpPmSpWINppnJLt0,38942
 moleditpy/modules/custom_qt_interactor.py,sha256=vCZsDfRO-FtphD5cTP7Ps-5rpHZMIGloaoe6EaKzrsw,4139
@@ -25,11 +25,11 @@ moleditpy/modules/main_window_dialog_manager.py,sha256=QR96LqHAPSOShXbc9cK-Ffq8a
 moleditpy/modules/main_window_edit_3d.py,sha256=CUArB5wcsgq1C7LygAEC6URlbnn4RhRYDa5n-Y-etWI,19731
 moleditpy/modules/main_window_edit_actions.py,sha256=yEc0Nw-VpN0P4e4neUu7pDuUHPGEcu6eFmwWFrSBIQ8,64815
 moleditpy/modules/main_window_export.py,sha256=dSVfylsybDDboDuXU9Inotf6YkrKJwgBTqGYSfq1lRE,38241
-moleditpy/modules/main_window_main_init.py,sha256=BChZuyXgWfOTFqAM1OUukFgtL5KLusW4t29GnfCN1QE,92018
+moleditpy/modules/main_window_main_init.py,sha256=flZEzOH29Z6pplOqku51RMxgKT_QJzsjQK_EheDvjQo,93007
 moleditpy/modules/main_window_molecular_parsers.py,sha256=KR6vzuqc3nutOcorpYr0QOyX3MFBcxTwDhZX96VgJ9Q,48291
 moleditpy/modules/main_window_project_io.py,sha256=TWwtuKDuvgcvPZ9IGmW8r1EJJOrgxrIJRnxe_f4C1oM,17149
 moleditpy/modules/main_window_string_importers.py,sha256=v47wOd4RtjKYcF-aLP-mogGGdYTpTEo3dDyAu79_5MM,10782
-moleditpy/modules/main_window_ui_manager.py,sha256=HofI6T9EvcSSzPbsdPqkYEEDoB6Hui1Uj2Ll-wwczGA,24016
+moleditpy/modules/main_window_ui_manager.py,sha256=A-MBoZOq5xHD_Dg9F2BSbBgeWZBY9wDq_7zHacJjKRA,23796
 moleditpy/modules/main_window_view_3d.py,sha256=CxZxyJHl2isF7KtyVWSI9f8LVbvdZM5H9Gnhm_8ovBM,74227
 moleditpy/modules/main_window_view_loaders.py,sha256=gklTMo27QnyJ8Gd0ampPdbm9d0Gi-oHWkIqQuGADHmI,14352
 moleditpy/modules/mirror_dialog.py,sha256=c3v4qY6R4FAljzk4EPaDjL9ZdZMjLQSFLqDMXz2fBUk,4696
@@ -38,8 +38,8 @@ moleditpy/modules/molecule_scene.py,sha256=khdt7h9Mk_D1cMbYeHGtq7P9aFXo0xG-hcShU
 moleditpy/modules/move_group_dialog.py,sha256=Fyuy3Uq1KsFsk9qR96r_FxPbAM_-zSfW2dsMQGv7btc,27276
 moleditpy/modules/periodic_table_dialog.py,sha256=ItEZUts1XCietz9paY-spvbzxh6SXak3GnikwqkHZCw,4006
 moleditpy/modules/planarize_dialog.py,sha256=eaqI1MpF35e-VUMpJATt-EtGG5FhcSUlbAenUaFGabY,8593
-moleditpy/modules/plugin_interface.py,sha256=srzPZ3a_aRTx28NAvWNKRVUDYQNfQOTcjzx-5YW2Pb4,8164
-moleditpy/modules/plugin_manager.py,sha256=nb106AfUAnAVyp4LYFmLhKzFY4taeteH8gY5SNf1h1I,20037
+moleditpy/modules/plugin_interface.py,sha256=8_keZsQ6pZEVuEviHXZWlLFs8Yt6J83mwApbX1YL7P0,7791
+moleditpy/modules/plugin_manager.py,sha256=4lXv9stNiiqgY2FRdNDzB41jLcOfc0VzAIF88eMYWlY,20369
 moleditpy/modules/plugin_manager_window.py,sha256=b4kEv0DaWHZG76ZaFTOxn6CVtA62_0MpPYYr10ehCtA,12544
 moleditpy/modules/settings_dialog.py,sha256=Nr7yE8UmYRi3VObWvRlrnv0DnjSjmYXbvqryZ02O12k,65348
 moleditpy/modules/template_preview_item.py,sha256=djdq3tz73d_fJGOvai3E-V9Hk9q9ZW7skx7BV59mooA,6556
@@ -51,9 +51,9 @@ moleditpy/modules/assets/file_icon.ico,sha256=yyVj084A7HuMNbV073cE_Ag3Ne405qgOP3
 moleditpy/modules/assets/icon.icns,sha256=wD5R6-Vw7K662tVKhu2E1ImN0oUuyAP4youesEQsn9c,139863
 moleditpy/modules/assets/icon.ico,sha256=RfgFcx7-dHY_2STdsOQCQziY5SNhDr3gPnjO6jzEDPI,147975
 moleditpy/modules/assets/icon.png,sha256=kCFN1WacYIdy0GN6SFEbNA00ef39pCczBnFdkkBI8Bs,147110
-moleditpy-2.3.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-moleditpy-2.3.0.dist-info/METADATA,sha256=KMJCk7r-QqD1yc1YHvb-EoQ65q5Xgfa9gvuO0sSmzEw,60629
-moleditpy-2.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moleditpy-2.3.0.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
-moleditpy-2.3.0.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
-moleditpy-2.3.0.dist-info/RECORD,,
+moleditpy-2.3.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+moleditpy-2.3.2.dist-info/METADATA,sha256=tEoGUryE-8GZy8pp44lJg1ClxwIywx5xmo9tNEq-tmw,60629
+moleditpy-2.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moleditpy-2.3.2.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
+moleditpy-2.3.2.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
+moleditpy-2.3.2.dist-info/RECORD,,