cannect 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

cannect/core/can/db/vcs.py

@@ -27,6 +27,9 @@ class CANDBVcs:
     def __init__(self, filename:str=''):
         if not filename:
             filename = "자체제어기_KEFICO-EMS_CANFD.xlsx"
+        if not filename.endswith('.xlsx'):
+            filename += '.xlsx'
+
         filepath = env.SVN_CANDB / filename
         if not filepath.exists():
             raise CANDBError(f'{filename} NOT EXISTS')
@@ -90,9 +93,11 @@ class CANDBVcs:
             self.logger(f"- Saved as : {path_abbreviate(jsonpath)}")
         return
 
-    # def commit_json(self):
-    #     Subversion.commit(self.json, message="[CANNECT] AUTO-COMMIT CAN JSON DB")
-    #     return
+    def commit_json(self):
+        # TODO
+        Subversion.add(self.json)
+        Subversion.commit(self.json, message=f"[CANNECT] AUTO-COMMIT CAN JSON - {self.revision}")
+        return
 
 if __name__ == "__main__":
     from pandas import set_option
@@ -100,6 +105,8 @@ if __name__ == "__main__":
 
     cdb = CANDBVcs()
     # cdb = CANDBVcs(r"G-PROJECT_KEFICO-EMS_CANFD.xlsx")
+    # print(cdb.revision)
     cdb.to_json()
     print(cdb.json)
+
     # cdb.commit_json()

cannect/core/ir/changehistory.py

@@ -1,4 +1,6 @@
+from cannect.core.ir.ir import IntegrationRequest
 from cannect.utils.ppt import PptRW
+from cannect.utils import tools
 from pandas import DataFrame
 from typing import Iterable, List
 import pygetwindow as gw
@@ -8,6 +10,119 @@ import time
 
 class ChangeHistoryManager(PptRW):
 
