Skip to content

Commit

Permalink
bugfix firm_info, clean up,
Browse files Browse the repository at this point in the history
  • Loading branch information
@liante0904
liante0904 committed Jul 16, 2024
1 parent c59adb2 commit 75fa831
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 40 deletions.
41 changes: 13 additions & 28 deletions main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,7 @@ def LS_parse(ARTICLE_BOARD_ORDER, TARGET_URL):

# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)
# print(firm_info)

# print('게시판 이름:', ARTICLE_BOARD_NAME) # 게시판 종류
print('게시글 제목:', FIRST_ARTICLE_TITLE) # 게시글 제목
print('게시글URL:', FIRST_ARTICLE_URL) # 주소
Expand Down Expand Up @@ -361,10 +359,8 @@ def ShinHanInvest_parse(ARTICLE_BOARD_ORDER, TARGET_URL):
# 연속키 데이터베이스화 작업
# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


# print(firm_info)
nNewArticleCnt = 0
sendMessageText = ''
# JSON To List
Expand Down Expand Up @@ -492,8 +488,7 @@ def KB_parse(ARTICLE_BOARD_ORDER, TARGET_URL):
# 연속키 데이터베이스화 작업
# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


nNewArticleCnt = 0
sendMessageText = ''
Expand Down Expand Up @@ -626,8 +621,7 @@ def NHQV_parse(ARTICLE_BOARD_ORDER, TARGET_URL):

# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


# print('게시판 이름:', ARTICLE_BOARD_NAME) # 게시판 종류
print('게시글 제목:', FIRST_ARTICLE_TITLE) # 게시글 제목
Expand Down Expand Up @@ -747,8 +741,7 @@ def HANA_parse(ARTICLE_BOARD_ORDER, TARGET_URL):

# # 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)

nNewArticleCnt = 0
sendMessageText = ''
for list in soupList:
Expand Down Expand Up @@ -849,8 +842,7 @@ def Samsung_parse(ARTICLE_BOARD_ORDER, TARGET_URL):

# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


print('게시판 이름:', ARTICLE_BOARD_NAME) # 게시판 종류
print('게시글 제목:', FIRST_ARTICLE_TITLE) # 게시글 제목
Expand Down Expand Up @@ -975,8 +967,7 @@ def Sangsanginib_parse(ARTICLE_BOARD_ORDER, TARGET_URL):
# 연속키 데이터베이스화 작업
# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


nNewArticleCnt = 0
sendMessageText = ''
Expand Down Expand Up @@ -1153,8 +1144,7 @@ def Shinyoung_parse(ARTICLE_BOARD_ORDER, TARGET_URL):
# 연속키 데이터베이스화 작업
# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


nNewArticleCnt = 0
sendMessageText = ''
Expand Down Expand Up @@ -1391,8 +1381,7 @@ def Miraeasset_parse(ARTICLE_BOARD_ORDER, TARGET_URL):

# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


print('게시판 이름:', ARTICLE_BOARD_NAME) # 게시판 종류
print('게시글 제목:', FIRST_ARTICLE_TITLE) # 게시글 제목
Expand Down Expand Up @@ -1524,8 +1513,7 @@ def Kiwoom_parse(ARTICLE_BOARD_ORDER, TARGET_URL):
# 연속키 데이터베이스화 작업
# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


nNewArticleCnt = 0
sendMessageText = ''
Expand Down Expand Up @@ -1629,8 +1617,7 @@ def Hmsec_parse(ARTICLE_BOARD_ORDER, TARGET_URL):
# 연속키 데이터베이스화 작업
# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)


nNewArticleCnt = 0
sendMessageText = ''
Expand Down Expand Up @@ -1754,8 +1741,7 @@ def Koreainvestment_selenium_parse(ARTICLE_BOARD_ORDER, TARGET_URL):
# 연속키 데이터베이스화 작업
# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)



nNewArticleCnt = 0
Expand Down Expand Up @@ -2052,8 +2038,7 @@ def DAOL_parse(ARTICLE_BOARD_ORDER, TARGET_URL):

# 연속키 데이터 저장 여부 확인 구간
firm_info = get_firm_info(sec_firm_order = SEC_FIRM_ORDER, article_board_order = ARTICLE_BOARD_ORDER)
print('SEC_FIRM_ORDER', SEC_FIRM_ORDER, 'ARTICLE_BOARD_ORDER', ARTICLE_BOARD_ORDER)
print(firm_info)



