From e0722f8efa311fa7a0efd54fdec2078f5f6c6dc4 Mon Sep 17 00:00:00 2001 From: OctoMiao Date: Sat, 24 Feb 2018 10:44:07 -0700 Subject: [PATCH 1/2] upgrade to new kernel --- app/assets/mongo.js | 39 ++++++++++++++++++++++++++ app/assets/vue-app.js | 18 ++++++++++++ app/bilicrawler.js | 11 +++++--- app/index.html | 34 +++++++++++++---------- app/package-lock.json | 64 +++++++++++++++++++++++++++++++++++++++++-- app/package.json | 4 ++- 6 files changed, 147 insertions(+), 23 deletions(-) create mode 100644 app/assets/mongo.js create mode 100644 app/assets/vue-app.js diff --git a/app/assets/mongo.js b/app/assets/mongo.js new file mode 100644 index 0000000..1ef3601 --- /dev/null +++ b/app/assets/mongo.js @@ -0,0 +1,39 @@ +var msg; +// get database stats +var getDbStats = function(db, callback) { +db.command({'dbStats': 1}, +function(err, results) { + console.log(results); + callback(); + return results; +} +); +}; + +var MongoClient = require('mongodb').MongoClient + , assert = require('assert'); + + + +// Connection URL +var url = 'mongodb://spiderrd:spiderrd@45.32.68.44:37017/bilibili_spider'; + + +MongoClient.connect(url, function (err, client) { + assert.equal(null, err); + + var db = client.db('bilibili_spider'); + + msg = getDbStats(db, function() { + client.close(); + }); +}); + + +console.log("msg") +console.log(msg.objects) +console.log("msg 2") +console.log(msg) + + + diff --git a/app/assets/vue-app.js b/app/assets/vue-app.js new file mode 100644 index 0000000..52ea423 --- /dev/null +++ b/app/assets/vue-app.js @@ -0,0 +1,18 @@ +var vm = new Vue({ +el: '#data-html', +data: { + stats: [] + }, + mounted: function () { + this.execplot(); + }, + methods: { + execplot: function (){ + plot(this.energy, this.masssquared,this.mixangle,this.initstate,0, this.endpoint, 10000) + } + + }, + computed: { + + } +}) \ No newline at end of file diff --git a/app/bilicrawler.js b/app/bilicrawler.js index d8efc8c..6de0b11 100644 --- a/app/bilicrawler.js +++ b/app/bilicrawler.js @@ -1,5 +1,6 @@ const loghtml = document.getElementById('log-process') +//version 20180225-1 const superagent = require('superagent'); var moment = require('moment'); moment.locale('zh-cn'); @@ -74,13 +75,13 @@ const packageFetchInsertAsync = async (pid, mids) => { break // 结束本次任务，尝试下个任务 } } - await sleep(12000) + await sleep(10000) if (cardList.length === midSize) { await uploadPackageAsync(pid, cardList) console.log(`${nowstr()} Send package ${pid}`); } else { - console.error(`${nowstr()} failed to fetch info, mids=${mids}`); - logit(`${nowstr()} failed to fetch info, mids=${mids}`); + console.error(`${nowstr()} failed to fetch info，finished/all=${cardList.length}/${midSize}, mids=${mids}`); + logit(`${nowstr()} failed to fetch info，finished/all=${cardList.length}/${midSize}, mids=${mids}`); } } @@ -105,7 +106,9 @@ const run = async () => { // start code // run(); - +/////////////////// +// +/////////////////// // Define function that export result to html tag function logit(elem) { diff --git a/app/index.html b/app/index.html index bf10b75..672fd02 100755 --- a/app/index.html +++ b/app/index.html @@ -6,14 +6,6 @@ BiliSpider - @@ -42,12 +34,11 @@

- -
- +
+ +
-
@@ -55,14 +46,27 @@

LOG: 
       
-
-

+ + +
+ + +
+ Database: +
+ {{ dataSize }} +
+
+
- + + + - - + +