+    def __init__(self, ir:IntegrationRequest):
+        ir.logger.log(f'[WRITE PPT ON "{tools.path_abbreviate(ir.deliverables.change_history)}"]')
+        if not ir.is_previous_svn_version_selected():
+            ir.logger.log('! WARNING: PREVIOUS MODEL NOT SELECTED')
+
+        super().__init__(ir.deliverables.change_history)
+        self.ir = ir
+
+        ir.logger.log('>>> RESIZING COVER PAGE')
+        self._resize_cover()
+
+        # PAGE OVERVIEW: SET FUNCTION LIST
+        self.set_text_in_table(n_slide=1, n_table=2, cell=(3, 2), text=", ".join(ir.table["FunctionName"]), pos='new')
+        self.set_table_font(n_slide=1, n_table=2, cell=(3, 2), size=10)
+
+        # PAGE MODEL DESCRIPTION:
+        if ir.is_previous_svn_version_selected():
+            ir.logger.log('>>> WRITE ON "SW 기능 상세 설명 - 변경 전"')
+            text = ''
+            for n in ir.p_table.index:
+                text += f'%{ir.p_table.loc[n, "FunctionName"]} <r.{ir.p_table.loc[n, "SCMRev"]}>\x0b\x0b\n'
+            text = text[:-1]
+            self.set_text_in_table(n_slide=2, n_table=1, cell=(2, 1), text=text, pos='new')
+
+        ir.logger.log('>>> WRITE ON "SW 기능 상세 설명 - 변경 후"')
+        text = ''
+        for n in ir.table.index:
+            text += f'%{ir.table.loc[n, "FunctionName"]} <r.{ir.table.loc[n, "SCMRev"]}>\x0b-\x0b\n'
+        text = text[:-1]
+        self.set_text_in_table(n_slide=2, n_table=1, cell=(2, 2), text=text, pos='new')
+
+        # PAGE MODEL DETAILS
+        ir.logger.log('>>> GENERATE SLIDES ')
+        self._set_model_slides()
+
+        if ir.is_previous_svn_version_selected():
+            ir.logger('>>> WRITING PREVIOUS MODEL DETAILS...')
+            for n in ir.p_table.index:
+                name, rev = ir.p_table.loc[n, "FunctionName"], ir.p_table.loc[n, "SCMRev"]
+                ir.logger(f'>>> ... {name} @{rev}')
+                slides = self.get_slide_n(f'{name} ')
+                for slide in slides:
+                    self.replace_text_in_table(
+                        n_slide=slide,
+                        n_table=1,
+                        cell=(1, 1),
+                        prev="Rev.",
+                        post=f"Rev.{rev}"
+                    )
+
+        ir.logger('>>> WRITING REVISED MODEL DETAILS...')
+        for n in ir.table.index:
+            name, rev = ir.table.loc[n, "FunctionName"], ir.table.loc[n, "SCMRev"]
+            ir.logger(f'>>> ... {name} @{rev}')
+            slides = self.get_slide_n(f'{name} ')
+            for slide in slides:
+                self.replace_text_in_table(
+                    n_slide=slide,
+                    n_table=1,
+                    cell=(1, 2),
+                    prev="Rev.",
+                    post=f"Rev.{rev}"
+                )
+            slides = self.get_slide_n(f'{name} / Element')
+            for slide in slides:
+                self.set_text_in_table(
+                    n_slide=slide,
+                    n_table=1,
+                    cell=(3, 1),
+                    text='Element 삭제\x0b' + ir.table.loc[n, "ElementDeleted"],
+                    pos="new"
+                )
+                self.set_text_in_table(
+                    n_slide=slide,
+                    n_table=1,
+                    cell=(3, 2),
+                    text='Element 추가\x0b' + ir.table.loc[n, "ElementAdded"],
+                    pos="new"
+                )
+
+        # WRITE CALIBRATION GUIDE
+        if len(ir.parameters) == 0:
+            return
+
+        ir.logger('>>> WRITING CALIBRATION PARAMETERS')
+
+        n_param = self.get_slide_n('Calibration')[0]
+        for n in range(len(ir.parameters) - 1):
+            self.ppt.Slides(n_param).Duplicate()
+
+        for n, param in enumerate(ir.parameters):
+            table = self._get_table(n_param + n, 1)
+            if len(param) > 3:
+                for _ in range(len(param) - 3):
+                    table.Rows.Add()
+            table.Columns(1).Width = 5.0 * 28.346
+            table.Columns(2).Width = 7.0 * 28.346
+            table.Columns(3).Width = 4.0 * 28.346
+            table.Columns(5).Width = 2.0 * 28.346
+            table.Columns(6).Width = 2.0 * 28.346
+            table.Columns(7).Width = 2.0 * 28.346
+            for r, index in enumerate(param.index, start=1):
+                row = param.loc[index]
+                for c, val in enumerate(row.values, start=1):
+                    cell = table.Cell(r + 1, c).Shape
+                    cell.TextFrame.TextRange.Text = str(val)
+                    cell.TextFrame.TextRange.Font.Name = "현대하모니 L"
+                    cell.TextFrame.TextRange.Font.Size = 10
+
+                    cell.TextFrame.TextRange.ParagraphFormat.Alignment = 1 if c == 2 else 2
+                    cell.TextFrame.VerticalAnchor = 3
+        return
+
     @classmethod
     def routine_capture(cls, ppt:str='', size:int=26, *hotkey):
         """
@@ -55,7 +170,7 @@ class ChangeHistoryManager(PptRW):
 
         return
 
-    def resize_cover(self):
+    def _resize_cover(self):
         """
         | n ==  7 | n == 3 |
         | n ==  8 | n == 4 |
@@ -104,15 +219,6 @@ class ChangeHistoryManager(PptRW):
         self.set_text_in_table(n_slide=1, n_table=1, cell=(2, 1), text=developer, pos='new')
         self.set_table_font(n_slide=1, n_table=1, cell=(2, 1), size=10)
 
