dongnelibrary 0.2.3 → 0.2.5

package/README.md

@@ -1,14 +1,11 @@
 [![NPM Version][npm-image]][npm-url]
-[![Travis Build][travis-build-image]][travis-build-url]
 [![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php)
 
 # DongneLibrary
 
-> 도서관 책을 빌릴 수 있는지 확인하는 프로그램
-
+> 도서관 책을 빌릴 수 있는지 검색
 
 도서관 이름을 생략하면 모든 도서관을 검색한다.
-[블로그](https://agvim.wordpress.com/2017/01/20/check-if-a-library-book-was-rented/)에서 간단한 설명을 볼 수 있다.
 
 ## install with git
 
@@ -59,38 +56,38 @@ dongne () {
     npm install dongnelibrary
 
 ```javascript
-const dl = require('dongnelibrary');
-dl.search({
-  title: 'javascript',
-  libraryName: ['여주','판교']
-}, function (err, book) {
-  console.log(book.libraryName + ' "' + book.title + '"');
-  book.booklist.forEach(function (book) {
-    console.log((book.exist?' ✓  ':' ✖  ') +' '+ book.title);
-  });
-}, function (err, books) {
-  console.log(books.length + ' 개의 도서관을 검색했습니다.');
-});
+const dl = require("dongnelibrary");
+dl.search(
+  {
+    title: "javascript",
+    libraryName: ["여주", "판교"],
+  },
+  function (err, book) {
+    console.log(book.libraryName + ' "' + book.title + '"');
+    book.booklist.forEach(function (book) {
+      console.log((book.exist ? " ✓  " : " ✖  ") + " " + book.title);
+    });
+  },
+  function (err, books) {
+    console.log(books.length + " 개의 도서관을 검색했습니다.");
+  },
+);
 ```
 
 ## 검색 가능한 도서관
 
-* [경기교육통합도서관][gg-url] (경기중앙교육도서관,경기평택교육도서관,경기광주교육도서관,경기여주가남교육도서관,경기포천교육도서관,경기김포교육도서관,경기과천교육도서관,경기성남교육도서관,경기화성교육도서관,경기의정부교육도서관,경기평생교육학습관)
-* [군포시도서관][gunpo-url] (산본도서관,당동도서관,대야도서관,어린이도서관,이동도서관,중앙도서관,누리천문대,시청북카페밥상머리,부곡도서관,당정문화도서관,동화나무어린이도서관,금정작은도서관,재궁꿈나무도서관,궁내동작은도서관,노루목작은도서관,버드나무에부는바람작은도서관,꿈쟁이도서관,우리마을도서관,북카페사랑아이엔지,산본역도서관,하늘정원작은도서관,꿈이지,꿈드림작은도서관,여담작은도서관)
-* [성남시도서관][snlib-url] (논골도서관,중원어린이도서관,중앙도서관,분당도서관,구미도서관,해오름도서관,중원도서관,무지개도서관,판교도서관,위례도서관,수정도서관,책테마파크도서관,운중도서관,서현도서관,복정도서관,판교어린이도서관)
-* [오산시도서관][osan-url] (중앙도서관,꿈두레도서관,초평도서관,햇살마루도서관,청학도서관,양산도서관,소리울도서관,무지개도서관,고현초꿈키움도서관,쌍용예가시민개방도서관)
-* [화성시립도서관][hscity-url] (남양도서관,태안도서관,삼괴도서관,병점도서관,샘내도서관,두빛나래도서관,봉담도서관,둥지나래도서관,목동이음터도서관,기아행복마루도서관,동탄복합문화센터도서관,송산도서관,정남도서관,비봉도서관,진안도서관,중앙이음터도서관,양감도서관,다원이음터도서관,송린이음터도서관,팔탄도서관,마도도서관,봉담커피앤북도서관,왕배푸른숲도서관,노을빛도서관,서연이음터도서관,호연이음터도서관,늘봄이음터도서관)
-* [수원시도서관][suwon-url] (선경도서관,중앙도서관,영통도서관,슬기샘도서관,바른샘도서관,지혜샘도서관,서수원도서관,북수원도서관,태장마루도서관,한아름도서관,반달어린이도서관,사랑샘도서관,희망샘도서관,화홍어린이도서관,대추골도서관,한림도서관,창룡도서관,버드내도서관,광교홍재도서관,호매실도서관,일월도서관,화서다산도서관,광교푸른숲도서관,매여울도서관,망포글빛도서관)
+- [경기교육통합도서관][gg-url] (경기중앙교육도서관,경기평택교육도서관,경기광주교육도서관,경기여주가남교육도서관,경기포천교육도서관,경기김포교육도서관,경기과천교육도서관,경기성남교육도서관,경기화성교육도서관,경기의정부교육도서관,경기평생교육학습관)
+- [군포시도서관][gunpo-url] (산본도서관,당동도서관,대야도서관,어린이도서관,이동도서관,중앙도서관,누리천문대,시청북카페밥상머리,부곡도서관,당정문화도서관,동화나무어린이도서관,금정작은도서관,재궁꿈나무도서관,궁내동작은도서관,노루목작은도서관,버드나무에부는바람작은도서관,꿈쟁이도서관,우리마을도서관,북카페사랑아이엔지,산본역도서관,하늘정원작은도서관,꿈이지,꿈드림작은도서관,여담작은도서관)
+- [성남시도서관][snlib-url] (논골도서관,중원어린이도서관,중앙도서관,분당도서관,구미도서관,해오름도서관,중원도서관,무지개도서관,판교도서관,위례도서관,수정도서관,책테마파크도서관,운중도서관,서현도서관,복정도서관,판교어린이도서관)
+- [오산시도서관][osan-url] (중앙도서관,꿈두레도서관,초평도서관,햇살마루도서관,청학도서관,양산도서관,소리울도서관,무지개도서관,고현초꿈키움도서관,쌍용예가시민개방도서관)
+- [화성시립도서관][hscity-url] (남양도서관,태안도서관,삼괴도서관,병점도서관,샘내도서관,두빛나래도서관,봉담도서관,둥지나래도서관,목동이음터도서관,기아행복마루도서관,동탄복합문화센터도서관,송산도서관,정남도서관,비봉도서관,진안도서관,중앙이음터도서관,양감도서관,다원이음터도서관,송린이음터도서관,팔탄도서관,마도도서관,봉담커피앤북도서관,왕배푸른숲도서관,노을빛도서관,서연이음터도서관,호연이음터도서관,늘봄이음터도서관)
+- [수원시도서관][suwon-url] (선경도서관,중앙도서관,창룡도서관,화서다산도서관,호매실도서관,서수원도서관,한림도서관,버드내도서관,북수원도서관,대추골도서관,일월도서관,광교홍재도서관,태장마루도서관,광교푸른숲도서관,매여울도서관,망포글빛도서관,슬기샘도서관,지혜샘어린이도서관,바른샘어린이도서관,한아름도서관,반달어린이도서관,사랑샘도서관,희망샘도서관)
 
 ## 마무리
 
 [온라인에서][sample-url] 테스트 할 수 있으며 명령어가 불편하다면 [웹 서비스][web-ui-url]를 사용할 수 있다.
-웹 서비스가 느리다면 검색 서버를 [로컬에 설치][dongnelibraryspa] 할 수 있다.
 [Web API 서비스][web-api]도 지원한다.
 
-[![SPA for dongnelibrary](https://agvim.files.wordpress.com/2017/07/dongne23.png?w=128)](https://dongne.herokuapp.com/)
-[![APP for dongnelibrary](https://agvim.files.wordpress.com/2019/06/dlserver.png?w=128)](https://dlserver.herokuapp.com/app/)
-
 ## Test
 
     npm test
@@ -105,16 +102,12 @@ dl.search({
 [dongnelibraryspa]: https://github.com/afrontend/dongnelibraryspa "AngularJS, Foundation을 사용한 Web UI"
 [npm-image]: https://img.shields.io/npm/v/dongnelibrary.svg
 [npm-url]: https://npmjs.org/package/dongnelibrary
-[travis-build-image]: https://travis-ci.org/afrontend/dongnelibrary.svg?branch=master
-[travis-build-url]: https://travis-ci.org/afrontend/dongnelibrary
-[web-ui-url]: https://dongne.herokuapp.com "무료 서버라서 10초 정도 느리게 로딩될 수 있어요"
+[web-ui-url]: https://dongne.onrender.com
 [web-api]: https://github.com/afrontend/dlserver "같은 기능을 지원하는 Web API"
-
-[gg-url]: http://www.gglib.or.kr
-[gunpo-url]: http://www.gunpolib.go.kr
+[gg-url]: https://lib.goe.go.kr
+[gunpo-url]: https://www.gunpolib.go.kr
 [hscity-url]: https://hscitylib.or.kr
-[osan-url]: http://www.osanlibrary.go.kr
-[snlib-url]: http://www.snlib.net
-[suwon-url]: http://www.suwonlib.go.kr
-
+[osan-url]: https://www.osanlibrary.go.kr
+[snlib-url]: https://www.snlib.go.kr
+[suwon-url]: https://www.suwonlib.go.kr
 [sample-url]: https://npm.runkit.com/dongnelibrary

package/package.json

@@ -3,11 +3,11 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "책을 빌릴 수 있는지 확인한다.",
   "main": "src/dongnelibrary.js",
   "bin": {
-    "dongnelibrary": "./src/cli.js"
+    "dongnelibrary": "src/cli.js"
   },
   "scripts": {
     "test": "mocha",
@@ -53,7 +53,6 @@
     "configstore": "^4.0.0",
     "figlet": "^1.2.1",
     "inquirer": "^6.2.2",
-    "jquery": "^3.6.4",
     "jsdom": "^21.1.1",
     "lodash": "^4.17.20",
     "request": "^2.73.0"

package/src/cli.js

@@ -1,39 +1,42 @@
 #!/usr/bin/env node
-const Configstore = require('configstore');
-const _ = require('lodash');
-const colors = require('colors');
-const figlet = require('figlet');
-const fp = require('lodash/fp');
-const inquirer = require('inquirer');
-const program = require('commander');
-const dl = require('./dongnelibrary');
-const util = require('./util');
-const pkg = require('../package.json');
+const Configstore = require("configstore");
+const _ = require("lodash");
+const colors = require("colors");
+const figlet = require("figlet");
+const fp = require("lodash/fp");
+const inquirer = require("inquirer");
+const program = require("commander");
+const dl = require("./dongnelibrary");
+const util = require("./util");
+const pkg = require("../package.json");
 
 const conf = new Configstore(pkg.name, {});
-const getDefaultLibrary = () => (conf.get('library'));
-const setDefaultLibrary = (name) => (conf.set('library', name));
-const getDefaultTitle = () => (conf.get('title') === undefined ? 'javascript' : conf.get('title'));
-const setDefaultTitle = (title) => (conf.set('title', title));
+const getDefaultLibrary = () => conf.get("library");
+const setDefaultLibrary = (name) => conf.set("library", name);
+const getDefaultTitle = () =>
+  conf.get("title") === undefined ? "javascript" : conf.get("title");
+const setDefaultTitle = (title) => conf.set("title", title);
 
 const introMessage = (msg) => {
-  console.log(figlet.textSync(msg, {
-    font: 'Standard',
-    horizontalLayout: 'default',
-    verticalLayout: 'default'
-  }));
+  console.log(
+    figlet.textSync(msg, {
+      font: "Standard",
+      horizontalLayout: "default",
+      verticalLayout: "default",
+    }),
+  );
 };
 
 program
   .version(pkg.version)
-  .option('-a, --library-list', 'Show libraries')
-  .option('-i, --interactive', 'Use menu')
-  .option('-l, --library-name [name,name]', 'library name')
-  .option('-t, --title [title]', 'a part of book title')
+  .option("-a, --library-list", "Show libraries")
+  .option("-i, --interactive", "Use menu")
+  .option("-l, --library-name [name,name]", "library name")
+  .option("-t, --title [title]", "a part of book title")
   .parse(process.argv);
 
 function cutTail(str, tail) {
-  let result = '';
+  let result = "";
   const index = str.indexOf(tail);
   if (index === -1) {
     result = str;
@@ -43,65 +46,83 @@ function cutTail(str, tail) {
   return result;
 }
 
-const okMark = '✓ ';
-const notokMark = '✖ ';
+const okMark = "✓ ";
+const notokMark = "✖ ";
 
 function printBooks(book) {
-  _.each(book.booklist, book => {
-    console.log(cutTail(book.libraryName, '도서관') + (book.exist?' ' + okMark + ' ':' ' + colors.red(notokMark) + ' ') + book.title + ' ');
+  _.each(book.booklist, (book) => {
+    console.log(
+      cutTail(book.libraryName, "도서관") +
+        (book.exist ? " " + okMark + " " : " " + colors.red(notokMark) + " ") +
+        book.title +
+        " ",
+    );
   });
 }
 
 function printAllLibraryName() {
   const libs = dl.getLibraryNames();
-  libs.forEach(name => {
+  libs.forEach((name) => {
     console.log(name);
   });
   const msg = `모두 ${libs.length} 개의 도서관`;
   console.log(colors.green(msg));
 }
 
-const getFullLibraryName = str => _.find(dl.getLibraryNames(), name => (name.indexOf(str) >= 0));
+const getFullLibraryName = (str) =>
+  _.find(dl.getLibraryNames(), (name) => name.indexOf(str) >= 0);
 
 function search(option, bookCallback, allBookCallback) {
-  dl.search({
-    title: option.title,
-    libraryName: getLibraries(option.libraryName)
-  }, (err, book) => {
-    if (err) {
-      err.msg = err.msg || "Unknown Error";
-      if (bookCallback) {
-        bookCallback(err);
-      }
-    } else {
-      if (bookCallback) {
-        bookCallback(null, book);
-      }
-    }
-  }, (err, books) => {
-    if (err) {
-      err.msg = err.msg || "Unknown Error";
-      if (allBookCallback) {
-        allBookCallback(err);
+  dl.search(
+    {
+      title: option.title,
+      libraryName: getLibraries(option.libraryName),
+    },
+    (err, book) => {
+      if (err) {
+        err.msg = err.msg || "Unknown Error";
+        if (bookCallback) {
+          bookCallback(err);
+        }
+      } else {
+        if (bookCallback) {
+          bookCallback(null, book);
+        }
       }
-    } else {
-      if (allBookCallback) {
-        allBookCallback(null, books);
+    },
+    (err, books) => {
+      if (err) {
+        err.msg = err.msg || "Unknown Error";
+        if (allBookCallback) {
+          allBookCallback(err);
+        }
+      } else {
+        if (allBookCallback) {
+          allBookCallback(null, books);
+        }
       }
-    }
-  });
+    },
+  );
 }
 
-const getBookCount = (results) => (
-  _.reduce(results, (memo, book) => (memo + ((book && book.booklist && book.booklist.length) ? book.booklist.length : 0)), 0)
-);
+const getBookCount = (results) =>
+  _.reduce(
+    results,
+    (memo, book) =>
+      memo +
+      (book && book.booklist && book.booklist.length
+        ? book.booklist.length
+        : 0),
+    0,
+  );
 
 const getLibraryFullNameList = _.flow([
   util.getArrayFromCommaSeparatedString,
-  fp.filter(shortLibraryName => (getFullLibraryName(shortLibraryName)))
+  fp.filter((shortLibraryName) => getFullLibraryName(shortLibraryName)),
 ]);
 
-const getLibraries = (libraryName) => (libraryName ? getLibraryFullNameList(libraryName) : dl.getLibraryNames());
+const getLibraries = (libraryName) =>
+  libraryName ? getLibraryFullNameList(libraryName) : dl.getLibraryNames();
 
 const processOneLibrary = (err, book) => {
   if (err) {
@@ -113,9 +134,13 @@ const processOneLibrary = (err, book) => {
 
 const processLibraries = (err, results) => {
   if (err) {
-    console.log('Error, Can\'t access detail information');
+    console.log("Error, Can't access detail information");
   } else {
-    console.log(colors.green(`${results.length} 개의 도서관에서  ${getBookCount(results)} 권 검색됨`));
+    console.log(
+      colors.green(
+        `${results.length} 개의 도서관에서  ${getBookCount(results)} 권 검색됨`,
+      ),
+    );
   }
 };
 
@@ -126,26 +151,26 @@ function activate(option) {
   }
 
   if (option.interactive) {
-    introMessage('Dongne Library');
+    introMessage("Dongne Library");
     inquirer
       .prompt([
         {
-          type: 'list',
-          name: 'library',
-          message: '도서관 이름은?',
+          type: "list",
+          name: "library",
+          message: "도서관 이름은?",
           choices: dl.getLibraryNames(),
-          default: getDefaultLibrary()
+          default: getDefaultLibrary(),
         },
         {
-          type: 'input',
-          name: 'title',
-          message: '책 이름은?',
-          default: getDefaultTitle()
-        }
+          type: "input",
+          name: "title",
+          message: "책 이름은?",
+          default: getDefaultTitle(),
+        },
       ])
-      .then(answers => {
-        option.libraryName = answers['library'];
-        option.title = answers['title'];
+      .then((answers) => {
+        option.libraryName = answers["library"];
+        option.title = answers["title"];
         setDefaultLibrary(option.libraryName);
         setDefaultTitle(option.title);
         if (option.libraryName && option.title) {

package/src/dongnelibrary.js

@@ -1,135 +1,132 @@
-const _ = require('lodash');
-const fp = require('lodash/fp');
-const gg = require('./library/gg');
-const gunpo = require('./library/gunpo');
-const hscity = require('./library/hscity');
-const osan = require('./library/osan');
-const snlib = require('./library/snlib');
-const suwon = require('./library/suwon');
-const async = require('async');
-const util = require('./util.js');
+const _ = require("lodash");
+const fp = require("lodash/fp");
+const gg = require("./library/gg");
+const gunpo = require("./library/gunpo");
+const hscity = require("./library/hscity");
+const osan = require("./library/osan");
+const snlib = require("./library/snlib");
+const suwon = require("./library/suwon");
+const async = require("async");
+const util = require("./util.js");
 
 const libraryList = [];
 
-const getLibraryNames = () => (util.getLibraryNames(libraryList));
+const getLibraryNames = () => util.getLibraryNames(libraryList);
 
 function makeLibraryList() {
-  const library = [
-    gg,
-    gunpo,
-    hscity,
-    osan,
-    snlib,
-    suwon
-  ];
-
-  _.each(library, library => {
-    _.each(library.getLibraryNames(), name => {
+  const library = [gg, gunpo, hscity, osan, snlib, suwon];
+
+  _.each(library, (library) => {
+    _.each(library.getLibraryNames(), (name) => {
       libraryList.push({
         name,
-        search: library.search
+        search: library.search,
       });
     });
   });
 }
 
-const getLibraryFunction = libraryName => {
-  const found = _.find(libraryList, lib => (lib.name === libraryName));
-  return found ? found : {
-    search: (opt, getBook) => {
-      if (getBook) {
-        getBook({msg: 'Unknown library name'});
-      }
-    },
-    name: 'Unknown'
-  };
+const getLibraryFunction = (libraryName) => {
+  const found = _.find(libraryList, (lib) => lib.name === libraryName);
+  return found
+    ? found
+    : {
+        search: (opt, getBook) => {
+          if (getBook) {
+            getBook({ msg: "Unknown library name" });
+          }
+        },
+        name: "Unknown",
+      };
 };
 
 function completeLibraryName(str) {
-  const found = _.find(getLibraryNames(), name => (name.indexOf(str) >= 0));
-  return found ? found : '';
+  const found = _.find(getLibraryNames(), (name) => name.indexOf(str) >= 0);
+  return found ? found : "";
 }
 
 function isValidLibraryName(libraryName) {
-  const found = _.find(libraryList, lib => (lib.name === libraryName));
+  const found = _.find(libraryList, (lib) => lib.name === libraryName);
   return found ? true : false;
 }
 
 function getLibArray(libraryName) {
   return _.flow([
-    fp.map(name => {
+    fp.map((name) => {
       const fullName = completeLibraryName(name);
       return isValidLibraryName(fullName) ? getLibraryFunction(fullName) : null;
     }),
-    _.compact
+    _.compact,
   ])(Array.isArray(libraryName) ? libraryName : [libraryName]);
 }
 
 const getSortedBooks = _.flow([
-  fp.map(book => ({
+  fp.map((book) => ({
     libraryName: book.libraryName,
     title: book.title,
-    exist: book.exist
+    exist: book.exist,
   })),
-  fp.sortBy(book => (!book.exist))
+  fp.sortBy((book) => !book.exist),
 ]);
 
 function search(opt, getBook, getAllBooks) {
   if (!opt || (!getBook && !getAllBooks)) {
-    console.log('invalid search options');
+    console.log("invalid search options");
     return;
   }
 
   const title = opt.title;
   const tasks = [];
 
-  _.each(getLibArray(opt.libraryName), lib => {
-    tasks.push(callback => {
-      lib.search({
-        title: title,
-        libraryName: lib.name
-      }, (err, data) => {
-        if (err) {
-          if(getBook) {
-            getBook(err);
+  _.each(getLibArray(opt.libraryName), (lib) => {
+    tasks.push((callback) => {
+      lib.search(
+        {
+          title: title,
+          libraryName: lib.name,
+        },
+        (err, data) => {
+          if (err) {
+            if (getBook) {
+              getBook(err);
+            }
+            callback(err);
+            return;
           }
-          callback(err);
-          return;
-        }
-        if(!data || !data.booklist) {
-          if(getBook) {
-            getBook({msg: 'invalid Data response'});
+          if (!data || !data.booklist) {
+            if (getBook) {
+              getBook({ msg: "invalid Data response" });
+            }
+            callback({ msg: "invalid Data response" });
+            return;
           }
-          callback({msg: 'invalid Data response'});
-          return;
-        }
 
-        const bookObj = {
-          title: title,
-          libraryName: lib.name,
-          totalBookCount: data.totalBookCount,
-          startPage: data.startPage,
-          booklist: getSortedBooks(data.booklist)
-        };
-
-        if(getBook) {
-          getBook(null, bookObj);
-        }
-        callback(null, bookObj);
-      });
+          const bookObj = {
+            title: title,
+            libraryName: lib.name,
+            totalBookCount: data.totalBookCount,
+            startPage: data.startPage,
+            booklist: getSortedBooks(data.booklist),
+          };
+
+          if (getBook) {
+            getBook(null, bookObj);
+          }
+          callback(null, bookObj);
+        },
+      );
     });
   });
 
   async.parallel(tasks, (err, results) => {
-    if(getAllBooks) {
-      if(err) {
+    if (getAllBooks) {
+      if (err) {
         getAllBooks(err);
       } else {
         getAllBooks(null, results);
       }
     }
- });
-
+  });
 }
 
 function activate() {
@@ -140,5 +137,5 @@ activate();
 
 module.exports = {
   search,
-  getLibraryNames
+  getLibraryNames,
 };

package/src/example.js

@@ -1,16 +1,16 @@
-const dl = require('dongnelibrary');
-dl.search({
-  title: 'javascript',
-  libraryName: ['여주','판교']
-}, function (err, book) {
-  console.log(book.libraryName + ' "' + book.title + '"');
-  book.booklist.forEach(function (book) {
-    console.log((book.exist?' ✓  ':' ✖  ') +' '+ book.title);
-  });
-}, function (err, books) {
-  console.log(books.length + ' 개의 도서관을 검색했습니다.');
-});
-
-
-
-
+const dl = require("dongnelibrary");
+dl.search(
+  {
+    title: "javascript",
+    libraryName: ["여주", "판교"],
+  },
+  function (err, book) {
+    console.log(book.libraryName + ' "' + book.title + '"');
+    book.booklist.forEach(function (book) {
+      console.log((book.exist ? " ✓  " : " ✖  ") + " " + book.title);
+    });
+  },
+  function (err, books) {
+    console.log(books.length + " 개의 도서관을 검색했습니다.");
+  },
+);