Merge pull request #59 from deathaxe/develop

math2001 · web-flow · commit 2a8a4bfedd3a · 2020-01-18T11:42:11.000+11:00
Update package structure
diff --git a/FileManager.py b/FileManager.py
@@ -1,25 +1,25 @@
 # -*- encoding: utf-8 -*-
-import sublime
-import sublime_plugin
 import os
-
 import imp
 import sys
 
-from .sublimefunctions import *
-from .FMcommands.copy import FmCopyCommand
-from .FMcommands.create import FmCreaterCommand, FmCreateCommand
-from .FMcommands.create_from_selection import FmCreateFileFromSelectionCommand
-from .FMcommands.delete import FmDeleteCommand
-from .FMcommands.duplicate import FmDuplicateCommand
-from .FMcommands.editto import FmEditToTheLeftCommand, FmEditToTheRightCommand
-from .FMcommands.find_in_files import FmFindInFilesCommand
-from .FMcommands.move import FmMoveCommand
-from .FMcommands.open_in_explorer import FmOpenInExplorerCommand
-from .FMcommands.open_in_browser import FmOpenInBrowserCommand
-from .FMcommands.open_terminal import FmOpenTerminalCommand
-from .FMcommands.rename import FmRenameCommand
-from .FMcommands.open_all import FmOpenAllCommand
+import sublime
+import sublime_plugin
+
+from .libs.sublimefunctions import *
+from .commands.copy import FmCopyCommand
+from .commands.create import FmCreaterCommand, FmCreateCommand
+from .commands.create_from_selection import FmCreateFileFromSelectionCommand
+from .commands.delete import FmDeleteCommand
+from .commands.duplicate import FmDuplicateCommand
+from .commands.editto import FmEditToTheLeftCommand, FmEditToTheRightCommand
+from .commands.find_in_files import FmFindInFilesCommand
+from .commands.move import FmMoveCommand
+from .commands.open_all import FmOpenAllCommand
+from .commands.open_in_browser import FmOpenInBrowserCommand
+from .commands.open_in_explorer import FmOpenInExplorerCommand
+from .commands.open_terminal import FmOpenTerminalCommand
+from .commands.rename import FmRenameCommand
 
 BASE_NAME = os.path.dirname(__file__)
 
diff --git a/commands/__init__.py b/commands/__init__.py
diff --git a/commands/appcommand.py b/commands/appcommand.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 import sublime_plugin
-from ..sublimefunctions import get_settings, to_snake_case
+from ..libs.sublimefunctions import get_settings, to_snake_case
 
 
 class AppCommand(sublime_plugin.ApplicationCommand):
diff --git a/commands/copy.py b/commands/copy.py
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/create.py b/commands/create.py
@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 import os.path
-from ..sublimefunctions import *
+from ..libs.input_for_path import InputForPath
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
-from ..input_for_path import InputForPath
 
 
 class FmCreaterCommand(AppCommand):
diff --git a/commands/create_from_selection.py b/commands/create_from_selection.py
@@ -1,9 +1,11 @@
 # -*- encoding: utf-8 -*-
-import sublime
-import sublime_plugin
 import os
 from re import compile as re_comp
-from ..sublimefunctions import *
+
+import sublime
+import sublime_plugin
+
+from ..libs.sublimefunctions import *
 
 """ This command has been inspired at 90% by the open_url_context command
 AND the vintage open_file_under_selection. Thanks John!"""
diff --git a/commands/delete.py b/commands/delete.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
+from ..libs.send2trash import send2trash
 from .appcommand import AppCommand
-from ..send2trash import send2trash
 
 
 class FmDeleteCommand(AppCommand):
diff --git a/commands/duplicate.py b/commands/duplicate.py
@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
 import shutil
-from ..sublimefunctions import *
-from ..input_for_path import InputForPath
+from ..libs.input_for_path import InputForPath
+from ..libs.sublimefunctions import *
+from ..libs.send2trash import send2trash
 from .appcommand import AppCommand
-from ..send2trash import send2trash
 
 
 class FmDuplicateCommand(AppCommand):
diff --git a/commands/editto.py b/commands/editto.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/find_in_files.py b/commands/find_in_files.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/move.py b/commands/move.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-from ..sublimefunctions import *
-from ..input_for_path import InputForPath
+from ..libs.input_for_path import InputForPath
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/open_all.py b/commands/open_all.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/open_in_browser.py b/commands/open_in_browser.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/open_in_explorer.py b/commands/open_in_explorer.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/open_terminal.py b/commands/open_terminal.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 import subprocess
-from ..sublimefunctions import *
+from ..libs.sublimefunctions import *
 from .appcommand import AppCommand
 
 
diff --git a/commands/rename.py b/commands/rename.py
@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
 import uuid
-from ..send2trash import send2trash
-from ..sublimefunctions import *
+from ..libs.input_for_path import InputForPath
+from ..libs.sublimefunctions import *
+from ..libs.send2trash import send2trash
 from .appcommand import AppCommand
-from ..input_for_path import InputForPath
 
 
 class FmRenameCommand(AppCommand):
diff --git a/libs/input_for_path.py b/libs/input_for_path.py
@@ -1,6 +1,7 @@
-import sublime
 import os
 
+import sublime
+
 from .pathhelper import *
 from .sublimefunctions import *
 
diff --git a/libs/pathhelper.py b/libs/pathhelper.py
diff --git a/libs/send2trash/__init__.py b/libs/send2trash/__init__.py
diff --git a/libs/send2trash/plat_osx.py b/libs/send2trash/plat_osx.py
diff --git a/libs/send2trash/plat_other.py b/libs/send2trash/plat_other.py
diff --git a/libs/send2trash/plat_win.py b/libs/send2trash/plat_win.py
diff --git a/libs/sublimefunctions.py b/libs/sublimefunctions.py
@@ -1,15 +1,11 @@
-import sublime
 import os
 import sys
 
-from .pathhelper import *
+import sublime
 
+from .pathhelper import *
 
-def plugin_loaded():
-    global TEMPLATE_FOLDER
-    TEMPLATE_FOLDER = os.path.join(sublime.packages_path(), "User", ".FileManager")
-    if not os.path.exists(TEMPLATE_FOLDER):
-        makedirs(TEMPLATE_FOLDER)
+TEMPLATE_FOLDER = None
 
 
 def md(*t, **kwargs):
@@ -77,6 +73,12 @@ def file_get_content(path):
 
 def get_template(created_file):
     """Return the right template for the create file"""
+    global TEMPLATE_FOLDER
+
+    if TEMPLATE_FOLDER is None:
+        TEMPLATE_FOLDER = os.path.join(sublime.packages_path(), "User", ".FileManager")
+        makedirs(TEMPLATE_FOLDER, exist_ok=True)
+
     template_files = os.listdir(TEMPLATE_FOLDER)
     for item in template_files:
         if (
diff --git a/tests/test_path_helper.py b/tests/test_path_helper.py
@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-import unittest
-import sys
 import os
+import sys
+import unittest
 
-from FileManager.pathhelper import computer_friendly, user_friendly
+from FileManager.libs.pathhelper import computer_friendly, user_friendly
 
 
 class PathHelperTest(unittest.TestCase):
