Explorar el Código

qiita importer is uncomplete

yusuketk hace 7 años
padre
commit
6b6cccb6d3
Se han modificado 2 ficheros con 27 adiciones y 26 borrados
  1. 14 14
      lib/util/importer.js
  2. 13 12
      lib/util/restQiitaAPI.js

+ 14 - 14
lib/util/importer.js

@@ -74,26 +74,26 @@ module.exports = crowi => {
 
   const importPostsFromQiita = (pageNum, user, errors) => {
     return new Promise((resolve, reject) => {
-      esaClient.api.posts({page: pageNum, per_page: 100}, async(err, res) => { //QIITA
-        const nextPage = res.body.next_page;
-        const postsReceived = res.body.posts;
+      restQiitaAPI.getQiitaPages()
+      .then(function(res) {
+        const postsReceived = res;
+        const data = convertEsaDataForGrowi(postsReceived, user);
 
-        if (err) {
-          reject(`error in page ${pageNum}: ${err}`);
-        }
+        createGrowiPages(data)
+        .then(function(newErrors) {
+          errors.concat(newErrors);
+        });
 
-        const data = convertQiitaDataForGrowi(postsReceived, user);
-        const newErrors = await createGrowiPages(data);
+        // if (nextPage) {
+        //   return resolve(importPostsFromQiita(nextPage, user, errors.concat(newErrors)));
+        // }
 
-        if (nextPage) {
-          return resolve(importPostsFromQiita(nextPage, user, errors.concat(newErrors)));
-        }
-
-        resolve(errors.concat(newErrors));
+        resolve(errors);
+      }).catch(function(err) {
+        reject(err);
       });
     });
   };
-
   /**
    * Convert data into usable format for createGrowiPagesFromImports
    */

+ 13 - 12
lib/util/restQiitaAPI.js

@@ -23,8 +23,6 @@ module.exports = function(Team, Token) {
       options.path = `/api/v2/${path}`;
       const req = https.request(options, (res) => {
         res.on('data', (chunk) => {
-            // console.log(`${chunk}`);
-            console.log(`${chunk}`);
             resolve(chunk);
         });
       });
@@ -48,15 +46,18 @@ module.exports = function(Team, Token) {
       })
     });
   };
-      // tags: restAPI('tags'),
-      // templates: restAPI('templates'),
-      // projects: restAPI('projects'),
-      // users: restAPI('users'),
-      // comments: restAPI(`items/${item_id}/comments`),
-      // project_comments: restAPI(`projects/${project_id}/comments`),
-      // itemreactions: restAPI(`items/${item_id}/reactions`),
-      // comment_reactions: restAPI(`comments/${comment_id}/reactions`),
-      // project_reactions: restAPI(`projects/${project_id}/reactions`),
-      // items: restAPI('items'),
+
+  restQiitaAPI.getQiitaPages = function() {
+    return new Promise((resolve, reject) => {
+      restAPI('items', options)
+      .then(function(page){
+        resolve(JSON.parse(page.toString()));
+      })
+      .catch(function(err){
+        reject(err);
+      })
+    });
+  };
+
   return restQiitaAPI;
 }