From 1f35f96fe3c46535764aa2ee3bb9625e6e479096 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Thu, 13 Aug 2020 17:26:25 +0200 Subject: [PATCH 1/7] Add padding to paste --- zerobin/static/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/zerobin/static/css/style.css b/zerobin/static/css/style.css index 0bcc2c8..3918d9e 100644 --- a/zerobin/static/css/style.css +++ b/zerobin/static/css/style.css @@ -230,6 +230,7 @@ li.L9 { pre.prettyprint { width: 100%; min-height: 100px; + padding: 5px; } /* Specify class=linenums on a pre to get line numbering */ From 2abbab53053e782f114ef9851d0db49bd9c505c4 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Thu, 13 Aug 2020 18:14:19 +0200 Subject: [PATCH 2/7] Handle paste --- zerobin/static/js/behavior.js | 61 ++++++++++++----------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/zerobin/static/js/behavior.js b/zerobin/static/js/behavior.js index 5f43a78..e047e09 100644 --- a/zerobin/static/js/behavior.js +++ b/zerobin/static/js/behavior.js @@ -628,23 +628,31 @@ window.zerobin = { } } - // return total * 250 / size; return total * 1000 / size; }, - // prevent defaults ignoreDrag: function (e) { e.stopPropagation(); e.preventDefault(); }, - // Handle Drop handleDrop: function (e) { e.preventDefault(); zerobin.upload(e.dataTransfer.files); document.getElementById("content").classList.remove("hover"); }, + handlePaste: function (e) { + var items = (event.clipboardData || event.originalEvent.clipboardData).items; + for (var i = 0; i < items.length; i++) { + if (items[i].type.indexOf("image") === 0) { + e.preventDefault() + return zerobin.upload([items[i].getAsFile()]); + } + } + + }, + handleDragOver: function (e) { zerobin.ignoreDrag(e); document.getElementById("content").classList.add('hover'); @@ -656,58 +664,28 @@ window.zerobin = { upload: function (files) { let content = document.getElementById('content'); - var current_file = files[0]; + var currentFile = files[0]; var reader = new FileReader(); - if (current_file.type.indexOf('image') == 0) { + if (currentFile.type.indexOf('image') == 0) { reader.onload = function (event) { var image = new Image(); image.src = event.target.result; image.onload = function () { - var maxWidth = 1024, - maxHeight = 1024, - imageWidth = image.width, - imageHeight = image.height; - - if (imageWidth > imageHeight) { - if (imageWidth > maxWidth) { - imageHeight *= maxWidth / imageWidth; - imageWidth = maxWidth; - } - } else { - if (imageHeight > maxHeight) { - imageWidth *= maxHeight / imageHeight; - imageHeight = maxHeight; - } - } - - var canvas = document.createElement('canvas'); - canvas.width = imageWidth; - canvas.height = imageHeight; - image.width = imageWidth; - image.height = imageHeight; - var ctx = canvas.getContext("2d"); - ctx.drawImage(this, 0, 0, imageWidth, imageHeight); - - var paste = canvas.toDataURL(current_file.type); - - content.value = paste; - content.dispatchEvent(new Event('change')); - - image.style.maxWidth = '742px'; - + var imgWrapper = document.createElement('div'); + imgWrapper.classList.add('paste-wrapper'); + imgWrapper.appendChild(image) content.style.display = "none"; - content.after(image); - + content.after(imgWrapper); } } - reader.readAsDataURL(current_file); + reader.readAsDataURL(currentFile); } else { reader.onload = function (event) { content.value = event.target.result content.dispatchEvent(new Event('change')); }; - reader.readAsText(current_file); + reader.readAsText(currentFile); } } }; @@ -862,6 +840,7 @@ if (app.support.fileUpload) { // Implements drag & drop upload let content = document.getElementById('content'); content.addEventListener('drop', zerobin.handleDrop); + content.addEventListener('paste', zerobin.handlePaste); content.addEventListener('dragover', zerobin.handleDragOver); content.addEventListener('dragleave', zerobin.handleDragLeave); From e667e1f94739bfdaeb7fdff0892e2f827efc847f Mon Sep 17 00:00:00 2001 From: ksamuel Date: Thu, 13 Aug 2020 18:23:11 +0200 Subject: [PATCH 3/7] Add active class on previousPasteMenu --- zerobin/views/base.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zerobin/views/base.tpl b/zerobin/views/base.tpl index f251b35..0d73490 100644 --- a/zerobin/views/base.tpl +++ b/zerobin/views/base.tpl @@ -46,10 +46,10 @@
  • Previous pastes v From e37ed06a473fff2d748e88abfd40c555c23b013c Mon Sep 17 00:00:00 2001 From: ksamuel Date: Thu, 13 Aug 2020 19:04:57 +0200 Subject: [PATCH 4/7] Add dl for text --- zerobin/static/js/behavior.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/zerobin/static/js/behavior.js b/zerobin/static/js/behavior.js index e047e09..7d40e25 100644 --- a/zerobin/static/js/behavior.js +++ b/zerobin/static/js/behavior.js @@ -670,6 +670,7 @@ window.zerobin = { reader.onload = function (event) { var image = new Image(); image.src = event.target.result; + content.value = event.target.result image.onload = function () { var imgWrapper = document.createElement('div'); @@ -733,10 +734,6 @@ if (content && key) { /* When done */ function (content) { - /* Decrypted content goes back to initial container*/ - document.querySelector('#paste-content').innerText = content; - app.currentPaste.content = content - if (content.indexOf('data:image') == 0) { // Display Image @@ -748,21 +745,30 @@ if (content && key) { imgWrapper.classList.add('paste-wrapper'); var img = document.createElement('img'); img.src = content; - //img.style.maxWidth = '742px'; pasteContent.after(imgWrapper); imgWrapper.appendChild(img); - // Display Download button document.querySelectorAll('.btn-clone').forEach((node) => node.style.display = "none") + let extension = /data:image\/([^;]+);base64/.exec(content)[1]; + app.downloadLink = { - name: '0bin_' + document.location.pathname.split('/').pop(), + name: '0bin_' + document.location.pathname.split('/').pop() + '.' + extension, url: content } } else { app.currentPaste.type = "text" + /* Decrypted content goes back to initial container*/ + document.querySelector('#paste-content').innerText = content; + app.currentPaste.content = content + + app.downloadLink = { + name: '0bin_' + document.location.pathname.split('/').pop() + ".txt", + url: "data:text/html;charset=UTF-8," + content + } + } bar.set('Code coloration...', '95%'); From 9b2f9911f23e582ed3308000a4b0d0143d17b8c5 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Fri, 14 Aug 2020 10:07:36 +0200 Subject: [PATCH 5/7] Add batch paste methods and fix dl link glitch --- zerobin/paste.py | 13 +++++++++++++ zerobin/static/js/behavior.js | 12 ++++++++---- zerobin/views/paste.tpl | 11 ++++------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/zerobin/paste.py b/zerobin/paste.py index de9b640..bb39ef8 100644 --- a/zerobin/paste.py +++ b/zerobin/paste.py @@ -228,3 +228,16 @@ class Paste(object): Delete the paste file. """ os.remove(self.path) + + @classmethod + def iter_all(cls): + for p in settings.PASTE_FILES_ROOT.rglob("*"): + if p.is_file() and "counter" not in str(p): + yield Paste.load_from_file(p) + + @property + def has_expired(self): + try: + return self.expiration < datetime.now() + except TypeError: + return False diff --git a/zerobin/static/js/behavior.js b/zerobin/static/js/behavior.js index 7d40e25..fcad76b 100644 --- a/zerobin/static/js/behavior.js +++ b/zerobin/static/js/behavior.js @@ -23,7 +23,6 @@ const app = new Vue({ el: '#app', data: { previousPastes: [], - downloadLink: {}, displayBottomToolBar: false, openPreviousPastesMenu: false, readerMode: false, @@ -32,7 +31,8 @@ const app = new Vue({ ownerKey: '', id: '', type: '', - content: '' + content: '', + downloadLink: {}, }, newPaste: { expiration: '1_day', @@ -68,6 +68,10 @@ const app = new Vue({ }, methods: { + // handleDownload: function () { + // this.$refs.downloadLink.dispatchEvent(new Event("click")); + // }, + toggleReaderMode: function () { if (!this.readerMode) { this.messages = []; @@ -753,7 +757,7 @@ if (content && key) { let extension = /data:image\/([^;]+);base64/.exec(content)[1]; - app.downloadLink = { + app.currentPaste.downloadLink = { name: '0bin_' + document.location.pathname.split('/').pop() + '.' + extension, url: content } @@ -764,7 +768,7 @@ if (content && key) { document.querySelector('#paste-content').innerText = content; app.currentPaste.content = content - app.downloadLink = { + app.currentPaste.downloadLink = { name: '0bin_' + document.location.pathname.split('/').pop() + ".txt", url: "data:text/html;charset=UTF-8," + content } diff --git a/zerobin/views/paste.tpl b/zerobin/views/paste.tpl index b879394..2076a10 100644 --- a/zerobin/views/paste.tpl +++ b/zerobin/views/paste.tpl @@ -33,10 +33,8 @@
    - - + Download
    @@ -72,9 +70,8 @@ - + Download From d133494e9dee95b8ba5980dd73d12953129247a9 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Fri, 14 Aug 2020 10:26:04 +0200 Subject: [PATCH 6/7] Fix upload button glitch --- zerobin/static/css/style.css | 2 +- zerobin/views/home.tpl | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zerobin/static/css/style.css b/zerobin/static/css/style.css index 3918d9e..83773ad 100644 --- a/zerobin/static/css/style.css +++ b/zerobin/static/css/style.css @@ -176,7 +176,7 @@ input.hide-upload { filter: alpha(opacity=0); opacity: 0; z-index: 2; - width: 80px; + width: 0; margin-top: -20px; cursor: pointer; cursor: hand; diff --git a/zerobin/views/home.tpl b/zerobin/views/home.tpl index 4a13b6d..c944d88 100644 --- a/zerobin/views/home.tpl +++ b/zerobin/views/home.tpl @@ -3,9 +3,10 @@
    - - +
    From 6bf5333b1464d9eb1a890e4e22a7f344147b6a90 Mon Sep 17 00:00:00 2001 From: ksamuel Date: Fri, 14 Aug 2020 11:18:59 +0200 Subject: [PATCH 7/7] Reader mode param in URL --- zerobin/paste.py | 11 +++++++---- zerobin/static/js/behavior.js | 30 +++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/zerobin/paste.py b/zerobin/paste.py index bb39ef8..33aecd9 100644 --- a/zerobin/paste.py +++ b/zerobin/paste.py @@ -101,9 +101,9 @@ class Paste(object): expiration = datetime.strptime(expiration, "%Y-%m-%d %H:%M:%S.%f") except StopIteration: - raise TypeError(to_ascii("File %s is malformed" % path)) + raise TypeError("File %s is malformed" % path) except (IOError, OSError): - raise ValueError(to_ascii("Can not open paste from file %s" % path)) + raise ValueError("Can not open paste from file %s" % path) return Paste(uuid=uuid, expiration=expiration, content=content) @@ -230,10 +230,13 @@ class Paste(object): os.remove(self.path) @classmethod - def iter_all(cls): + def iter_all(cls, on_error=lambda e: e): for p in settings.PASTE_FILES_ROOT.rglob("*"): if p.is_file() and "counter" not in str(p): - yield Paste.load_from_file(p) + try: + yield Paste.load_from_file(p) + except (TypeError, ValueError) as e: + on_error(e) @property def has_expired(self): diff --git a/zerobin/static/js/behavior.js b/zerobin/static/js/behavior.js index fcad76b..19559a2 100644 --- a/zerobin/static/js/behavior.js +++ b/zerobin/static/js/behavior.js @@ -45,6 +45,8 @@ const app = new Vue({ clipboard: !!(isSecureContext && navigator.clipboard && navigator.clipboard.writeText), + URLSearchParams: !!window.URLSearchParams, + localStorage: (function () { var val = !!(localStorage); document.querySelector('html').classList.add((val ? '' : 'no-') + 'local-storage'); @@ -68,13 +70,21 @@ const app = new Vue({ }, methods: { - // handleDownload: function () { - // this.$refs.downloadLink.dispatchEvent(new Event("click")); - // }, - toggleReaderMode: function () { + debugger; if (!this.readerMode) { this.messages = []; + if (this.support.URLSearchParams) { + var searchParams = new URLSearchParams(window.location.search) + searchParams.set('readerMode', 1); + window.location.search = searchParams.toString(); + } + } else { + if (this.support.URLSearchParams) { + var searchParams = new URLSearchParams(window.location.search); + searchParams.delete('readerMode'); + window.location.search = searchParams.toString(); + } } this.readerMode = !this.readerMode; @@ -391,6 +401,7 @@ window.zerobin = { doneCallback(content); } } catch (err) { + debugger; errorCallback(err); } @@ -738,6 +749,8 @@ if (content && key) { /* When done */ function (content) { + let readerMode = false; + if (content.indexOf('data:image') == 0) { // Display Image @@ -773,6 +786,10 @@ if (content && key) { url: "data:text/html;charset=UTF-8," + content } + if (app.support.URLSearchParams) { + readerMode = (new URLSearchParams(window.location.search)).get('readerMode'); + } + } bar.set('Code coloration...', '95%'); @@ -781,7 +798,7 @@ if (content && key) { /** Syntaxic coloration */ - if (zerobin.isCode(content) > 100) { + if (zerobin.isCode(content) > 100 && !readerMode) { document.getElementById('paste-content').classList.add('linenums'); prettyPrint(); } else { @@ -805,6 +822,9 @@ if (content && key) { form.forEach((node) => node.disabled = false); content = ''; + if (readerMode) { + app.toggleReaderMode() + } }, 100);