diff --git a/src/gdrive.js b/src/gdrive.js
index cee48f9..a87aab2 100644
--- a/src/gdrive.js
+++ b/src/gdrive.js
@@ -88,7 +88,7 @@ class GDrive extends LitElement
onLoad() {
this.scriptLoaded = true;
this.gauth('none', (response) => {
- if (response.error === "immediate_failed") {
+ if (response.error) {
if (this.state !== "implicitonly") {
this.state = "trymanual";
}
diff --git a/src/loader.js b/src/loader.js
index a11d513..b4a41d4 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -1,6 +1,8 @@
import { LitElement, html, css } from 'lit-element';
import { wrapCss } from './misc';
+import prettyBytes from 'pretty-bytes';
+
import { parseURLSchemeHostPath, initDBWorker } from './pageutils';
@@ -16,6 +18,9 @@ class Loader extends LitElement
this.state = "waiting";
this.loadInfo = null;
+ this.currentSize = 0;
+ this.totalSize = 0;
+
this.dbworker = initDBWorker();
}
@@ -26,6 +31,8 @@ class Loader extends LitElement
state: { type: String },
progress: { type: Number },
percent: { type: Number },
+ currentSize: { type: Number },
+ totalSize: { type: Number },
error: { type: String},
total: { type: Number },
status: { type: String },
@@ -48,6 +55,10 @@ class Loader extends LitElement
this.error = event.data.error;
this.state = "errored";
}
+ if (event.data.currentSize && event.data.totalSize) {
+ this.currentSize = event.data.currentSize;
+ this.totalSize = event.data.totalSize;
+ }
}
break;
@@ -69,6 +80,8 @@ class Loader extends LitElement
let sourceUrl = this.sourceUrl;
let source = null;
+ this.percent = this.currentSize = this.totalSize = 0;
+
// custom protocol handlers here...
try {
const {scheme, host, path} = parseURLSchemeHostPath(sourceUrl);
@@ -161,6 +174,10 @@ You can select a file to upload from the main page by clicking the \'Choose File
line-height: 1.5rem;
}
+ .loaded-prog {
+ margin-bottom: 1em;
+ }
+
.error {
white-space: pre-wrap;
margin-bottom: 2em;
@@ -197,6 +214,9 @@ You can select a file to upload from the main page by clicking the \'Choose File
+ ${this.currentSize && this.totalSize ? html`
+
Loaded ${prettyBytes(this.currentSize)} of ${prettyBytes(this.totalSize)}
` : html``}
+
`;
diff --git a/src/pageutils.js b/src/pageutils.js
index c3ad306..131c837 100644
--- a/src/pageutils.js
+++ b/src/pageutils.js
@@ -76,10 +76,6 @@ function getTS(iso) {
// ===========================================================================
async function sourceToId(url) {
- try {
- url = new URL(url, window.location.origin).href;
- } catch(e) {}
-
const digest = await digestMessage(url, 'SHA-256');
const coll = "id-" + digest.slice(0, 12);
return {url, coll};
diff --git a/sw.js b/sw.js
index a276615..e8b86a2 100644
--- a/sw.js
+++ b/sw.js
@@ -1,11 +1,11 @@
-!function(t,e){for(var r in e)t[r]=e[r]}(self,function(t){var e={};function r(i){if(e[i])return e[i].exports;var n=e[i]={i:i,l:!1,exports:{}};return t[i].call(n.exports,n,n.exports,r),n.l=!0,n.exports}return r.m=t,r.c=e,r.d=function(t,e,i){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:i})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(t,e){if(1&e&&(t=r(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(r.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var n in t)r.d(i,n,function(e){return t[e]}.bind(null,n));return i},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="/",r(r.s=219)}([function(t,e,r){"use strict";function i(t,e){for(const r of e)if(t.startsWith(r))return!0;return!1}function n(t,e){for(const r of e)if(t.indexOf(r)>=0)return!0;return!1}function s(t){return t.replace(/[-:T]/g,"").slice(0,14)}function a(t){if(!t)return new Date;t.length<14&&(t+="00000101000000".substr(t.length));const e=t.substring(0,4)+"-"+t.substring(4,6)+"-"+t.substring(6,8)+"T"+t.substring(8,10)+":"+t.substring(10,12)+":"+t.substring(12,14)+"-00:00";return new Date(e)}function o(t){if(!t)return"";try{return""+parseInt(t.getTime()/1e3)}catch(t){return""}}async function u(t,e){const r="string"==typeof t?(new TextEncoder).encode(t):t,i=await crypto.subtle.digest(e,r);return e+":"+new Uint8Array(i).map(t=>t.toString(16).padStart(2,"0")).join("")}function h(t){try{return new Headers(t)}catch(e){for(let e of Object.keys(t)){const r=t[e],i=r.replace(/[\r\n]+/g,", ");r!=i&&(t[e]=i)}return new Headers(t)}}r.d(e,"k",(function(){return i})),r.d(e,"c",(function(){return n})),r.d(e,"f",(function(){return s})),r.d(e,"l",(function(){return a})),r.d(e,"e",(function(){return o})),r.d(e,"d",(function(){return u})),r.d(e,"h",(function(){return l})),r.d(e,"i",(function(){return h})),r.d(e,"j",(function(){return f})),r.d(e,"g",(function(){return d})),r.d(e,"a",(function(){return p})),r.d(e,"b",(function(){return m}));const c=[101,204,205,304];function l(t){return c.includes(t)}function d(t){return"XMLHttpRequest"===t.headers.get("X-Pywb-Requested-With")}function f(t,e){let r,i;return e||(e="Sorry, this url was not found in the archive."),"script"===t.destination||t.headers.get("x-pywb-requested-with")?(r=JSON.stringify(e),i="application/json"):(r=e,i="text/html"),new Response(r,{status:404,statusText:"Not Found",headers:{"Content-Type":i}})}class p extends class{constructor(t,e){this.url=t,this.status=e}}{}class m{}},function(t,e,r){"use strict";r.d(e,"b",(function(){return a})),r.d(e,"a",(function(){return o})),r.d(e,"d",(function(){return b})),r.d(e,"f",(function(){return T})),r.d(e,"e",(function(){return y})),r.d(e,"c",(function(){return D}));var i=r(110);const n=new TextDecoder("utf-8");class s extends i.Inflate{constructor(t,e){super(t),this.reader=e}onEnd(t){this.err=t,this.err||(this.reader._rawOffset+=this.strm.total_in)}}class a{static concatChunks(t,e){if(1===t.length)return t[0];const r=new Uint8Array(e);let i=0;for(const e of t)r.set(e,i),i+=e.byteLength;return r}static splitChunk(t,e){return[t.slice(0,e),t.slice(e)]}static async readFully(t){const e=[];let r=0;for await(const i of t)e.push(i),r+=i.byteLength;return a.concatChunks(e,r)}getReadableStream(){const t=this[Symbol.asyncIterator]();return new ReadableStream({pull:e=>t.next().then(t=>{t.done||!t.value?e.close():e.enqueue(t.value)})})}readFully(){return a.readFully(this)}async readline(t=0){const e=await this.readlineRaw(t);return e?n.decode(e):""}async*iterLines(t=0){let e=null;for(;e=await this.readline(t);)yield e}}class o extends a{constructor(t,e="gzip",r=!1){if(super(),this.compressed=e,this.opts={raw:"deflateRaw"===e},this.inflator=e?new s(this.opts,this):null,"function"!=typeof t[Symbol.asyncIterator])if("function"==typeof t.getReader)t=o.fromReadable(t.getReader());else if("function"==typeof t.read)t=o.fromReadable(t);else{if("function"!=typeof t[Symbol.iterator])throw new TypeError("Invalid Stream Source");t=o.fromIter(t)}this._sourceIter=r?this.dechunk(t):t[Symbol.asyncIterator](),this.lastValue=null,this.errored=!1,this._savedChunk=null,this._rawOffset=0,this._readOffset=0,this.numChunks=0}async _loadNext(){const t=await this._sourceIter.next();return t.done?null:t.value}async*dechunk(t){const e=t instanceof o?t:new o(t,null);let r=-1,i=!0;for(;0!=r;){const t=await e.readlineRaw(64);let s=null;if(r=parseInt(n.decode(t),16),!r||r>2**32){if(Number.isNaN(r)||r>2**32){i||(this.errored=!0),yield t;break}}else if(s=await e.readSize(r),s.length!=r){i?yield t:this.errored=!0,yield s;break}const a=await e.readSize(2);if(13!=a[0]||10!=a[1]){i?yield t:this.errored=!0,yield s,yield a;break}if(i=!1,!s||0===r)return;yield s}yield*e}_unread(t){t.length&&(this._readOffset-=t.length,this._savedChunk&&console.log("Already have chunk!"),this._savedChunk=t)}async _next(){if(this._savedChunk){const t=this._savedChunk;return this._savedChunk=null,t}if(this.compressed){const t=this._getNextChunk();if(t)return t}let t=await this._loadNext();for(;this.compressed&&t;){this._push(t);const e=this._getNextChunk(t);if(e)return e;t=await this._loadNext()}return t}_push(t){this.lastValue=t,this.inflator.ended&&(this.inflator=new s(this.opts,this)),this.inflator.push(t),this.inflator.err&&this.inflator.ended&&"deflate"===this.compressed&&!1===this.opts.raw&&0===this.numChunks&&(this.opts.raw=!0,this.compressed="deflateRaw",this.inflator=new s(this.opts,this),this.inflator.push(t))}_getNextChunk(t){for(;;){if(this.inflator.chunks.length>0)return this.numChunks++,this.inflator.chunks.shift();if(this.inflator.ended){if(0!==this.inflator.err)return this.compressed=null,t;const e=this.inflator.strm.avail_in;if(e&&this.lastValue){this._push(this.lastValue.slice(-e));continue}}return null}}async*[Symbol.asyncIterator](){let t=null;for(;t=await this._next();)this._readOffset+=t.length,yield t}async readlineRaw(t){const e=[];let r,i=0,n=null;for await(const s of this){if(t&&i+s.byteLength>t){n=s,r=t-i-1;const e=s.slice(0,r+1).indexOf(10);e>=0&&(r=e);break}if(r=s.indexOf(10),r>=0){n=s;break}e.push(s),i+=s.byteLength}if(n){const[t,s]=o.splitChunk(n,r+1);e.push(t),i+=t.byteLength,this._unread(s)}else if(!e.length)return null;return o.concatChunks(e,i)}readFully(){return this.readSize()}async readSize(t=-1,e=!1){const r=[];let i=0;for await(const n of this){if(t>=0){if(n.length>t){const[s,a]=o.splitChunk(n,t);e||r.push(s),i+=s.byteLength,this._unread(a);break}if(n.length===t){e||r.push(n),i+=n.byteLength,t=0;break}t-=n.length}e||r.push(n),i+=n.byteLength}return e?i:o.concatChunks(r,i)}getReadOffset(){return this._readOffset}getRawOffset(){return this.compressed?this._rawOffset:this._readOffset}getRawLength(t){return this.compressed?this.inflator.strm.total_in:this._readOffset-t}static fromReadable(t){return{async*[Symbol.asyncIterator](){let e=null;for(;(e=await t.read())&&!e.done;)yield e.value}}}static fromIter(t){return{async*[Symbol.asyncIterator](){for(const e of t)yield e}}}}class u extends a{constructor(t,e,r=0){super(),this.sourceIter=t,this.length=e,this.limit=e,this.skip=r}setLimitSkip(t,e=0){this.limit=t,this.skip=e}async*[Symbol.asyncIterator](){if(!(this.limit<=0))for await(let t of this.sourceIter){if(this.skip>0){if(!(t.length>=this.skip)){this.skip-=t.length;continue}{const[e,r]=u.splitChunk(t,this.skip);t=r,this.skip=0}}if(t.length>this.limit){const[e,r]=u.splitChunk(t,this.limit);t=e,this.sourceIter._unread(r)}if(t.length&&(this.limit-=t.length,yield t),this.limit<=0)break}}async readlineRaw(t){if(this.limit<=0)return null;const e=await this.sourceIter.readlineRaw(t?Math.min(t,this.limit):this.limit);return this.limit-=e.length,e}async skipFully(){const t=this.limit;for(;this.limit>0;)this.limit-=await this.sourceIter.readSize(this.limit,!0);return t}}const h=new Uint8Array([13,10]),c=new Uint8Array([13,10,13,10]);class l{constructor({statusline:t,headers:e}){this.statusline=t,this.headers=e}toString(){const t=[this.statusline];for(const[e,r]of this.headers)t.push(`${e}: ${r}`);return t.join("\r\n")+"\r\n"}async*iterSerialize(t){yield t.encode(this.statusline),yield h;for(const[e,r]of this.headers)yield t.encode(`${e}: ${r}\r\n`)}_parseResponseStatusLine(){const t=f(this.statusline," ",2);this._protocol=t[0],this._statusCode=t.length>1?Number(t[1]):"",this._statusText=t.length>2?t[2]:""}get statusCode(){return void 0===this._statusCode&&this._parseResponseStatusLine(),this._statusCode}get protocol(){return void 0===this._protocol&&this._parseResponseStatusLine(),this._protocol}get statusText(){return void 0===this._statusText&&this._parseResponseStatusLine(),this._statusText}_parseRequestStatusLine(){const t=this.statusline.split(" ",2);this._method=t[0],this._requestPath=t.length>1?t[1]:""}get method(){return void 0===this._method&&this._parseRequestStatusLine(),this._method}get requestPath(){return void 0===this._requestPath&&this._parseRequestStatusLine(),this._requestPath}}class d{startsWithSpace(t){const e=t.charAt(0);return" "===e||"\t"===e}async parse(t,{headersClass:e=Map}={}){const r=await t.readline();if(!r)return null;let i=r.trimEnd();const n=new e;if(!i)return null;let s=(await t.readline()).trimEnd();for(;s;){let[e,r]=f(s,":",1);r&&(e=e.trimStart(),r=r.trim());let i=(await t.readline()).trimEnd();for(;this.startsWithSpace(i);)r&&(r+=i),i=(await t.readline()).trimEnd();if(r)try{n.set(e,r)}catch(t){}s=i}return new l({statusline:i,headers:n,totalRead:this.totalRead})}}function f(t,e,r){const i=t.split(e),n=i.slice(0,r);return i.slice(r).length>0&&n.push(i.slice(r).join(e)),n}var p=r(111),m=r.n(p);const w=new TextDecoder("utf-8"),g=new TextEncoder("utf-8"),_={warcinfo:"application/warc-fields",response:"application/http; msgtype=response",revisit:"application/http; msgtype=response",request:"application/http; msgtype=request",metadata:"application/warc-fields"};class y extends a{static create({url:t,date:e,type:r,warcHeaders:i={},filename:n="",httpHeaders:s={},status:a="200",statusText:o="OK",httpVersion:u="HTTP/1.1",warcVersion:h="WARC/1.0",keepHeadersCase:c=!0,refersToUrl:d,refersToDate:f}={},p){function w(t){return"WARC/1.0"===h&&"Z"!=(t=t.split(".")[0]).charAt(e.length-1)&&(t+="Z"),t}e||(e=(new Date).toISOString()),e=w(e),i={...i},"warcinfo"===r?n&&(i["WARC-Filename"]=n):i["WARC-Target-URI"]=t,i["WARC-Date"]=e,i["WARC-Type"]=r,"revisit"===r&&(i["WARC-Profile"]="WARC/1.1"===h?"http://netpreserve.org/warc/1.1/revisit/identical-payload-digest":"http://netpreserve.org/warc/1.0/revisit/identical-payload-digest",i["WARC-Refers-To-Target-URI"]=d,i["WARC-Refers-To-Date"]=w(f)),(i=new l({statusline:h,headers:c?new Map(Object.entries(i)):new Headers(i)})).headers.get("WARC-Record-ID")||i.headers.set("WARC-Record-ID",`