xython 4.5.2__tar.gz → 4.5.4__tar.gz

{xython-4.5.2/src/xython.egg-info → xython-4.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xython
-Version: 4.5.2
+Version: 4.5.4
 Summary: xython package
 Author-email: "SJ.Park" <sjpkorea@naver.com>
 License: MIT

{xython-4.5.2 → xython-4.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xython"
-version = "4.5.2"
+version = "4.5.4"
 description = "xython package"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.8"

{xython-4.5.2 → xython-4.5.4}/src/xython/xy_auto.py

@@ -186,7 +186,7 @@ class xy_auto:
 	"""
     def __init__(self):
         self.varx = xy_common.xy_common().varx
-        self.xycolor = xy_color.xy_color()
+        self.colorx = xy_color.xy_color()
 
     def activate_edge_tab_by_title(self, keyword):
         """엣지 웹브라우저의 탭을 선택하는 것"""
@@ -493,8 +493,8 @@ class xy_auto:
         handle = user32.GetDesktopWindow()
         hdc = user32.GetDC(handle)
         null_brush = gdi32.GetStockObject(5)
-        hex_color = self.xycolor.change_xcolor_to_rgb(xcolor)
-        red_pen = gdi32.CreatePen(0, 2, self.xycolor.change_rgb_to_hex_rgb(hex_color[0], hex_color[1], hex_color[2]))
+        hex_color = self.colorx.change_xcolor_to_rgb(xcolor)
+        red_pen = gdi32.CreatePen(0, 2, self.colorx.change_rgb_to_hex_rgb(hex_color[0], hex_color[1], hex_color[2]))
         old_brush = gdi32.SelectObject(hdc, null_brush)
         old_pen = gdi32.SelectObject(hdc, red_pen)
         gdi32.Rectangle(hdc, int(left), int(top), int(right), int(bottom))

{xython-4.5.2 → xython-4.5.4}/src/xython/xy_chrome.py

@@ -68,9 +68,7 @@ class xy_chrome:
         auto_connect: True = 자동으로 연결/실행, False = 수동
         """
         # 공통 변수 설정
-        self.xyutil = xy_util.xy_util()
-        self.xyre = xy_re.xy_re()
-
+        self.utilx = xy_util.xy_util()
         self.chrome_paths = self._find_chrome_paths()
 
         self.port = port
@@ -1300,7 +1298,7 @@ class xy_chrome:
         html_code = self.get_html_code("https://info.bptc.co.kr/content/od/frame/yard_new_empty_frame_od_kr.jsp?p_id=EMPT_NE_KR&snb_num=8&snb_div=service&pop_ok=Y")
         l3d = self.html_tables_to_list(html_code)
         result = self.make_list_for_1(l3d)
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_2(self):
@@ -1313,7 +1311,7 @@ class xy_chrome:
             con_type = l1d[0][2:]
             for index, value in enumerate(l1d[1:]):
                 result.append([port, con_type, con_size, l2d[0][index + 1], value])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_3(self):
@@ -1327,7 +1325,7 @@ class xy_chrome:
                     con_size = l2d[0][index + 1][:2]
                     con_type = l2d[0][index + 1][2:]
                     result.append([port, con_type, con_size, l1d[0], value])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_4(self):
@@ -1341,7 +1339,7 @@ class xy_chrome:
                     con_size = l2d[0][index + 1][:2]
                     con_type = l2d[0][index + 1][2:]
                     result.append([port, con_type, con_size, l1d[0], value])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_5(self):
@@ -1356,7 +1354,7 @@ class xy_chrome:
                     con_size = l2d[0][index + 1][:2]
                     con_type = l2d[0][index + 1][2:]
                     result.append([port, con_type, con_size, l1d[0], value])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_6(self):
@@ -1371,14 +1369,14 @@ class xy_chrome:
                     con_size = l2d[0][index + 1]
                     con_type = ""
                     result.append([port, con_type, con_size, l1d[0], value])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_7(self):
         html_code = self.get_html_code("https://snct.sun-kwang.co.kr/infoservice/webpage/main/mainPage_iframe.jsp?type=IFRAME_EMPTY_ALL")
         l2d = self.html_tables_to_list(html_code)[-1]
         result = self.make_list_7(l2d)
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_9(self):
@@ -1405,7 +1403,7 @@ class xy_chrome:
                 l2d.append(str(one_line).split("\t"))
         for no in range(1, len(l2d[0])):
             result.append(["style10", l2d[2][no], l2d[1][no], l2d[0][no], l2d[3][no]])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_11(self):
@@ -1426,7 +1424,7 @@ class xy_chrome:
             con_type = l1d[0][2:]
             for index, value in enumerate(l1d[1:]):
                 result.append(["style11", con_type, con_size, l2d[0][index + 1], value])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_12(self):
@@ -1452,7 +1450,7 @@ class xy_chrome:
             for index, value in enumerate(l1d):
                 result.append(["style12", "", l2d[0][index] if index < len(l2d[0]) else "", l1d[0], value])
 
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_13(self):
@@ -1475,7 +1473,7 @@ class xy_chrome:
                 # [FIX] 기존: ["style13", "DRY", l2d[1][index], l1d[0], value]
                 #       수정: con_size, con_type 을 정상 사용, 선사는 l2d[1][index+1]
                 result.append(["style13", con_type, con_size, l2d[1][index + 1] if (index + 1) < len(l2d[1]) else "", value])
-        self.xyutil.print_one_by_one(result)
+        self.utilx.print_one_by_one(result)
         return result
 
     def port_15(self):

{xython-4.5.2 → xython-4.5.4}/src/xython/xy_color.py

@@ -69,7 +69,15 @@ class xy_color:
             # xcolor에서 - 추출
             re_com4 = re.compile(r"[-]+")
             xcolor_minus = re_com4.findall(input_xcolor)
-            if xcolor_minus: result[4] = len(xcolor_minus[0])
+            if xcolor_minus:
+                result[4] = len(xcolor_minus[0])
+
+            if result[1] and result[2] and (result[3]==1 or result[4]==1):
+                # "red-50, red50-, red50+, red+50이라는 형태도 사용이 가능하게 하는것
+                if result[3]:
+                    result[2] = 50 +(result[2]/2)
+                elif result[4]:
+                    result[2] = 50 - (result[4] / 2)
         return result
 
     def add_alpha_to_rgb(self, input_rgb, alpha=255):

{xython-4.5.2 → xython-4.5.4}/src/xython/xy_db.py

@@ -15,8 +15,8 @@ class xy_db:
 
 	def __init__(self, db_name=""):
 		self.db_name = db_name
-		self.xyutil = xy_util.xy_util()
-		self.xyexcel = xy_excel.xy_excel()
+		self.utilx = xy_util.xy_util()
+		self.excel = xy_excel.xy_excel()
 
 		self.table_name = ""
 		self.con = ""  # sqlite db에 연결되는 것
@@ -289,8 +289,8 @@ class xy_db:
 		:return:
 		"""
 
-		input_l2d = self.xyutil.check_data_types_for_l2d(input_l2d)  # 2차원이 아닐때 2차원으로 만들러 주는것
-		listdb = self.xyutil.change_xylist_to_yxlist(input_l2d)
+		input_l2d = self.utilx.check_data_types_for_l2d(input_l2d)  # 2차원이 아닐때 2차원으로 만들러 주는것
+		listdb = self.utilx.change_xylist_to_yxlist(input_l2d)
 		return listdb
 
 	def change_list_to_listdb(self, input_list):
@@ -340,8 +340,8 @@ class xy_db:
 		temp = []
 		result = {}
 		if type(listdb) == type([]):
-			listdb = self.xyutil.check_data_types_for_l2d(listdb)  # 2차원이 아닐때 2차원으로 만들러 주는것
-			listdb = self.xyutil.change_l2d_to_l2d_as_same_len(listdb)  # 길이가 다를때 제일 긴것으로 똑같이 만들어 주는것
+			listdb = self.utilx.check_data_types_for_l2d(listdb)  # 2차원이 아닐때 2차원으로 만들러 주는것
+			listdb = self.utilx.change_l2d_to_l2d_as_same_len(listdb)  # 길이가 다를때 제일 긴것으로 똑같이 만들어 주는것
 			# 별도로 column의 제목이 없다면, 1번부터 시작하는 번호를 넣어준다
 			if col_list == "":
 				for index, l1d in enumerate(listdb):
@@ -634,7 +634,7 @@ class xy_db:
 		:param path: 경로
 		:return:
 		"""
-		db_name_all = self.xyutil.get_all_filename_in_folder(path)
+		db_name_all = self.utilx.get_all_filename_in_folder(path)
 		if db_name in db_name_all:
 			result = db_name
 		else:
@@ -1305,19 +1305,19 @@ class xy_db:
 		x_len = 10
 		y_len = 12
 
-		self.xyexcel.new_sheet()
+		self.excel.new_sheet()
 		for index in range(1, y_len + 1):
 			y_title_list.append("title_" + str(index))
 
-		self.xyexcel.write_l1d_from_cell("", [1, 2], y_title_list)
+		self.excel.write_l1d_from_cell("", [1, 2], y_title_list)
 		for no1 in range(1, x_len + 1):
 			for no2 in range(1, y_len + 1):
-				self.xyexcel.write_value_in_cell("", [no1 + 1, no2 + 1], no1 * 10 + no2)
+				self.excel.write_value_in_cell("", [no1 + 1, no2 + 1], no1 * 10 + no2)
 
 		x_title_list = []
 		for index in range(1, x_len + 1):
 			x_title_list.append("줄_" + str(index))
-		self.xyexcel.write_l1d_from_cell_as_yline("", [2, 1], x_title_list)
+		self.excel.write_l1d_from_cell_as_yline("", [2, 1], x_title_list)
 
 	def make_cursor_for_sqlite_db(self, db_name=""):
 		"""
@@ -1431,7 +1431,7 @@ class xy_db:
 		"""
 		result = []
 		line_len = len(input_l2d)
-		y_len = self.xyutil.get_max_len_for_l2d(input_l2d)
+		y_len = self.utilx.get_max_len_for_l2d(input_l2d)
 		title_list = []
 		type_list = []
 		for no in range(1, y_len + 1):
@@ -1474,7 +1474,7 @@ class xy_db:
 		:param col_list: y컬럼 이름들
 		:return:
 		"""
-		sql_columns = self.xyutil.change_l1d_to_text_with_chain_word(col_list, ", ")
+		sql_columns = self.utilx.change_l1d_to_text_with_chain_word(col_list, ", ")
 		sql_values = "?," * len(col_list)
 		result = "insert into %s (%s) values (%s)" % (table_name, sql_columns, sql_values[:-1])
 		return result
@@ -1992,7 +1992,7 @@ class xy_db:
 		if y_title_s == "":
 			sql_columns = "*"
 		else:
-			sql_columns = self.xyutil.change_l1d_to_text_with_chain_word(y_title_s, ", ")
+			sql_columns = self.utilx.change_l1d_to_text_with_chain_word(y_title_s, ", ")
 		if condition == "all":
 			lim_no = 100
 		else:
@@ -2168,7 +2168,7 @@ class xy_db:
 	def split_l2d_as_data_x_title_yline_title(self, input_l2d, x_title_len, y_title_len):
 		"""
 		2줄이상의 제목이 들어갈수있을것같아, 2차원의 자료로 만들었다
-		l2d = self.xyutil.check_l2d(input_l2d)
+		l2d = self.utilx.check_l2d(input_l2d)
 
 		:param input_l2d:
 		:param x_title_len:
@@ -2232,8 +2232,8 @@ class xy_db:
 		"""
 		col_list = input_df.columns.values.tolist()
 		value_list = input_df.values.tolist()
-		self.xyexcel.write_l1d_from_cell_as_yline("", xy, col_list)
-		self.xyexcel.write_value_in_range_as_speedy("", [xy[0] + 1, xy[1]], value_list)
+		self.excel.write_l1d_from_cell_as_yline("", xy, col_list)
+		self.excel.write_value_in_range_as_speedy("", [xy[0] + 1, xy[1]], value_list)
 
 	def write_dataframe_to_sqlite(self, db_name, table_name, input_df):
 		"""

{xython-4.5.2 → xython-4.5.4}/src/xython/xy_edge.py

@@ -3700,20 +3700,18 @@ class xy_edge:
         if not attach_area:
             print("첨부파일 없음")
             return
-        inks = attach_area.eles('tag:a')
+        links = attach_area.eles('tag:a')
         print(f'총 {len(links)}개 파일 발견\n')
 
-        for  link in enumerate(Links):
-            print(f"[{i+1}/{len(links)}] {link.text.strip()}클릭")
-
+        for  link in enumerate(links):
             try:
-                Link.click()
+                link[1].click()
             except Exception as e:
-                print(f'?? 클릭 오류: {e}')
+                print(f'클릭 오류: {e}')
                 continue
             time.sleep(0.5) #클릭 간 짧은 간격만 줌
 
-        print('*클릭 완료! 브라우저가 알아서 다운로드 중...')
+        print('클릭 완료! 브라우저가 알아서 다운로드 중...')
 
     def save_page_as_pdf(self, filename=None, folder=None):
         # 현재 연결된 페이지를 PDF로