print('게시판 이름:', ARTICLE_BOARD_NAME) # 게시판 종류
Expand Down
44 changes: 32 additions & 12 deletions package/firm_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"미래에셋증권", # 8
"현대차증권", # 9
"키움증권", # 10
"", # 11
"", # 12
"한국투자증권", # 13
"다올투자증권" # 14
]
Expand Down Expand Up @@ -79,6 +81,12 @@
"스팟노트", # ARTICLE_BOARD_ORDER 2
"미국/선진국"], # ARTICLE_BOARD_ORDER 3

# SEC_FIRM_ORDER 11
[""], # ARTICLE_BOARD_ORDER 0

# SEC_FIRM_ORDER 12
[""], # ARTICLE_BOARD_ORDER 0

# SEC_FIRM_ORDER 13
["오늘의레포트"], # ARTICLE_BOARD_ORDER 0

Expand Down Expand Up @@ -135,14 +143,16 @@
[""], # ARTICLE_BOARD_ORDER 0

# SEC_FIRM_ORDER 5
[""], # ARTICLE_BOARD_ORDER 0,
[""], # ARTICLE_BOARD_ORDER 1,
[""], # ARTICLE_BOARD_ORDER 2,
["", # ARTICLE_BOARD_ORDER 0,
"", # ARTICLE_BOARD_ORDER 1,
""], # ARTICLE_BOARD_ORDER 2


# SEC_FIRM_ORDER 6
[""], # ARTICLE_BOARD_ORDER 0,
[""], # ARTICLE_BOARD_ORDER 1,
[""], # ARTICLE_BOARD_ORDER 2,
["", # ARTICLE_BOARD_ORDER 0,
"", # ARTICLE_BOARD_ORDER 1,
""], # ARTICLE_BOARD_ORDER 2


# SEC_FIRM_ORDER 7
[""], # ARTICLE_BOARD_ORDER 0,
Expand All @@ -151,15 +161,22 @@
[""], # ARTICLE_BOARD_ORDER 0,

# SEC_FIRM_ORDER 9
[""], # ARTICLE_BOARD_ORDER 0,
[""], # ARTICLE_BOARD_ORDER 1,
[""], # ARTICLE_BOARD_ORDER 2,
["", # ARTICLE_BOARD_ORDER 0,
"", # ARTICLE_BOARD_ORDER 1,
""], # ARTICLE_BOARD_ORDER 2


# SEC_FIRM_ORDER 10
["", # ARTICLE_BOARD_ORDER 0,
"", # ARTICLE_BOARD_ORDER 1,
"", # ARTICLE_BOARD_ORDER 2,
""], # ARTICLE_BOARD_ORDER 3,

# SEC_FIRM_ORDER 11
[""], # ARTICLE_BOARD_ORDER 0,

# SEC_FIRM_ORDER 12
[""], # ARTICLE_BOARD_ORDER 0,
[""], # ARTICLE_BOARD_ORDER 1,
[""], # ARTICLE_BOARD_ORDER 2,
[""], # ARTICLE_BOARD_ORDER 3,

# SEC_FIRM_ORDER 13
[""], # ARTICLE_BOARD_ORDER 0,
Expand All @@ -186,20 +203,23 @@ def get_firm_name(sec_firm_order):
try:
return firm_names[sec_firm_order]
except IndexError:
print(f"Invalid SEC_FIRM_ORDER: {sec_firm_order}")
return "Unknown Firm"

# 게시판 이름을 반환하는 함수
def get_board_name(sec_firm_order, article_board_order):
try:
return board_names[sec_firm_order][article_board_order]
except IndexError:
print(f"Invalid SEC_FIRM_ORDER: {sec_firm_order}, ARTICLE_BOARD_ORDER: {article_board_order}")
return "Unknown Board"

# 라벨 이름을 반환하는 함수
def get_label_name(sec_firm_order, article_board_order):
try:
return label_names[sec_firm_order][article_board_order]
except IndexError:
print(f"Invalid SEC_FIRM_ORDER: {sec_firm_order}, ARTICLE_BOARD_ORDER: {article_board_order}")
return "Unknown Label"

# 통합 정보를 반환하는 함수
Expand Down

0 comments on commit 75fa831

Please sign in to comment.