+ 189cloud

cheney-yan · Mar 2, 2020 · 68c2a80 · 68c2a80
1 parent a780973
commit 68c2a80
Show file tree

Hide file tree

Showing 6 changed files with 805 additions and 6 deletions.
diff --git a/app/plugins/drive.http.js b/app/plugins/drive.http.js
@@ -24,7 +24,7 @@ module.exports = ({wrapReadableStream , request}) => {
 
   const getFileSize = async (url , headers) => {
     try{
-      let nh = await request.header(url , {headers})
+      let nh = await request.header(decodeURIComponent(url) , {headers})
       if(nh && nh['content-length']){
         return nh['content-length']
       }else{
@@ -40,7 +40,7 @@ module.exports = ({wrapReadableStream , request}) => {
     let url = encodeURI(`http:${id}`)
     let size = await getFileSize(url)
     console.log('get file size' , size)
-    let readstream = request({url, method:'get'})
+    let readstream = request({url:decodeURIComponent(url), method:'get'})
     return wrapReadableStream(readstream , { size } )
   }
 

diff --git a/app/plugins/drive.https.js b/app/plugins/drive.https.js
@@ -24,7 +24,7 @@ module.exports = ({wrapReadableStream , request}) => {
 
   const getFileSize = async (url , headers) => {
     try{
-      let nh = await request.header(url , {headers})
+      let nh = await request.header(decodeURIComponent(url) , {headers})
       if(nh && nh['content-length']){
         return nh['content-length']
       }else{
@@ -40,7 +40,7 @@ module.exports = ({wrapReadableStream , request}) => {
     let url = encodeURI(`https:${id}`)
     let size = await getFileSize(url)
     console.log('get file size' , size)
-    let readstream = request({url, method:'get'})
+    let readstream = request({url:decodeURIComponent(url), method:'get'})
     return wrapReadableStream(readstream , { size } )
   }
 

diff --git a/app/utils/http.js b/app/utils/http.js
@@ -11,7 +11,7 @@ const http = (opts, ...rest) => {
   if (opts.async) {
     return new Promise(function(resolve, reject) {
       request(opts, function(error, response, body) {
-        if (!error && response.statusCode == 200) {
+        if (!error) {
           resolve(response)
         } else {
           reject(error || response);

diff --git a/app/utils/wrapReadableStream.js b/app/utils/wrapReadableStream.js
@@ -21,7 +21,7 @@ class wrapReadableStream extends Readable {
       response.on('data' , (chunk)=>{
         let bytesRead = chunk.length
         this.length += bytesRead
-
+        console.log( this.length )
         if(bytesRead > 0){
           this.buffers.push(chunk.slice(0));
           if(this.needReadable){

diff --git a/example/%E5%89%8D%E5%89%8D%E5%89%8D%E4%B8%96%20(movie%20ver.)%20RADWIMPS%20MV[].mp4 b/example/%E5%89%8D%E5%89%8D%E5%89%8D%E4%B8%96%20(movie%20ver.)%20RADWIMPS%20MV[].mp4