-    @property
-    def function(self) -> str:
-        return self.__dict__.get('_function', '')
-
-    @function.setter
-    def function(self, functions:Iterable):
-        self.set_text_in_table(n_slide=1, n_table=2, cell=(3, 2), text=", ".join(functions), pos='new')
-        self.set_table_font(n_slide=1, n_table=2, cell=(3, 2), size=10)
-
     @property
     def issue(self) -> str:
         return self.__dict__.get('_issue', '')
@@ -146,33 +252,8 @@ class ChangeHistoryManager(PptRW):
     def problem(self, problem:str):
         self.set_text_in_table(n_slide=1, n_table=2, cell=(5, 1), text=problem, pos='new')
 
-    @property
-    def prev_model_description(self) -> str:
-        return self.__dict__.get('_prev_model_description', '')
-
-    @prev_model_description.setter
-    def prev_model_description(self, models:DataFrame):
-        text = ''
-        for n in models.index:
-            text += f'%{models.loc[n, "FunctionName"]} <r.{models.loc[n, "SCMRev"]}>\x0b\x0b\n'
-        text = text[:-1]
-        self.set_text_in_table(n_slide=2, n_table=1, cell=(2, 1), text=text, pos='new')
-
-    @property
-    def post_model_description(self) -> str:
-        return self.__dict__.get('_post_model_description', '')
-
-    @post_model_description.setter
-    def post_model_description(self, models: DataFrame):
-        text = ''
-        for n in models.index:
-            text += f'%{models.loc[n, "FunctionName"]} <r.{models.loc[n, "SCMRev"]}>\x0b-\x0b\n'
-        text = text[:-1]
-        self.set_text_in_table(n_slide=2, n_table=1, cell=(2, 2), text=text, pos='new')
-
-    def set_model_slides(self, ir:DataFrame):
-        if self.log is not None:
-            self.log('>>> GENERATING MODEL SLIDES...')
+    def _set_model_slides(self):
+        ir = self.ir.table
         self.set_shape(n_slide=3, n_shape=1, width=26.1 * 28.346, left=0.8 * 28.346)
         self.set_text_font(n_slide=3, n_shape=1, name="현대하모니 M", size=20)
         self.set_table_height(n_slide=3, n_table=1, row=2, height=11 * 28.346)
@@ -201,110 +282,3 @@ class ChangeHistoryManager(PptRW):
             self.set_text_in_table(n_slide=n_formula, n_table=1, cell=(3, 2), text="Impl. 추가\x0b", pos="new")
         self.ppt.SectionProperties.AddBeforeSlide(self.get_slide_n('Calibration')[0], 'Calibration Guide')
         return
