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

cannect/core/ir/delivereables.py

@@ -2,7 +2,7 @@ from cannect.config import env
 from cannect.utils import tools
 from pathlib import Path
 from datetime import datetime
-import os
+import os, stat
 
 
 class Deliverables:
@@ -31,6 +31,7 @@ class Deliverables:
         root = self.Root
 
         os.makedirs(root, exist_ok=True)
+        os.chmod(root, stat.S_IWRITE)
         for n, path in enumerate(self.__slots__, start=0):
             if path == "Root":
                 continue
@@ -43,16 +44,10 @@ class Deliverables:
                 os.makedirs(os.path.join(full_path, f'Post'), exist_ok=True)
 
         if not any(file.endswith('.xlsm') for file in os.listdir(root)):
-            try:
-                tools.copy_to(env.SVN_IR / '0000_HNB_SW_IR_.xlsm', root)
-            except PermissionError:
-                pass
+            tools.copy_to(env.SVN_IR / '0000_HNB_SW_IR_.xlsm', root)
 
         if not any(file.endswith('.pptx') for file in os.listdir(root)):
-            try:
-                tools.copy_to(env.SVN_HISTORY / '0000_변경내역서 양식.pptx', root)
-            except PermissionError:
-                pass
+            tools.copy_to(env.SVN_HISTORY / '0000_변경내역서 양식.pptx', root)
         return
 
     def __getitem__(self, item):

cannect/core/ir/ir.py

@@ -498,7 +498,7 @@ class IntegrationRequest:
                 self.logger.log(f' -> v{status}')
             else:
                 self.logger.log(f' -> v{sdd.version_doc}')
-            tools.copy_to(file, path)
+            tools.copy_to(file, path / row['SDDName'].replace('.zip', ''))
         tools.clear(temp, leave_path=True)
         return
 
@@ -561,23 +561,3 @@ if __name__ == "__main__":
     ir.resolve_sdd_version()
     ir.compare_model(prev='', post='', exclude_imported=False)
 
-    # 변경내역서 작성
-    # ppt = ChangeHistoryManager(
-    #     path=ir.deliverables["0000_CNGPIO_통신_인터페이스_개발_CANFD"],
-    #     logger=ir.logger
-    # )
-    # ppt.title                  = "[CAN] 송출 신호 음수 범위 미표출 오류 개선"
-    # ppt.developer              = "이제혁"
-    # ppt.function               = ir.table["FunctionName"]
-    # ppt.issue                  = "VCDM CR10787115"
-    # ppt.lcr                    = "자체 개선"
-    # ppt.problem                = "CF_Ems_DecelReq_Can 신호 음수 범위 표출 불가"
-    # ppt.prev_model_description = ir.p_table     # .select_previous_svn_version() 후행
-    # ppt.post_model_description = ir.table
-    # ppt.set_model_slides(ir.table)
-    # ppt.prev_model_details     = ir.p_table     # .select_previous_svn_version() 후행
-    # ppt.post_model_details     = ir.table
-    # ppt.parameters             = ir.parameters  # .compare_model()의 후행
-
-    print(ir)
-    # ir.to_clipboard()

cannect/utils/tools.py

@@ -3,7 +3,7 @@ from pathlib import Path
 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
+import os, zipfile, shutil, io, re, stat
 
 
 def unzip(src: Union[str, Path], to: Union[str, Path] = "") -> bool:
@@ -39,7 +39,12 @@ def zip(path:Union[str, Path]):
     return
 
 def copy_to(file:Union[str, Path], dst:Union[str, Path]) -> str:
-    shutil.copy(file, dst)
+    if os.path.isfile(str(file)):
+        os.chmod(dst, stat.S_IWRITE)
+        os.chmod(file, stat.S_IWRITE)
+        shutil.copy(file, dst)
+    else:
+        shutil.copytree(file, dst, dirs_exist_ok=True)
     # if '.' in os.path.basename(file):
     #     shutil.copy(file, dst)
     # else:

