Formatting

src/book_solver.py

@@ -29,12 +29,13 @@ class BookSolver:
         self.logger_object = BookLogger(name=f'{__name__}_{self.book_id}',
                                         book_id=book_id,
                                         main_logger=main_logger)
-        self.status_wrapper = BookStatusWrapper(access, self.logger_object, book_id)
+        self.status_wrapper = BookStatusWrapper(
+            access, self.logger_object, book_id)
 
         assert LiveCartaConfig.SUPPORTED_LEVELS == len(LiveCartaConfig.SUPPORTED_HEADERS), \
             "Length of headers doesn't match allowed levels."
 
-    def save_book_file(self, content):
+    def save_book_file(self, content: str):
         """
         Function saves binary content of file to .docx/.epub
         Parameters
@@ -43,17 +44,21 @@ class BookSolver:
             binary content of the file
 
         """
-        folder_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-        folder_path = os.path.join(folder_path, f'{self.book_type}/{self.book_id}')
+        folder_path = os.path.dirname(
+            os.path.dirname(os.path.abspath(__file__)))
+        folder_path = os.path.join(
+            folder_path, f'{self.book_type}/{self.book_id}')
         pathlib.Path(folder_path).mkdir(parents=True, exist_ok=True)
 
-        file_path = os.path.join(folder_path, f'{self.book_id}.{self.book_type}')
+        file_path = os.path.join(
+            folder_path, f'{self.book_id}.{self.book_type}')
         try:
             with open(file_path, 'wb+') as file:
                 file.write(content)
             self.logger_object.log(f'File was saved to folder: {folder_path}.')
         except Exception as exc:
-            self.logger_object.log(f"Error in writing {self.book_type} file.", logging.ERROR)
+            self.logger_object.log(
+                f"Error in writing {self.book_type} file.", logging.ERROR)
             self.logger_object.log_error_to_main_log()
             raise exc
 
@@ -62,12 +67,14 @@ class BookSolver:
     def get_book_file(self):
         """Method for getting and saving book from server"""
         try:
-            self.logger_object.log(f'Start receiving file from server. URL: {self.access.url}/doc-convert/{self.book_id}/file')
+            self.logger_object.log(f'Start receiving file from server. URL:'
+                                   f' {self.access.url}/doc-convert/{self.book_id}/file')
             content = self.access.get_book(self.book_id)
             self.logger_object.log('File was received from server.')
             self.save_book_file(content)
         except FileNotFoundError as f_err:
-            self.logger_object.log("Can't get file from server.", logging.ERROR)
+            self.logger_object.log(
+                "Can't get file from server.", logging.ERROR)
             self.logger_object.log_error_to_main_log()
             raise f_err
         except Exception as exc:
@@ -75,14 +82,17 @@ class BookSolver:
 
     def check_output_directory(self):
         if self.output_path is None:
-            folder_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-            output_path = os.path.join(folder_path, f'json/{self.book_id}.json')
+            folder_path = os.path.dirname(
+                os.path.dirname(os.path.abspath(__file__)))
+            output_path = os.path.join(
+                folder_path, f'json/{self.book_id}.json')
             self.output_path = output_path
 
         self.output_path = pathlib.Path(self.output_path)
         self.logger_object.log(f'Output file path: {self.output_path}')
 
-        pathlib.Path(self.output_path).parent.mkdir(parents=True, exist_ok=True)
+        pathlib.Path(self.output_path).parent.mkdir(
+            parents=True, exist_ok=True)
         self.output_path.touch(exist_ok=True)
 
     def write_to_json(self, content: dict):
@@ -90,9 +100,11 @@ class BookSolver:
         try:
             with codecs.open(self.output_path, 'w', encoding='utf-8') as f:
                 json.dump(content, f, ensure_ascii=False)
-            self.logger_object.log(f'Data has been saved to .json file: {self.output_path}')
+            self.logger_object.log(
+                f'Data has been saved to .json file: {self.output_path}')
         except Exception as exc:
-            self.logger_object.log('Error has occurred while writing json file.' + str(exc), logging.ERROR)
+            self.logger_object.log(
+                'Error has occurred while writing .json file.' + str(exc), logging.ERROR)
 
     def send_json_content_to_server(self, content: dict):
         """Function sends json_content to site"""
@@ -100,14 +112,15 @@ class BookSolver:
             self.access.send_book(self.book_id, content)
             self.logger_object.log(f'JSON data has been sent to server.')
         except Exception as exc:
-            self.logger_object.log('Error has occurred while sending json content.', logging.ERROR)
+            self.logger_object.log(
+                'Error has occurred while sending json content.', logging.ERROR)
             self.logger_object.log_error_to_main_log()
             self.status_wrapper.set_error()
             raise exc
 
     @abstractmethod
     def get_converted_book(self):
-        self.logger_object.log('Beginning of processing json output.')
+        self.logger_object.log('Beginning of processing .json output.')
         self.status_wrapper.set_generating()
         return {}
 
@@ -119,21 +132,24 @@ class BookSolver:
 
         """
         try:
-            self.logger_object.log(f'Beginning of conversion from .{self.book_type} to .json.')
+            self.logger_object.log(
+                f'Beginning of conversion from .{self.book_type} to .json.')
             self.get_book_file()
             self.status_wrapper.set_processing()
             content_dict = self.get_converted_book()
+            self.status_wrapper.set_generating()
             self.write_to_json(content_dict)
             self.send_json_content_to_server(content_dict)
-            self.logger_object.log(f'End of the conversion to LiveCarta format. Check {self.output_path}.')
-
+            self.logger_object.log(
+                f'End of the conversion to LiveCarta format. Check {self.output_path}.')
         except Exception as exc:
             self.status_wrapper.set_error()
-            self.logger_object.log('Error has occurred while conversion.', logging.ERROR)
+            self.logger_object.log(
+                'Error has occurred while conversion.', logging.ERROR)
             self.logger_object.log_error_to_main_log(str(exc))
             raise exc
 
-    def conversion_local(self, file_name: str):
+    def conversion_local(self, file_path: str):
         """
         Function
         - without downloading book from server (local)
@@ -141,13 +157,16 @@ class BookSolver:
 
         """
         try:
-            self.logger_object.log(f'Data has been downloaded from {file_name}.json file: ..\converter\json')
+            self.logger_object.log(
+                f'Data has been downloaded from {file_path} file')
             self.status_wrapper.set_processing()
-            with codecs.open(f'json/{file_name}.json', 'r', encoding='utf-8') as f_json:
+            with codecs.open(file_path, 'r', encoding='utf-8') as f_json:
                 content_dict = json.load(f_json)
+            self.status_wrapper.set_generating()
             self.send_json_content_to_server(content_dict)
             self.logger_object.log(f'Sent a file to server. Check LiveCarta.')
         except Exception as exc:
             self.status_wrapper.set_error()
-            self.logger_object.log('Error has occurred while reading json file.' + str(exc), logging.ERROR)
-            self.logger_object.log_error_to_main_log(str(exc))
+            self.logger_object.log(
+                'Error has occurred while reading json file.' + str(exc), logging.ERROR)
+            self.logger_object.log_error_to_main_log(str(exc))