merge feature/data

김대선
Commit f186ea92838465a969d455abf21bdced6187009a f186ea92 2 parents 3ef91d08 694647de
Showing 2 changed files with 70 additions and 41 deletions
functions/dataFunctions.js
functions/programmersFunction.js
--- a/functions/dataFunctions.js
View file @f186ea9
+++ b/functions/dataFunctions.js
View file @f186ea9
 const fs = require('fs')
 const functions = require('./function')
-const read = () =>{
+let status = false
-    const data = []
-    let title = ""
-    let tags = []
-    let url = ""
-    let companyName = ""
-    const today = new Date()
-    const string = fs.readFileSync(`./datas/${today.getFullYear()}.${today.getMonth()}.${today.getDate()}`, 'utf-8', 'r')
-    const stringArray = string.split('\n')
-    const size = stringArray.length
-    for(let i = 0 ; i < size; i++){
-        if( i % 4 == 0){
-            title = stringArray[i].replace("title : ", "")
-        }
-        else if( i % 4 == 1){
-            tags = stringArray[i].replace("tags : ", "").split(",")
-        }
-        else if( i % 4 == 2){
-            url = stringArray[i].replace("url : ", "")
-        }
-        else if ( i % 4 == 3){
-            companyName = stringArray[i].replace("companyName : ", "")
-            data.push({
-                title : title,
-                tags : tags,
-                url : url,
-                companyName : companyName
-            })
-        }
-    }
-    return data
-}
 const save = async()=> {
+    if(status){
+        return
+    }
+    else if(!status){
+        status = true
+    }
     try {
         let string = ""
         let data = await functions.getKakaoData()
@@ -61,7 +36,10 @@ const save = async()=> {
             temp = "companyName : " + i.companyName
             string = string + temp + "\n"
         }
+<<<<<<< HEAD
+=======
+>>>>>>> 694647de3d94a82e2485ce202270c0702aaed6f7
         data = await functions.getProgrammersFunction()
         temp = ""
         for(let i of data){
@@ -77,18 +55,73 @@ const save = async()=> {
         const today = new Date()
         fs.writeFile(`./datas/${today.getFullYear()}.${today.getMonth()}.${today.getDate()}`, string, 'utf-8', (err)=>{
+            status = false
             if(err){
                 console.log("파일저장시에 오류")
-                console.log(err)
-                save()
             }
             else console.log("저장완료!")
         })
     } catch (error) {
-        console.log("데이터 가져오는 과정에서 오류")
+        status = false
-        console.log(error)
+        console.log("파일저장시에 오류")
+    }
+}
+
+const read = () =>{
+    const data = []
+    let title = ""
+    let tags = []
+    let url = ""
+    let companyName = ""
+    // const today = new Date()
+    const today = new Date()
+    let string
+    try {
+        string = fs.readFileSync(`./datas/${today.getFullYear()}.${today.getMonth()}.${today.getDate()}`, 'utf-8', 'r')
+    } catch (error) {
         save()
+        if(today.getDate()-1 == 0){
+            if([1, 3, 5, 7, 8, 10, 12].includes(today.getMonth() - 1)){
+                string = fs.readFileSync(`./datas/${today.getFullYear()}.${today.getMonth() - 1}.${31}`, 'utf-8', 'r')
+            }
+            else if([4, 6, 9, 11].includes(today.getMonth() - 1)){
+                string = fs.readFileSync(`./datas/${today.getFullYear()}.${today.getMonth()}.${30}`, 'utf-8', 'r')
+            }
+            else if (2 == today.getMonth() - 1){
+                string = fs.readFileSync(`./datas/${today.getFullYear()}.${today.getMonth()}.${28}`, 'utf-8', 'r')
+            }
+            else if (0 == today.getMonth() - 1){
+                string = fs.readFileSync(`./datas/${today.getFullYear() - 1}.${12}.${31}`, 'utf-8', 'r')
+            }
+        }
+        else{
+            string = fs.readFileSync(`./datas/${today.getFullYear()}.${today.getMonth()}.${today.getDate()-1}`, 'utf-8', 'r')
+        }
     }
+    return string
+    const stringArray = string.split('\n')
+    const size = stringArray.length
+    for(let i = 0 ; i < size; i++){
+        if( i % 4 == 0){
+            title = stringArray[i].replace("title : ", "")
+        }
+        else if( i % 4 == 1){
+            tags = stringArray[i].replace("tags : ", "").split(",")
+        }
+        else if( i % 4 == 2){
+            url = stringArray[i].replace("url : ", "")
+        }
+        else if ( i % 4 == 3){
+            companyName = stringArray[i].replace("companyName : ", "")
+            data.push({
+                title : title,
+                tags : tags,
+                url : url,
+                companyName : companyName
+            })
+        }
+    }
+    return data
 }
 module.exports = {
--- a/functions/programmersFunction.js
View file @f186ea9
+++ b/functions/programmersFunction.js
View file @f186ea9
@@ -57,13 +57,10 @@ const getData = async ()=>{
             decodeEntities : true
         }
     }).replace(/(<([^>]+)>)*(\\t)?/gi, "")
-    console.log(final)
     while(true){
         await page.goto(`https://programmers.co.kr/job?page=${count}`)
         content = await page.content()
-        console.log( final, count)
         if(final < count){
-            console.log("finish", result.length)
             break;
         }
         $ = cheerio.load(content, {decodeEntities: true})
@@ -78,7 +75,6 @@ const getData = async ()=>{
                 }
             })
             if(item ==''){
-                console.log("break!!!!")
                 break;
             } 
             item = item.split("</div>`")
@@ -88,7 +84,7 @@ const getData = async ()=>{
         result = result.concat(await makeObject(resArr))
         count = count + 1
     }
-    console.log(result)
+    console.log("kakao : ", result.length)
     return result
 }