{cannect-1.0.3.dist-info → cannect-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cannect
-Version: 1.0.3
+Version: 1.0.4
 Summary: HYUNDAI-KEFICO EMS/ASW CONVENIENCE TOOL
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -265,6 +265,10 @@ print(vc.name)          # DB 파일 이름 (확장자 제외)
 print(vc.filename)      # DB 파일 이름 (확장자 포함)
 print(vc.revision)      # DB 파일 최신 SVN Revision
 print(vc.filepath)      # DB 파일 경로 (전체 경로)
+
+# 현재 SVN 최신 CAN Excel SPEC에 대한 json 파일이 없는 경우 .json 호출 시 오류 발생
+# 오류 발생 시 .to_json() 메소드 실행 필요
+# vc.to_json()
 print(vc.json)          # .revision에 해당하는 json 파일(전체 경로)
 print(vc.history)       # DB 파일 SVN 이력
 ```
@@ -449,7 +453,7 @@ ir.deliverables = "사용자의 로컬 경로 지정"
 # - mode == "latest"  : 대상 모델 Commit 미완료 상태, 최신 revision을 "변경 전" 모델로 간주 (기본 값)
 # - mode == "previous": 대상 모델 Commit 완료 상태, 직전 revision을 "변경 전" 모델로 간주
 # - mode == "select"  : 대상 모델에 대한 revision을 사용자가 모두 선택(console)
-ir.select_previous_svn_version(mode="latest")
+ir.select_previous_svn_version(mode="previous")
 
 # SDD 자동 업데이트 (잠재적 오류 내포)
 # 사용자는 개발 내용(이력)만 입력, 그 외 버전 관리는 자동 수행
@@ -492,11 +496,11 @@ from cannect import ChangeHistoryManager
 
 # ir 인스턴스가 존재한다고 가정
 # ∵ ir = IntegrationRequest(*modeuls)
-ppt = ChanHistoryManager(ir)
+ppt = ChangeHistoryManager(ir)
 
 # 1페이지 작성
 ppt.title       = "[CAN/공통] CAN BUS-OFF Recover Post Run 할당"   # 제목
-ppt.developer   = ir.User                                         # 개발 담당
+ppt.developer   = "이*혁"                                         # 개발 담당
 ppt.issue       = "VCDM CR10786223"                               # Issue
 ppt.lcr         = "자체 개선"                                      # LCR
 ppt.problem     = "OTA 업데이트 평가 중, ... 발생"                   # 문제 현상

{cannect-1.0.3.dist-info → cannect-1.0.4.dist-info}/RECORD

@@ -35,9 +35,9 @@ cannect/core/can/testcase/unitcase/diagnosis.py,sha256=kmpdkb96A5KJU7O82vJm8CNc_
 cannect/core/can/testcase/unitcase/encode.py,sha256=hmTKqwF-v-kkW5lAcLosI6G0-QTUqEMtyPxOda3X6YU,2824
 cannect/core/ir/__init__.py,sha256=etkIUl0teb06nEB4a4YgbAmZnFaHBIR7VHDztyhccgs,149
 cannect/core/ir/changehistory.py,sha256=jnWSBlrhuSJdXDvRehj2gHNBaqgKW7xGWYHdYcwjPRY,11851
-cannect/core/ir/delivereables.py,sha256=1fEyCutNOoZNbFcKRQ3pZAPzR_Q4wSlC4Tp_5fCl9_g,2596
+cannect/core/ir/delivereables.py,sha256=9TJ3KnKAnwnQOKByPqeypLKFpwjOwC0TPS_YYl3MIDU,2484
 cannect/core/ir/diff.py,sha256=gLs3kuhcBIFN2uo6W8UBDEK1qZIIbm0Nnxv4qmg3cgU,3674
-cannect/core/ir/ir.py,sha256=og990GVJBt_skjE_Uv7ZeHnrdPMWZlIfXcQZ6FgWWco,22387
+cannect/core/ir/ir.py,sha256=5i7iAW0kHvEm2nCbGQPDVmSBYLKKccz3nhPTP89jZCA,21422
 cannect/core/ir/sdd.py,sha256=rDkjnV2EKx25yRrIH25FGv38kRAhm1o9xsDCTilmBJw,6041
 cannect/core/testcase/__init__.py,sha256=2dnD5l0kpPp7eIFdvkS3XvZ9MYbtDRzyg5BiWlm_28Y,192
 cannect/core/testcase/plotter.py,sha256=SNHmffhBqpySUPu_XDK-nvy_i0Rfo0MoHz_4DVOH-iU,8589
@@ -51,9 +51,9 @@ cannect/utils/__init__.py,sha256=vApTSz3uU9IsK8PGjw43VkTdfeBiYlXkgLzVehZciQ0,86
 cannect/utils/excel.py,sha256=sCWXZTqeiyPFNGVfnor9nmScfLl7_ERMiNEDrhURjU8,772
 cannect/utils/logger.py,sha256=QeYTFA6l2wFMdeqBYcwIEu3a_XUpEljvFmAIii9YSIc,2325
 cannect/utils/ppt.py,sha256=dEGTOrjT-8efVZd0NbOn-i3NVGedt5Qgm3DtDE4CJgs,6982
-cannect/utils/tools.py,sha256=-HIFl5qdROJFBnxU43tOI0tOUas9z2jthxSBpxlmzgA,7192
-cannect-1.0.3.dist-info/licenses/LICENSE,sha256=_UNFlbKK2ShYTDPH44e6OFWDtiLzYkDPnilDcrLaCG8,1064
-cannect-1.0.3.dist-info/METADATA,sha256=m381RlzvTcgDQrnfLlgnRBnOeV9dz59ytmuASrjlQMc,61545
-cannect-1.0.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-cannect-1.0.3.dist-info/top_level.txt,sha256=QdGPQ02TsYi490A5C1BePgszlXQz7R9BijvgEP4-hQs,8
-cannect-1.0.3.dist-info/RECORD,,
+cannect/utils/tools.py,sha256=kJKNUvlpvwaRJ_DoO24e_0NBGAJ_eKxk4fxg-nnvNZw,7376
+cannect-1.0.4.dist-info/licenses/LICENSE,sha256=_UNFlbKK2ShYTDPH44e6OFWDtiLzYkDPnilDcrLaCG8,1064
+cannect-1.0.4.dist-info/METADATA,sha256=XFFbaO6Wg1R3Q-Gz8rL6wcYHGkv3ctPIjDYHCxEqD6c,61727
+cannect-1.0.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+cannect-1.0.4.dist-info/top_level.txt,sha256=QdGPQ02TsYi490A5C1BePgszlXQz7R9BijvgEP4-hQs,8
+cannect-1.0.4.dist-info/RECORD,,