Skip to content

Commit 78da05c

Browse files
author
fabianschilf94
committed
fixed template file paths for windows
1 parent 740567f commit 78da05c

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

cppclasshelper.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import sublime, sublime_plugin
1+
import sublime, sublime_plugin, os
22
from .template import Template
3+
from sublime_lib import ResourcePath
34

45
class CreateCppClassCommand(sublime_plugin.WindowCommand):
56
'''
@@ -8,11 +9,10 @@ class for create a C++ class with a sourcefile and headerfile
89
def run(self, **kwargs):
910

1011
# plugin settings
12+
self.package_dir = ResourcePath.from_file_path(__file__).parent
1113
self.plugin_name = 'cppclasshelper-sublime-text-plugin'
1214
self.template_dir_name = 'templates'
13-
self.plugin_dir = "{}/{}".format(sublime.packages_path(), self.plugin_name)
14-
print(self.plugin_dir)
15-
self.template_dir = "{}/{}/".format(self.plugin_dir, self.template_dir_name)
15+
self.template_dir = "{}/{}/".format(self.package_dir, self.template_dir_name)
1616

1717
# global settings
1818
self.settings = sublime.load_settings("cppclasshelper.sublime-settings")
@@ -22,7 +22,11 @@ def run(self, **kwargs):
2222
self.header_file_extension = self.settings.get('header_file_extension')
2323

2424
# directory where files will be created
25-
self.create_directory = self.vars['file_path']
25+
print(self.vars)
26+
if not "file_path" in self.vars:
27+
self.create_directory = self.vars['folder']
28+
else:
29+
self.create_directory = self.vars['file_path']
2630

2731
# get folder from sidebar
2832
if "paths" in kwargs:

dependencies.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"*": {
3+
"*": [
4+
"sublime_lib"
5+
]
6+
}
7+
}

template.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import os
1+
import os, sublime
22

33
class Template:
44

@@ -10,19 +10,11 @@ def __init__(self, name):
1010

1111
def load(self, filename):
1212
# load template file
13-
self._filename = filename
14-
if not os.path.isfile(self._filename):
15-
raise OSError(2, "'{filename}' not found".format(filename=filename))
16-
else:
17-
18-
# set filename
19-
# read template to string
20-
self._filename = filename
21-
22-
# reading template
23-
template_file_obj = open(self._filename, 'r')
24-
self._template = template_file_obj.read()
13+
self._filename = str(filename)
2514

15+
# reading template
16+
self._template = sublime.load_resource(filename)
17+
2618

2719
def render(self, **values):
2820
"""

0 commit comments

Comments
 (0)