-
-    @property
-    def prev_model_details(self):
-        return self.__dict__.get('_prev_model_details', '')
-
-    @prev_model_details.setter
-    def prev_model_details(self, models:DataFrame):
-        if self.log is not None:
-            self.log('>>> WRITING PREVIOUS MODEL DETAILS...')
-        for n in models.index:
-            name, rev = models.loc[n, "FunctionName"], models.loc[n, "SCMRev"]
-            if self.log is not None:
-                self.log(f'>>> ... {name} @{rev}')
-            slides = self.get_slide_n(f'{name} ')
-            for slide in slides:
-                self.replace_text_in_table(
-                    n_slide=slide,
-                    n_table=1,
-                    cell=(1, 1),
-                    prev="Rev.",
-                    post=f"Rev.{rev}"
-                )
-
-    @property
-    def post_model_details(self):
-        return self.__dict__.get('_post_model_details', '')
-
-    @post_model_details.setter
-    def post_model_details(self, models:DataFrame):
-        if self.log is not None:
-            self.log('>>> WRITING POST MODEL DETAILS...')
-        for n in models.index:
-            name, rev = models.loc[n, "FunctionName"], models.loc[n, "SCMRev"]
-            if self.log is not None:
-                self.log(f'>>> ... {name} @{rev}')
-            slides = self.get_slide_n(f'{name} ')
-            for slide in slides:
-                self.replace_text_in_table(
-                    n_slide=slide,
-                    n_table=1,
-                    cell=(1, 2),
-                    prev="Rev.",
-                    post=f"Rev.{rev}"
-                )
-            slides = self.get_slide_n(f'{name} / Element')
-            for slide in slides:
-                self.set_text_in_table(
-                    n_slide=slide,
-                    n_table=1,
-                    cell=(3, 1),
-                    text='Element 삭제\x0b' + models.loc[n, "ElementDeleted"],
-                    pos="new"
-                )
-                self.set_text_in_table(
-                    n_slide=slide,
-                    n_table=1,
-                    cell=(3, 2),
-                    text='Element 추가\x0b' + models.loc[n, "ElementAdded"],
-                    pos="new"
-                )
-
-    @property
-    def parameters(self) -> List[DataFrame]:
-        return self.__dict__.get('_parameters', [])
-
-    @parameters.setter
-    def parameters(self, parameters: List[DataFrame]):
-        if len(parameters) == 0:
-            return
-        self.__dict__['_parameters'] = parameters
-        if self.log is not None:
-            self.log('>>> WRITING CALIBRATION PARAMETERS...')
-
-        n_param = self.get_slide_n('Calibration')[0]
-        for n in range(len(parameters) - 1):
-            self.ppt.Slides(n_param).Duplicate()
-
-        for n, param in enumerate(parameters):
-            table = self._get_table(n_param + n, 1)
-            if len(param) > 3:
-                for _ in range(len(param) - 3):
-                    table.Rows.Add()
-            table.Columns(1).Width = 5.0 * 28.346
-            table.Columns(2).Width = 7.0 * 28.346
-            table.Columns(3).Width = 4.0 * 28.346
-            table.Columns(5).Width = 2.0 * 28.346
-            table.Columns(6).Width = 2.0 * 28.346
-            table.Columns(7).Width = 2.0 * 28.346
-            for r, index in enumerate(param.index, start=1):
-                row = param.loc[index]
-                for c, val in enumerate(row.values, start=1):
-                    cell = table.Cell(r + 1, c).Shape
-                    cell.TextFrame.TextRange.Text = str(val)
-                    cell.TextFrame.TextRange.Font.Name = "현대하모니 L"
-                    cell.TextFrame.TextRange.Font.Size = 10
-
-                    cell.TextFrame.TextRange.ParagraphFormat.Alignment = 1 if c == 2 else 2
-                    cell.TextFrame.VerticalAnchor = 3
-        return
-
-
-if __name__ == "__main__":
-    # ChangeHistoryManager.routine_capture('0000_CNGPIO_통신_인터페이스_개발.pptx', 13)
-    chm = ChangeHistoryManager(
-        path = r"D:\Archive\00_프로젝트\2017 통신개발-\2026\DS0127 CR10787035 DTC별 IUMPR 표출 조건 변경 ICE\0000_CAN_ICE_IUMPR표출_DEM조건_추가.pptx"
-    )
-    chm.resize_cover()

cannect/core/ir/diff.py

@@ -61,7 +61,7 @@ class AmdDiff:
     @property
     def added(self) -> List[str]:
         if self.is_equal:
-            return self.post_elem['name'].tolist()
+            return []
         return list(set(self.post_elem['name']) - set(self.prev_elem['name']))
 
     @property
