Skip to content

Commit efa90cc

Browse files
committed
fix: [item] get filename
1 parent 57eed32 commit efa90cc

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

bin/lib/item_basic.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ def get_item_filepath(item_id):
3535
filename = os.path.join(ConfigLoader.get_items_dir(), item_id)
3636
filename = os.path.realpath(filename)
3737
items_dir = ConfigLoader.get_items_dir()
38+
if items_dir[-1] == '/':
39+
items_dir = items_dir[:-1]
3840
if not os.path.commonpath([filename, items_dir]) == items_dir:
3941
return None
4042
else:

bin/lib/objects/Items.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ def get_filename(self):
8989
filename = os.path.realpath(filename)
9090

9191
# incorrect filename
92-
if not os.path.commonpath([filename, ITEMS_FOLDER]) == ITEMS_FOLDER:
92+
if ITEMS_FOLDER[-1] == '/':
93+
items_dir = ITEMS_FOLDER[:-1]
94+
else:
95+
items_dir = ITEMS_FOLDER
96+
if not os.path.commonpath([filename, ITEMS_FOLDER]) == items_dir:
9397
return None
9498
else:
9599
return filename

0 commit comments

Comments
 (0)