diff --git a/source/tomntoms.py b/source/tomntoms.py
index aa070ff..6313bac 100644
--- a/source/tomntoms.py
+++ b/source/tomntoms.py
@@ -1,97 +1,112 @@
-import urllib3
-from bs4 import BeautifulSoup as bs
-from selenium import webdriver
-from selenium.webdriver.common.by import By
-import json
-import os
-import time
-import datetime
-from selenium.webdriver.common.keys import Keys
-
-import re
-
-cwd = os.getcwd()
-print(cwd)
-html = 'https://tomntoms.com/menu/menu.html'
-# driver = webdriver.Chrome(os.path.join(cwd, "/chromedriver"))
-driver = webdriver.Chrome(cwd + "/chromedriver")
-driver.implicitly_wait(5) #로딩시간에 따라 변경하거나, 없애도 됨
-driver.maximize_window()
-driver.get(html)
-
-
-
-driver.implicitly_wait(3)
-
-prev_height = driver.execute_script('return document.body.scrollHeight')
-#스크롤 내리기 -> 필요 없을 시, 없애도 무방함.
-for i in range(10):
- driver.execute_script('window.scrollTo(0, document.body.scrollHeight)')
- time.sleep(1)
-
- current_height = driver.execute_script('return document.body.scrollHeight')
-
- if prev_height == current_height:
- break
-time.sleep(3)
-
-
-
-data = dict()
-date = datetime.datetime.now().strftime("%Y년 %m월 %d일 %H시 %M분 %S.%f초")
-data["date"] = date
-data["count"] = 0
-data["item"] =[]
-
-#11번 더보기 누르기
-for i in range(11):
- driver.find_element(By.XPATH,'//*[@id="plusmode_tb_product_paging_area"]/button').send_keys(Keys.ENTER)
-
-# Parse html
-bsObject = bs(driver.page_source, "html.parser")
-
-menu_list_li = bsObject.select('div#plusmode_tb_product_listbody > div')
-
-
-for item in menu_list_li:
-
- name = item.select('div.title-bx h3.tit')[0].text.strip()
- item_data=re.findall('(.+?)',str(item.select('tbody')[0]))
-
-
- size = 0
- kcal = 0
- j=0
- for i in item_data:
- j+=1
- if i=='1회 제공량':
- size=int(re.match(r'\d+', item_data[j])[0])
-
- if i=='열량':
- if item_data[j] ==' - ' or item_data[j] =='-':
- kcal=0
- else:
- kcal=int(re.findall(r'\d+', item_data[j])[0])
-
- caffeine=0
- j=0
- for i in item_data:
- j+=1
- if i=='카페인':
- if item_data[j] =='-':
- caffeine=0
- else:
- caffeine=int(re.findall(r'\d+', item_data[j])[0])
-
-
- temp=""
- img=""
-
- data['item'].append({"drink_name" : name, "temp" : temp, "img":img, "size":str(size), "kcal":kcal, "caffeine":caffeine})
- data['count'] += 1
-
-
-with open((cwd+"/data/data_tomntoms.json"),"w",encoding='utf-8') as file:
- json.dump(data, file, indent='\t', ensure_ascii=False)
-
-print('done')
\ No newline at end of file
+import urllib3
+from bs4 import BeautifulSoup as bs
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+import json
+import os
+import time
+import datetime
+from selenium.webdriver.common.keys import Keys
+
+import re
+
+cwd = os.getcwd()
+print("=========",cwd)
+html = 'https://tomntoms.com/menu/menu.html'
+# driver = webdriver.Chrome(os.path.join(cwd, "/chromedriver"))
+driver = webdriver.Chrome(cwd + "/chromedriver")
+driver.implicitly_wait(5) #로딩시간에 따라 변경하거나, 없애도 됨
+driver.maximize_window()
+driver.get(html)
+
+
+
+driver.implicitly_wait(3)
+
+prev_height = driver.execute_script('return document.body.scrollHeight')
+#스크롤 내리기 -> 필요 없을 시, 없애도 무방함.
+for i in range(10):
+ driver.execute_script('window.scrollTo(0, document.body.scrollHeight)')
+ time.sleep(1)
+
+ current_height = driver.execute_script('return document.body.scrollHeight')
+
+ if prev_height == current_height:
+ break
+time.sleep(3)
+
+
+
+data = dict()
+date = datetime.datetime.now().strftime("%Y년 %m월 %d일 %H시 %M분 %S.%f초")
+data["date"] = date
+data["count"] = 0
+data["item"] =[]
+
+#11번 더보기 누르기
+for i in range(11):
+ driver.find_element(By.XPATH,'//*[@id="plusmode_tb_product_paging_area"]/button').send_keys(Keys.ENTER)
+
+# Parse html
+bsObject = bs(driver.page_source, "html.parser")
+
+menu_list_li = bsObject.select('div#plusmode_tb_product_listbody > div')
+
+
+for item in menu_list_li:
+
+ name = item.select('div.title-bx h3.tit')[0].text.strip()
+ if '요거트' in name:
+ continue
+ item_data=re.findall('(.+?)',str(item.select('tbody')[0]))
+
+
+ size = 0
+ kcal = 0
+ j=0
+ for i in item_data:
+ j+=1
+ if i=='1회 제공량':
+ size=int(re.match(r'\d+', item_data[j])[0])
+
+
+
+ if size == 0 or size == 300 or size ==310 :
+ size='톨'
+ elif size == 410 or size ==430 or size ==470 :
+ size='그란데'
+ elif size==30 or size==50 or size ==40:
+ size='샷'
+
+
+
+ if i=='열량':
+ if item_data[j] ==' - ' or item_data[j] =='-':
+ kcal=0
+ else:
+ kcal=int(re.findall(r'\d+', item_data[j])[0])
+
+ caffeine=0
+ j=0
+ for i in item_data:
+ j+=1
+ if i=='카페인':
+ if item_data[j] =='-':
+ caffeine=0
+ else:
+ caffeine=int(re.findall(r'\d+', item_data[j])[0])
+
+
+ temp=""
+ img=""
+
+ data['item'].append({"drink_name" : name, "temp" : temp, "img":img, "size":size, "kcal":kcal, "caffeine":caffeine})
+ data['count'] += 1
+
+
+with open((cwd+"/data/data_tomntoms.json"),"w",encoding='utf-8') as file:
+ json.dump(data, file, indent='\t', ensure_ascii=False)
+
+print('done')
+#:\Users\User\Desktop\WebCrawler-megacoffee\cafe-crawl-data\data
+#C:\Users\User\Desktop\WebCrawler-megacoffee\cafe-crawl-data\source\tomntoms.py