@@ -91,7 +91,9 @@ if __name__ == "__main__":
     set_option('display.expand_frame_repr', False)
 
     diff = AmdDiff(
-        r"D:\Archive\00_프로젝트\2017 통신개발-\2025\DS1201 IUMPR 미표출 ICE CANFD\02_Model\Prev\CanBMSD_48V.main.amd",
-        r"D:\Archive\00_프로젝트\2017 통신개발-\2025\DS1201 IUMPR 미표출 ICE CANFD\02_Model\Post\CanBMSD_48V\CanBMSD_48V.main.amd",
+        r"D:\Archive\00_프로젝트\2017 통신개발-\2026\test\04_Model\Prev\ComDef_HEV.main.amd",
+        r"D:\Archive\00_프로젝트\2017 통신개발-\2026\test\04_Model\Post\ComDef_HEV-22550\ComDef_HEV.main.amd",
     )
-    print(diff.added_parameters)
+    # print(diff.added_parameters)
+    print(diff.added)
+    print(len(diff.added))

cannect/core/ir/ir.py

@@ -81,6 +81,24 @@ class IntegrationRequest:
     def _repr_html_(self):
         return getattr(self.table, '_repr_html_')()
 
+    @property
+    def ChangeHistory(self) -> str:
+        return self._change_history
+
+    @ChangeHistory.setter
+    def ChangeHistory(self, change: str):
+        self.table["ChangeHistoryName"] = change
+        self._change_history = change
+
+    @property
+    def Comment(self) -> str:
+        return self._comment
+
+    @Comment.setter
+    def Comment(self, comment: str):
+        self.table["Comment"] = comment
+        self._comment = comment
+
     @property
     def deliverables(self) -> Deliverables:
         """
@@ -99,15 +117,6 @@ class IntegrationRequest:
     def parameters(self) -> List[DataFrame]:
         return self._parameters
 
-    @property
-    def Comment(self) -> str:
-        return self._comment
-
-    @Comment.setter
-    def Comment(self, comment: str):
-        self.table["Comment"] = comment
-        self._comment = comment
-
     @property
     def User(self) -> str:
         return self._user
@@ -117,15 +126,6 @@ class IntegrationRequest:
         self.table["User"] = user
         self._user = user
 
-    @property
-    def ChangeHistory(self) -> str:
-        return self._change_history
-
-    @ChangeHistory.setter
-    def ChangeHistory(self, change: str):
-        self.table["ChangeHistoryName"] = change
-        self._change_history = change
-
     @staticmethod
     def _column_selector(key: str) -> str:
         """
@@ -153,7 +153,7 @@ class IntegrationRequest:
             Subversion.commit(self.ws[f'{name}.zip'], message)
         return
 
-    def compare_model(self, prev: str = '', post: str = '', exclude_imported: bool = True):
+    def compare_model(self, prev: str = '', post: str = '', exclude_imported: bool = False):
         self.logger("[COMPARE ELEMENTS]")
         if not prev:
             prev = self.deliverables.Model / "Prev"
@@ -170,7 +170,7 @@ class IntegrationRequest:
                 dat = Amd(post_amd).data.dataframe('DataEntry')
                 self.table.loc[n, 'ElementAdded'] = ", ".join(amd["name"])
                 self.logger(
-                    f">>> %{name: <{self._space}}: NEW ELEMENT  / ADDED ={len(amd): >3}")
+                    f">>> %{name: <{self._space}}: NEW ELEMENT  / ADDED = {len(amd): >3}")
                 params = AmdDiff.parameters2table(amd, dat)
                 if not params.empty:
                     self._parameters.append(params)
@@ -182,7 +182,7 @@ class IntegrationRequest:
             if not params.empty:
                 self._parameters.append(params)
 
