|
@@ -35,24 +35,32 @@ class log_directory:
|
|
|
name = self._base_name
|
|
name = self._base_name
|
|
|
|
|
|
|
|
logs = self.iter_logs()
|
|
logs = self.iter_logs()
|
|
|
- filtered = filter(lambda count: count.find(name) != -1, logs)
|
|
|
|
|
|
|
+ filtered = filter(lambda count: str(count).find(name) != -1, logs)
|
|
|
|
|
|
|
|
return tuple(filtered)
|
|
return tuple(filtered)
|
|
|
|
|
|
|
|
@property
|
|
@property
|
|
|
def _base_name(self) -> str:
|
|
def _base_name(self) -> str:
|
|
|
- return time.strftime("%Y-%m-%d", time.now())
|
|
|
|
|
|
|
+ return time.strftime("%Y-%m-%d", time.localtime())
|
|
|
|
|
|
|
|
- def _get_new_name(self) -> str:
|
|
|
|
|
|
|
+ def get_new_file(self) -> pathlib.Path:
|
|
|
base_name = self._base_name
|
|
base_name = self._base_name
|
|
|
- logs_for_name = self.get_logs_for_day(base_name)
|
|
|
|
|
- in_result = base_name + "-" + str(len(logs_for_name) + 1) + ".log"
|
|
|
|
|
|
|
+ name_logs = self.get_logs_for_day(base_name)
|
|
|
|
|
+ name_count = len(name_logs)
|
|
|
|
|
|
|
|
- return in_result
|
|
|
|
|
|
|
+ while True:
|
|
|
|
|
+ result_name = (
|
|
|
|
|
+ base_name + "-" + \
|
|
|
|
|
+ str(name_count + 1) + ".log" \
|
|
|
|
|
+ )
|
|
|
|
|
|
|
|
- def get_new_file(self) -> pathlib.Path:
|
|
|
|
|
- return self.root / pathlib.Path(self._get_new_name())
|
|
|
|
|
|
|
+ result_path = self.root / pathlib.Path(result_name)
|
|
|
|
|
+
|
|
|
|
|
+ if not result_path.exists():
|
|
|
|
|
+ return result_path
|
|
|
|
|
+
|
|
|
|
|
+ name_count = name_count + 1
|
|
|
|
|
|
|
|
def get_new_handler(self) -> file_handler:
|
|
def get_new_handler(self) -> file_handler:
|
|
|
- return file_handler(self.get_new_file)
|
|
|
|
|
|
|
+ return file_handler(self.get_new_file())
|
|
|
|
|
|