Refactor remove view abstraction

Author: Sascha Goldhofer

completion.py

@@ -60,12 +60,12 @@ def resolve_trigger(view, query):
     return trigger
 
 
-def get_filepaths(view, query, current_file):
+def get_filepaths(view, query):
     global start_expression
 
     trigger = resolve_trigger(view, query)
     log(ID_TRIGGER, trigger)
-    if query.build(start_expression.get("needle"), trigger, current_file.get_directory()) is False:
+    if query.build(start_expression.get("needle"), trigger, current_state.get_directory()) is False:
         # query is valid, but may not be triggered: not forced, no auto-options
         verbose(ID, "abort - no auto trigger found")
         return False
@@ -75,7 +75,7 @@ def get_filepaths(view, query, current_file):
 
     return current_state.search_completions(
         query.get_needle(),
-        current_file.get_project_directory(),
+        current_state.get_project_directory(),
         query.get_extensions(),
         query.get_base_path()
     )

controller.py

@@ -35,7 +35,7 @@ def get_filepath_completions(view):
         return False
 
     verbose(ID, "get filepath completions")
-    completions = Completion.get_filepaths(view, Query, state.get_view())
+    completions = Completion.get_filepaths(view, Query)
 
     if completions and len(completions[0]) > 0:
         Completion.start(Query.get_replacements())

current_state.py

@@ -7,9 +7,9 @@
 
 import sublime
 import os
+import re
 import FuzzyFilePath.common.settings as settings
 from FuzzyFilePath.project.FileCache import FileCache
-from FuzzyFilePath.project.View import View
 import FuzzyFilePath.common.path as Path
 import FuzzyFilePath.common.verbose as logger
 
@@ -66,9 +66,9 @@ def update():
 
 	# @TODO cache
 	state["file"] = file
+	state["directory"] = sanitize_directory(file, project_folder)
 	state["folders"] = folders
 	state["project_folder"] = project_folder
-	state["view"] = View(project_folder, file)
 	state["cache"] = get_file_cache(project_folder)
 
 	logger.start_block()
@@ -77,24 +77,30 @@ def update():
 	return valid
 
 
+def sanitize_directory(file_name, project_folder):
+	directory = re.sub(project_folder, "", file_name)
+	directory = re.sub("^[\\\\/\.]*", "", directory)
+	return os.path.dirname(directory)
+
+
 def get_project_directory():
 	return state.get("project_folder")
 
 
+def get_directory():
+	return state.get("directory")
+
+
 def update_settings():
 	if state.get("project_folder"):
+		# we expect settings to be already updated and thus only update the project folder settings
 		settings.update_project_folder_settings(state.get("project_folder"))
 
 
 def is_valid():
 	return valid
 
 
-def get_view():
-	""" legacy: return the current view """
-	return state.get("view")
-
-
 def enable():
 	global is_enabled
 	is_enabled = True