path in linux

This commit is contained in:
2022-04-12 21:52:06 +03:00
parent aefdce11f7
commit 3d1525b7d9
+3 -3
View File
@@ -73,8 +73,8 @@ class DayOfTheWeek:
week = [] week = []
for day_str in DayOfTheWeek.get_day_of_the_week(-1): for day_str in DayOfTheWeek.get_day_of_the_week(-1):
day = Day() day = Day()
for file in os.listdir(folder + '\\' + day_str): for file in os.listdir(os.path.join(folder, day_str)):
file = folder + '\\' + day_str + '\\' + file file = os.path.join(folder, day_str, file)
day.memes.append(DayOfTheWeek.create_meme(file)) day.memes.append(DayOfTheWeek.create_meme(file))
week.append(day) week.append(day)
@@ -99,7 +99,7 @@ class DayOfTheWeek:
def get_meta(filename: str) -> dict[str, any]: def get_meta(filename: str) -> dict[str, any]:
folder = os.path.dirname(os.path.abspath(__file__)) folder = os.path.dirname(os.path.abspath(__file__))
if not '.metadata' in filename: if not '.metadata' in filename:
filename = filename.replace(folder, folder + "\\.metadata") filename = filename.replace(folder, os.path.join(folder, ".metadata"))
with open(filename + '.json', 'r', encoding='utf8') as f: with open(filename + '.json', 'r', encoding='utf8') as f:
return json.loads(f.read()) return json.loads(f.read())