diff --git a/StockCrawler.py b/StockCrawler.py index c74e1cc..40ea361 100644 --- a/StockCrawler.py +++ b/StockCrawler.py @@ -30,8 +30,6 @@ class StockCrawlerDaily: RESOURCE_PATH = os.path.join(self.PROJECT_HOME, 'resources') stockFileName = os.path.join(RESOURCE_PATH, 'stock.db') - self.bot.sendMsg("1. start to crawl...") - ERROR_COUNT = 0 while ERROR_COUNT < 3: try: @@ -53,7 +51,6 @@ class StockCrawlerDaily: try: print("\n[증시자금동향 (신용잔고, 펀드자금 잔고)]") metaCrawler.crawl_money_trend(stockFileName) - self.bot.sendMsg("2. done meta data...") break except: ERROR_COUNT += 1 @@ -66,7 +63,6 @@ class StockCrawlerDaily: try: print("\n[국내 시장금리]") metaCrawler.crawl_interest_rates(stockFileName) - self.bot.sendMsg("3. done interest rates...") break except: ERROR_COUNT += 1 @@ -79,7 +75,6 @@ class StockCrawlerDaily: try: print("\n[투자자별 매매동향(Trading_Trend)]") metaCrawler.crawl_trading_trend(stockFileName) - self.bot.sendMsg("4. done trade trend...") break except: ERROR_COUNT += 1 @@ -92,7 +87,6 @@ class StockCrawlerDaily: try: print("\n[환율 (USD, JPY, EUR, CNY, HKD, GBP, CAD, CHF, AUD, THB, INR, PHP, BRL, VND, RUB, TWD')]") metaCrawler.crawl_exchange(stockFileName) - self.bot.sendMsg("5. done exchange data...") break except: ERROR_COUNT += 1 @@ -105,7 +99,6 @@ class StockCrawlerDaily: try: print("\n[원유 (WTI), 국제금, COPPER, NATURALGAS, CORN, SOYBEAN 등]") metaCrawler.crawl_meterials(stockFileName) - self.bot.sendMsg("6. done additional data...") break except: ERROR_COUNT += 1 @@ -117,15 +110,12 @@ class StockCrawlerDaily: print("\n[국내 ETF 수집]") stockCrawler.crawl_etf_stocks(stockFileName) - self.bot.sendMsg("7. done etf stocks...") print("\n[국내 종목 수집]") stockCrawler.crawl_stocks(stockFileName) - self.bot.sendMsg("8. done stocks...") print("\n[US 종목 수집]") stockCrawler.crawl_special_stocks(stockFileName) - self.bot.sendMsg("9. done US stocks...") analyzerSqlite = AnalyzerSqlite(stockFileName) @@ -146,8 +136,11 @@ class StockCrawlerDaily: shutil.rmtree(outPath) os.mkdir(outPath) - analyzerSqlite.findCandidates(outPath) - self.bot.sendMsg("10. done decision...") + buy_stock_list = analyzerSqlite.findCandidates(outPath) + buy_stock_str = '' + for i, item in enumerate(buy_stock_list): + buy_stock_str += str(i+1) + ". " + item['CODE'] + "(" + item['NAME'] + ")\n" + self.bot.sendMsg("{}".format(buy_stock_str)) return diff --git a/stock/analysis/AnalyzerSqlite.py b/stock/analysis/AnalyzerSqlite.py index 2833490..9f8422c 100644 --- a/stock/analysis/AnalyzerSqlite.py +++ b/stock/analysis/AnalyzerSqlite.py @@ -621,6 +621,8 @@ class AnalyzerSqlite: # 후보 찾기 def findCandidates(self, outPath): + buy_stock_list = [] + stockTableName = 'stock' fnguideTableName = 'fnguide' @@ -654,7 +656,9 @@ class AnalyzerSqlite: # 종목 상태 체크 분석 self.writeFile(outPath, CODE, NAME, top, stock_daily, bsLine) - return + buy_stock_list.append({'CODE': CODE, 'NAME': NAME}) + + return buy_stock_list if __name__ == "__main__":