-            self.logger(f">>> %{name: <{self._space}}: DELETED ={len(diff.deleted): >3} / ADDED ={len(diff.added): >3}")
+            self.logger(f">>> %{name: <{self._space}}: DELETED = {len(diff.deleted): >3} / ADDED = {len(diff.added): >3}")
         return
 
     def copy_model_to_svn(
@@ -295,6 +295,9 @@ class IntegrationRequest:
         self.p_table.reset_index(inplace=True)
         return
 
+    def is_previous_svn_version_selected(self):
+        return self.deliverables is not None and os.listdir(self.deliverables.Model / "Prev")
+
     def resolve_model(self, model: str):
         """
         모델 정보를 @self.table에 추가 (SVN Revision 제외)
@@ -396,9 +399,9 @@ class IntegrationRequest:
             tools.clear(temp, leave_path=True)
         return
 
-    def select_previous_svn_version(self, mode: str = 'auto'):
+    def select_previous_svn_version(self, mode: str = 'latest'):
         """
-        @mode: [str] {'auto', 'latest', 'select'}
+        @mode: [str] {'previous', 'latest', 'select'}
         """
         # 산출물 경로가 존재하는 경우 모델 과거 버전 조회 이력 확인 후 재 사용
         if self.deliverables is not None and os.listdir(self.deliverables.Model / "Prev"):
@@ -416,14 +419,14 @@ class IntegrationRequest:
                     self.p_table.loc[n, "SCMRev"] = '-'
             return
 
-        if not mode.lower() in ['auto', 'latest']:
+        if not mode.lower() in ['previous', 'latest']:
             self.logger(f'[SELECT PREVIOUS MODEL VERSION]')
         for n, row in enumerate(self):
             file = self.ws[row["FunctionName"]]
             history = Subversion.log(file)
-            if mode.lower() in ['auto', 'latest']:
+            if mode.lower() in ['previous', 'latest']:
                 try:
-                    i = 1 if mode.lower() == 'auto' else 0
+                    i = 1 if mode.lower() == 'previous' else 0
                     self.p_table.loc[n, "SCMRev"] = rev = history["revision"].values[i][1:]
                     if self.deliverables is not None:
                         Subversion.save_revision_to(file, rev, self.deliverables.Model / "Prev")
@@ -521,8 +524,8 @@ class IntegrationRequest:
     #     # TODO
     #     return
 
-    def to_clipboard(self, **kwargs):
-        return self.table[SCHEMA].to_clipboard(**kwargs)
+    def to_clipboard(self):
+        return self.table[SCHEMA].to_clipboard(index=False)
 
 
 if __name__ == "__main__":
@@ -536,14 +539,13 @@ if __name__ == "__main__":
         # r"E:\TEMP\CanCNG\CanCNG.main.amd",  # 신규 모델은 전체 경로 사용
         # r"E:\TEMP\CanEMS_CNG\CanEMS_CNG.main.amd", # 신규 모델은 전체 경로 사용
         # r"E:\TEMP\CanEMSM_CNG\CanEMSM_CNG.main.amd",  # 신규 모델은 전체 경로 사용
-        "CanCVVDD",
-        "CanNOXD"
+        "ComDef_HEV", "ComRx_HEV", "CanFDMCUD_HEV", "CanFDMCUM_HEV", "LogIf_HEV"
     )
-    ir.deliverables = r'D:\Archive\00_프로젝트\2017 통신개발-\2026\DS0119 CR10787034 DTC별 IUMPR 표출 조건 변경 HEV'
-    ir.User = "이제혁"
-    ir.Comment = "VCDM CR10787034 HEV/CANFD DTC별 IUMPR 표출 조건 변경"
+    ir.deliverables = env.DOWNLOADS / 'test'
+    # ir.User = "이제혁"
+    # ir.Comment = "VCDM CR10787034 HEV/CANFD DTC별 IUMPR 표출 조건 변경"
     # ir.select_previous_svn_version(mode='select')
-    # ir.select_previous_svn_version(mode='latest')
+    ir.select_previous_svn_version(mode='latest')
 
     # POST-ACTION
     # ir.update_sdd(comment=ir.Comment)
@@ -555,9 +557,9 @@ if __name__ == "__main__":
     # ir.commit_sdd(log='') # TODO
 
     # ir.resolve_svn_version('POLYSPACE')
-    # ir.resolve_svn_version()
-    # ir.resolve_sdd_version()
-    # ir.compare_model(prev='', post='', exclude_imported=False)
+    ir.resolve_svn_version()
+    ir.resolve_sdd_version()
+    ir.compare_model(prev='', post='', exclude_imported=False)
 
     # 변경내역서 작성
     # ppt = ChangeHistoryManager(
@@ -578,4 +580,4 @@ if __name__ == "__main__":
     # ppt.parameters             = ir.parameters  # .compare_model()의 후행
 
     print(ir)
-    # ir.to_clipboard(index=False)
+    # ir.to_clipboard()

cannect/core/subversion.py

@@ -13,6 +13,31 @@ class Subversion:
     logger :Callable = print
     silence:bool     = False
 
+    @classmethod
+    def add(cls, path:Union[str, Path]):
+        post = False
+        drive = "Z:"
+        if str(path).startswith("\\\\"):
+            post = True
+            anchor = Path(path).anchor
+            subprocess.run(["net", "use", drive, "/delete", "/y"], capture_output=True)
+            subprocess.run(["net", "use", drive, anchor], check=True)
+            path = Path(drive) / "\\" / Path(path).relative_to(anchor)
+
+        result = subprocess.run(
+            ["svn", "add", str(path), '--force'],
+            shell=True,
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        if post:
+            subprocess.run(["net", "use", drive, "/delete", "/y"], capture_output=True)
+        if not cls.silence:
+            cls.logger("Add successful!")
+            cls.logger(result.stdout)
+        return
+
     @classmethod
     def read_wcdb(cls, path:Union[Path,str]) -> DataFrame:
         conn = sqlite3.connect(path)

cannect/core/testcase/unitcase.py

@@ -35,7 +35,7 @@ LABEL = {
     "ER-Value": '',
     "Test Result": '',
     "Test Result Description": '',
-    "Test Conductor": f"{env.KOREANAME} @HYUNDAI-KEFICO",
+    "Test Conductor": f"{env.USER} @HYUNDAI-KEFICO",
     "Test SW": '',
     "Test HW": '',
     "Test Vehicle / Engine / HIL": '',

cannect/errors.py

@@ -13,6 +13,12 @@ class AscetWorspaceFormatError(Exception):
 class CANDBError(Exception):
     pass
 
+class CANDBDuplicationError(Exception):
+    pass
+
+class CANDBMessageNotFound(Exception):
+    pass
+
 class InternalServerError(Exception):
     pass
 

cannect/utils/ppt.py

@@ -52,9 +52,7 @@ class PptRW:
         cls.app.Visible = True
         return super().__new__(cls)
 
-    def __init__(self, path:str, logger=None):
-        if logger is not None:
-            logger.log(f'[WRITE PPT ON "{os.path.basename(path)}"]')
+    def __init__(self, path:str):
         if self.app.Presentations.Count > 0:
             for n in range(1, self.app.Presentations.Count + 1):
                 _ppt = self.app.Presentations.Item(n)
@@ -62,7 +60,6 @@ class PptRW:
                     self.ppt = _ppt
                     return
         self.ppt = self.app.Presentations.Open(path)
-        self.log = logger
         return
 
     def __iter__(self) -> Generator[win32.CDispatch, None, None]:

cannect/utils/tools.py

@@ -1,5 +1,6 @@
+from cannect.config import env
 from pathlib import Path
-from typing import AnyStr, Callable, Iterable, List, Union
+from typing import  Callable, Iterable, List, Union
 from xml.etree.ElementTree import Element, ElementTree
 from xml.dom import minidom
 import os, zipfile, shutil, io, re
@@ -85,6 +86,8 @@ def clear(path: str, leave_path: bool = True):
         print(f"Error occurs while clearing directory: {e}")
 
 def path_abbreviate(path: Union[str, Path]) -> str:
+    if str(path).startswith(str(env.DOWNLOADS)):
+        return path
     sep = os.path.sep
     split = str(path).split(sep)
     return f"{sep.join(split[:2])}{sep} ... {sep}{sep.join(split[-3:])}"