Merge pull request #1564 from Ribas160/file_name_and_size_on_download_page

Show file name and size on download page

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.7.7 (not yet released)
 * ADDED: Switching templates using the web ui (#1501)
+* ADDED: Show file name and size on download page (#603)
 * CHANGED: Passing large data structures by reference to reduce memory consumption (#858)
 * CHANGED: Removed use of ctype functions and polyfill library for ctype
 * CHANGED: Upgrading libraries to: DOMpurify 3.2.6, ip-lib 1.20.0

CREDITS.md

@@ -5,6 +5,7 @@
 * Simon Rupf - current developer and maintainer
 * rugk - security review, doc improvment, JS refactoring & various other stuff
 * R4SAS - python client, compression, blob URI to support larger attachments
+* Mikhail Romanov - UI improvements, theme switching, clipboard support, multi-file upload, bugfixes, code refactoring
 
 ## Past contributions
 
@@ -33,7 +34,6 @@
 * Mounir Idrassi & J. Mozdzen - secure YOURLS integration
 * Felipe Nakandakari - enabled AWS SDK to use default credential provider chain in the S3 Storage backend
 * Aaron Sherber - cache control headers for API calls & use of `shortenviayourls` in query parameters
-* Mikhail Romanov - UI improvements, theme switching, clipboard support, multi-file upload, bugfixes, code refactoring
 
 ## Translations
 * Hexalyse - French

i18n/ar.json

@@ -164,6 +164,14 @@
     "EiB": "إكسابايت",
     "ZiB": "زيتابايت",
     "YiB": "يوتابايت",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "التنسيق",
     "Plain Text": "نص عادي",
     "Source Code": "كود مصدر",

i18n/bg.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Формат",
     "Plain Text": "Чист текст",
     "Source Code": "Изходен код",

i18n/ca.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Text sense format",
     "Source Code": "Codi font",

i18n/co.json

@@ -164,6 +164,14 @@
     "EiB": "Eo",
     "ZiB": "Zo",
     "YiB": "Yo",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Furmatu",
     "Plain Text": "Testu in chjaru",
     "Source Code": "Codice di fonte",

i18n/cs.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formát",
     "Plain Text": "Prostý text",
     "Source Code": "Zdrojový kód",

i18n/de.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Nur Text",
     "Source Code": "Quellcode",

i18n/el.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Μορφοποίηση",
     "Plain Text": "Απλό κείμενο",
     "Source Code": "Πηγαίος Κώδικας",

i18n/en.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Plain Text",
     "Source Code": "Source Code",

i18n/es.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formato",
     "Plain Text": "Texto sin formato",
     "Source Code": "Código fuente",

i18n/et.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formaat",
     "Plain Text": "Lihttekst",
     "Source Code": "Lähtekood",

i18n/fi.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formaatti",
     "Plain Text": "Perusteksti",
     "Source Code": "Lähdekoodi",

i18n/fr.json

@@ -164,6 +164,14 @@
     "EiB": "Eio",
     "ZiB": "Zio",
     "YiB": "Yio",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Texte brut",
     "Source Code": "Code source",

i18n/he.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "פורמט",
     "Plain Text": "טקסט פשוט",
     "Source Code": "קוד מקור",

i18n/hi.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Plain Text",
     "Source Code": "Source Code",

i18n/hu.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formátum",
     "Plain Text": "Egyszerű szöveg",
     "Source Code": "Forráskód",

i18n/id.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Teks Biasa",
     "Source Code": "Kode Sumber",

i18n/it.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formato",
     "Plain Text": "Solo Testo",
     "Source Code": "Codice Sorgente",

i18n/ja.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "形式",
     "Plain Text": "プレーンテキスト",
     "Source Code": "ソースコード",

i18n/jbo.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Plain Text",
     "Source Code": "Source Code",

i18n/ko.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Plain Text",
     "Source Code": "Source Code",

i18n/ku.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Plain Text",
     "Source Code": "Source Code",

i18n/la.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Plain Text",
     "Source Code": "Source Code",

i18n/lt.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formatas",
     "Plain Text": "Grynasis tekstas",
     "Source Code": "Pirminis kodas",

i18n/nl.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formaat",
     "Plain Text": "Platte tekst",
     "Source Code": "Broncode",

i18n/no.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Ren Tekst",
     "Source Code": "Kildekode",

i18n/oc.json

@@ -164,6 +164,14 @@
     "EiB": "Eio",
     "ZiB": "Zio",
     "YiB": "Yio",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Tèxte brut",
     "Source Code": "Còdi font",

i18n/pl.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Czysty tekst",
     "Source Code": "Kod źródłowy",

i18n/pt.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formato",
     "Plain Text": "Texto sem formato",
     "Source Code": "Código fonte",

i18n/ro.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formatare",
     "Plain Text": "Text neformatat",
     "Source Code": "Cod sursă",

i18n/ru.json

@@ -164,6 +164,14 @@
     "EiB": "Эбайт",
     "ZiB": "Збайт",
     "YiB": "Йбайт",
+    "KB": "КБ",
+    "MB": "МБ",
+    "GB": "ГБ",
+    "TB": "ТБ",
+    "PB": "ПБ",
+    "EB": "ЭБ",
+    "ZB": "ЗБ",
+    "YB": "ЙБ",
     "Format": "Формат",
     "Plain Text": "Обычный текст",
     "Source Code": "Исходный код",

i18n/sk.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Formát",
     "Plain Text": "Čistý text",
     "Source Code": "Zdrojový kód",

i18n/sl.json

@@ -164,6 +164,14 @@
     "EiB": "EB",
     "ZiB": "ZB",
     "YiB": "YB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Surov tekst",
     "Source Code": "Odprta koda",

i18n/sv.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Plain Text",
     "Source Code": "Source Code",

i18n/th.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "รูปแบบ",
     "Plain Text": "ข้อความล้วน",
     "Source Code": "ซอร์สโค้ด",

i18n/tr.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Format",
     "Plain Text": "Düz Yazı",
     "Source Code": "Kaynak Kodu",

i18n/uk.json

@@ -164,6 +164,14 @@
     "EiB": "Ебайт",
     "ZiB": "Збайт",
     "YiB": "Йбайт",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "Формат",
     "Plain Text": "Звичайний текст",
     "Source Code": "Вихідний код",

i18n/zh.json

@@ -164,6 +164,14 @@
     "EiB": "EiB",
     "ZiB": "ZiB",
     "YiB": "YiB",
+    "KB": "KB",
+    "MB": "MB",
+    "GB": "GB",
+    "TB": "TB",
+    "PB": "PB",
+    "EB": "EB",
+    "ZB": "ZB",
+    "YB": "YB",
     "Format": "格式",
     "Plain Text": "纯文本",
     "Source Code": "源代码",

js/privatebin.js

@@ -591,6 +591,32 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             return expirationDate;
         };
 
+        /**
+         * Convert Bytes to KiB/MiB/GiB
+         *
+         * @name   Helper.formatBytes
+         * @function
+         *
+         * @param  {number} bytes
+         * @return {string}
+         */
+        me.formatBytes = function (bytes)
+        {
+            let result = '';
+            const kilobyte = 1024;
+            const decimalPoint = 2;
+            const sizes = [I18n._('B'), I18n._('KiB'), I18n._('MiB'), I18n._('GiB')];
+            const index = Math.floor(Math.log(bytes) / Math.log(kilobyte));
+
+            if (bytes > 0) {
+                result = parseFloat((bytes / Math.pow(kilobyte, index)).toFixed(decimalPoint)) + ' ' + sizes[index];
+            } else {
+                result = `0 ${I18n._('B')}`;
+            }
+
+            return result;
+        }
+
         /**
          * resets state, used for unit testing
          *
@@ -3000,7 +3026,9 @@ jQuery.PrivateBin = (function($, RawDeflate) {
 
             if (typeof fileName !== 'undefined') {
                 attachmentLink.attr('download', fileName);
-                template.append(fileName);
+
+                const fileSize = Helper.formatBytes(decodedData.length);
+                template.append(`(${fileName}, ${fileSize})`);
             }
 
             // sanitize SVG preview

js/test/Helper.js

@@ -290,5 +290,31 @@ describe('Helper', function () {
             }
         );
     });
+
+    describe('formatBytes', function () {
+        jsc.property('returns 0 B for 0 bytes', function () {
+            return $.PrivateBin.Helper.formatBytes(0) === '0 B';
+        });
+
+        jsc.property('formats bytes < 1000 as B', function () {
+            return $.PrivateBin.Helper.formatBytes(500) === '500 B';
+        });
+
+        jsc.property('formats kibibytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(1500) === '1.46 KiB';
+        });
+
+        jsc.property('formats mebibytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(2 * 1000 * 1000) === '1.91 MiB';
+        });
+
+        jsc.property('formats gibibytes correctly', function () {
+            return $.PrivateBin.Helper.formatBytes(3.45 * 1000 * 1000 * 1000) === '3.21 GiB';
+        });
+
+        jsc.property('rounds to two decimal places', function () {
+            return $.PrivateBin.Helper.formatBytes(1234567) === '1.18 MiB';
+        });
+    });
 });
 

lib/Configuration.php

@@ -119,7 +119,7 @@ class Configuration
             'js/kjua-0.9.0.js'       => 'sha512-CVn7af+vTMBd9RjoS4QM5fpLFEOtBCoB0zPtaqIDC7sF4F8qgUSRFQQpIyEDGsr6yrjbuOLzdf20tkHHmpaqwQ==',
             'js/legacy.js'           => 'sha512-UxW/TOZKon83n6dk/09GsYKIyeO5LeBHokxyIq+r7KFS5KMBeIB/EM7NrkVYIezwZBaovnyNtY2d9tKFicRlXg==',
             'js/prettify.js'         => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==',
-            'js/privatebin.js'       => 'sha512-m6RrsOsz4RgIWXDzgRghQDx6aegFCpkpqURwhfXwE/rNWhe/1rPJaLR+FXII82iTWo0n9JCzSbqrDqkYVPI50w==',
+            'js/privatebin.js'       => 'sha512-zvJ6Feu2NvROB236BBxbP+8eYbUTJ5GCfhOJVL/RI6pJQpR3AS4ps0d1cVDqgUFW8wY0tiwE7JTE13gPWO3lHA==',
             'js/purify-3.2.6.js'     => 'sha512-zqwL4OoBLFx89QPewkz4Lz5CSA2ktU+f31fuECkF0iK3Id5qd3Zpq5dMby8KwHjIEpsUgOqwF58cnmcaNem0EA==',
             'js/rawinflate-0.3.js'   => 'sha512-g8uelGgJW9A/Z1tB6Izxab++oj5kdD7B4qC7DHwZkB6DGMXKyzx7v5mvap2HXueI2IIn08YlRYM56jwWdm2ucQ==',
             'js/showdown-2.1.0.js'   => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==',