Version 4.0.9

We cannot just disable it for our downloads (reliably)
so disable it completely while we're running.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,11 @@ assignees: ''
 
 ---
 
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -23,16 +28,6 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

LICENSE.md

@@ -30,7 +30,7 @@ THE SOFTWARE.
 ## DownThemAll! uikit
 
 Copyright © 2016-2019 by Nils Maier
-The uikit libraries and assets are licened under the MIT license.
+The uikit libraries and assets are licensed under the MIT license.
 
 ## DownThemAll! interface (.html, .css)
 
@@ -41,7 +41,8 @@ Licensed under GPL2.0; see [LICENSE.gpl-2.0.txt](LICENSE.gpl-2.0.txt).
 ## DownThemAll! icons, icon-font and graphic assets
 
 Copyright (C) 2012-2019 by Nils Maier
-Licensed under Creative Commons Attribution-ShareAlike 4.0 International
+Licensed under Creative Commons Attribution-ShareAlike 4.0 International.
+
 The icon font contains icons from Font Awesome.
 
 See: https://creativecommons.org/licenses/by-sa/4.0/legalcode
@@ -54,21 +55,29 @@ Copyright © 2010-2019 by Nils Maier, Stefano Verna.
 The DownThemAll! name and logo cannot be used without explicit permission
 in any derivative work, except in credits and license-related notices.
 
-Using the DownThemAll! logo in personal non-distributed non-commerical
+Using the DownThemAll! logo in personal non-distributed non-commercial
 modifications of the software and forks is permitted without explicit
 permission.
 
+Distributing official DownThemAll! releases without any modifications is allowed without explicit permission.
+
 ## Font Awesome
 
 Copyright (C) 2016 by Dave Gandy
+
 License:   SIL ()
+
 Homepage:  http://fortawesome.github.com/Font-Awesome/
 
 ## webextension-polyfill
 
-Lcensed under the Mozilla Public License 2.0.
+Licensed under the Mozilla Public License 2.0.
 
 ## PSL (public-suffix-list)
 
 The list itself is licensed under the Mozilla Public License 2.0.
-The javascript library accessing it is licensed under the MIT license.
+The javascript library accessing it is licensed under the MIT license.
+
+## whatwg-mimetype
+
+Licensed under MIT

Readme.md

@@ -1,12 +1,10 @@
-DownThemAll! WE
-===
+# DownThemAll! WE
 
 The DownThemAll! WebExtension.
 
 For those still on supported browser: [Non-WebExtension legacy code](https://github.com/downthemall/downthemall-legacy).
 
-About
----
+## About
 
 This is the WebExtension version of DownThemAll!, a complete re-development from scratch.
 Being a WebExtension it lacks a ton of features the original DownThemAll! had. Sorry, but there is no way around it since Mozilla decided to adopt WebExtensions as the *only* extension type and WebExtensions are extremely limited in what they can do.
@@ -23,19 +21,48 @@ But it is what it is...
 
 **What we *can* do and did do is bring the mass selection, organizing (renaming masks, etc) and queueing tools of DownThemAll! over to the WebExtension, so you can easily queue up hundreds or thousands files at once without the downloads going up in flames because the browser tried to download them all at once.**
 
+## Translations
+
+If you would like to help out translating DTA, please see our [translation guide](_locales/Readme.md).
+
+## Development
 
-Development
----
 
 You will want to `yarn` the development dependencies such as webpack first.
 
-Afterwards there is two important commands to run
+Afterwards, you will want to run`yarn watch`.
+This will run the webpack bundler in watch mode, transpiling the TypeScript to Javascript and updating bundles as you change the source.
 
-  * `yarn watch` - This will run the webpack bundler in watch mode, updating bundles as you change the source.
-  * `yarn webext` - This will run the WebExtension in a development profile using the [`web-ext` tool from mozilla](https://www.npmjs.com/package/web-ext) (which you need to install separately).
+Please note: You have to run `yarn watch` (at least once) as it builds the actual script bundles.
+
+### Firefox
+
+I recommend you install the [`web-ext`](https://www.npmjs.com/package/web-ext) tools from mozilla. It is not listed as a dependency by design at it causes problems with dependency resolution in yarn right now if installed in the same location as the rest of the dependencies.
+
+If you did, then running `yarn webext` (additionally to `yarn watch`) will run the WebExtension in a development profile. This will use the directory `../dtalite.p` to keep a development profile. You might need to create this directory before you use this command. Furthermore `yarn webext` will watch for changes to the sources and automatically reload the extension.
   
-Alternative, you can also `yarn build`, which then builds an *unsigned* zip that you can then install permanently in a browser that does not enforce signing (i.e. Nightly or the Unbranded Firefox).
+Alternative, you can also `yarn build`, which then builds an *unsigned* zip that you can then install permanently in a browser that does not enforce signing (i.e. Nightly or the Unbranded Firefox with the right about:config preferences).
 
-Before submitting patches, please make sure you run eslint, if this isn't done automatically, and eslint does not report any open issues. Code contributions should favor typescript code over javascript code. External dependencies that would ship with the final product (including all npm/yarn packages) should be kept to a bare minimum.
+### Chrome
 
-The code base is comparatively large for a WebExtension, with over 10K sloc of typescript and over 14K sloc total.
+You have to build the bundles first, of course.
+
+Then put your Chrome into Developement Mode on the Extensions page, and Load Unpacked the directory of your downthemall clone.
+
+### Patches
+
+Before submitting patches, please make sure you run eslint (if this isn't done automatically in your text editor/IDE), and eslint does not report any open issues. Code contributions should favor typescript code over javascript code. External dependencies that would ship with the final product (including all npm/yarn packages) should be kept to a bare minimum and need justification.
+
+Please submit your patches as Pull Requests, and rebase your commits onto the current `master` before submitting.
+
+### Code structure
+
+The code base is comparatively large for a WebExtension, with over 11K sloc of typescript.
+It isn't as well organized as it should be in some places; hope you don't mind.
+
+* `uikit/` - The base User Interface Kit, which currently consists of
+  * the `VirtualTable` implementation, aka that interactive HTML table with columns, columns resizing and hiding, etc you see in the Manager, Select and Preferences windows/tabs
+  * the `ContextMenu` and related classes that drive the HTML-based context menus
+* `lib/` - The "backend stuff" and assorted library routines and classes.
+* `windows/` - The "frontend stuff" so all the HTML and corresponding code to make that HTML into something interactive
+* `style/` - CSS and images

TODO.md

@@ -8,7 +8,6 @@ P2
 
 Planned for later.
 
-* Investigate using an action popup for the browser action
 * Soft errors and retry logic
   * Big caveat: When the server still responds, like 50x errors which would be recoverable, we actually have no way of knowing it did in respond in such a way. See P4 - Handle Errors remarks.
 * Delete files (well, as far as the browser allows)
@@ -16,10 +15,6 @@ Planned for later.
   * Add downloads
 * Chrome support
 * vtable perf: cache column widths
-* Localizations
-  * Settle on system
-  * Do the de-locale
-  * Enagage translators
 * Download options
   * This is a bit more limited, as we cannot modify options of downloads that have been started (and paused) or that are done.
 
@@ -40,7 +35,6 @@ Nice-to-haves.
 * Dark Theme support
   * os/browser define be default
   * overwritable
-* Get and cache system icons (because Firefox doesn't allow moz-icon: for WE, but makes them kinda accessible through the downloads API anyway, essentially copying them via a canvas on a privileged hidden page into a data URL... ikr)
 * Remove `any` types as possible, and generally improve typescript (new language to me)
 
 P4
@@ -58,8 +52,6 @@ Stuff that probably cannot be implemented due to WeberEension limitations.
   * Not supported by Firefox
 * Speed limiter
   * Cannot be done with the WebExtensions downloads API
-* Actually send referrers for downloads
-  * Cannot be done with WebExtensions - webRequest does not see Downloads
 * contenthandling aka video sniffing, request manipulation?
   * PITA and/or infeasible - Essentially cannot be done for a large part and the other prt is extemely inefficient
 * Checksums/Hashes?

_locales/Readme.md

@@ -0,0 +1,33 @@
+# Translations
+
+Right now we did not standardize on a tool/website/community use for translations
+
+## Website-based Translation
+
+Please go to [https://downthemall.github.io/translate/](https://downthemall.github.io/translate/) for a "good enough" tool to translate DownThemAll! for now. It will load the English locale as a base automatically.
+
+Then you can translate (your progress will be saved in the browser). Once done, you can Download the `messages.json` and test it or submit it for inclusion.
+
+You can also import your or other people's existing translations to modify. This will overwrite any progress you made so far, tho.
+
+## Manual Translation
+
+* Get the [`en/messages.json`](https://github.com/downthemall/downthemall/raw/master/_locales/en/messages.json) as a base.
+* Translate the `"message"` items in that file only. Whip our your favorite text editor, JSON editor, special translation tool, what have you.
+  * Do not translate anything besides the "message" elements. Pay attention to the descriptions.
+  * Do not remove anything.
+  * Do not translate `$PLACEHOLDERS$`. Placeholders should appear in your translation with the same spelling and all uppercase.
+    They will be relaced at runtime with actual values.
+* Make sure you save the file in an "utf-8" encoding. If you need double quotes, you need to escape the quotes with a backslash, e.g. `"some \"quoted\" text"`
+* You should translate all strings. If you want to skip a string, set it to an empty `""` string. DTA will then use the English string.
+
+## Testing Your Translation
+
+* Go to the DownThemAll! Preferences where you will find a "Load custom translation" button.
+* Select your translated `messages.json`. (it doesn't have to be named exactly like that, but should have a `.json` extension)
+  * If everything was OK, you will be asked to reload the extension (this will only reload DTA not the entire browser).
+* See your strings in action once you reloaded DTA (either by answering OK when asked, or disable/enable the extension manually or restart your browser).
+
+## Submitting Your Translation
+
+If you're happy with the result and would like to contribute it back, you can either file a full Pull Request, or just file an issue and post a link to e.g. a [gist](https://gist.github.com/) or paste the translation in the issue text.

_locales/all.json

@@ -0,0 +1,18 @@
+{
+  "cs": "Čeština (CZ) [cs]",
+  "de": "Deutsch [de]",
+  "el": "Ελληνικά [el]",
+  "en": "English (US) [en]",
+  "es": "Español (España) [es]",
+  "et": "Eesti Keel [et]",
+  "fr": "Français (FR) [fr]",
+  "id": "Bahasa Indonesia [id]",
+  "ko": "한국어 [ko]",
+  "lt": "Lietuvių [lt]",
+  "nl": "Nederlands [nl]",
+  "pl": "Polski (PL) [pl]",
+  "pt": "Português (Brasil) [pt]",
+  "ru": "Русский [ru]",
+  "zh_CN": "简体中文 [zh_CN]",
+  "zh_TW": "正體中文 [zh_TW]"
+}

data/filters.json

@@ -14,7 +14,7 @@
 	},
 	"deffilter-aud": {
 		"label": "Audio",
-		"expr": "/\\.(?:mp3|wav|og(?:g|a)|flac|midi?|rm|aac|wma|mka|ape)$/i",
+		"expr": "/\\.(?:mp3|wav|og(?:g|a)|flac|midi?|rm|aac|wma|mka|ape|opus)$/i",
 		"type": 1,
 		"active": false,
 		"icon": "mp3"
@@ -35,7 +35,7 @@
 	},
 	"deffilter-img": {
 		"label": "Images",
-		"expr": "/\\.(?:jp(?:e?g|e|2)|gif|png|tiff?|bmp|ico)$/i",
+		"expr": "/\\.(?:jp(?:e?g|e|2)|gif|png|tiff?|bmp|ico|heic|heif|webp|jxr|wdp|dng|cr2|arw)$/i",
 		"type": 3,
 		"active": false,
 		"icon": "jpg"
@@ -63,7 +63,7 @@
 	},
 	"deffilter-vid": {
 		"label": "Videos",
-		"expr": "/\\.(?:mpeg|ra?m|avi|mp(?:g|e|4)|mov|divx|asf|qt|wmv|m\\dv|rv|vob|asx|ogm|ogv|webm|flv|mkv)$/i",
+		"expr": "/\\.(?:mpeg|ra?m|avi|mp(?:g|e|4)|mov|divx|asf|qt|wmv|m\\dv|rv|vob|asx|ogm|ogv|webm|flv|mkv|f4v|m4v)$/i",
 		"type": 3,
 		"active": true,
 		"icon": "mkv"

data/icons.json

@@ -80,7 +80,11 @@
 		"tif",
 		"tiff",
 		"wmf",
-		"webp"
+		"webp",
+		"heic",
+		"heif",
+		"jxr",
+		"wdp"
 	],
 	"video": [
 		"3g2",

data/mime.json

@@ -0,0 +1,396 @@
+{
+  "e": {
+    "3gpp": "3gp",
+    "asx": "asf",
+    "gz": "gzip",
+    "heic": "heif",
+    "html": [
+      "htm",
+      "shtml",
+      "php"
+    ],
+    "jar": [
+      "war",
+      "ear"
+    ],
+    "jpg": [
+      "jpeg",
+      "jpe",
+      "jfif"
+    ],
+    "js": "jsx",
+    "mid": [
+      "midi",
+      "kar"
+    ],
+    "mkv": [
+      "mk3d",
+      "mks"
+    ],
+    "mov": [
+      "qt",
+      "moov"
+    ],
+    "mpg": [
+      "mpe",
+      "mpeg"
+    ],
+    "pem": [
+      "crt",
+      "der"
+    ],
+    "pl": "pm",
+    "prc": "pdb",
+    "ps": [
+      "eps",
+      "ai"
+    ],
+    "svg": "svgz",
+    "tcl": "tk",
+    "tif": "tiff"
+  },
+  "m": {
+    "application/7z": "7z",
+    "application/7z-compressed": "7z",
+    "application/ai": "ps",
+    "application/atom": "atom",
+    "application/atom+xml": "atom",
+    "application/bz2": "bz2",
+    "application/bzip2": "bz2",
+    "application/cco": "cco",
+    "application/cocoa": "cco",
+    "application/compressed": "gz",
+    "application/crt": "pem",
+    "application/der": "pem",
+    "application/doc": "doc",
+    "application/ear": "jar",
+    "application/eot": "eot",
+    "application/eps": "ps",
+    "application/gz": "gz",
+    "application/gzip": "gz",
+    "application/hqx": "hqx",
+    "application/jar": "jar",
+    "application/jardiff": "jardiff",
+    "application/java-archive": "jar",
+    "application/java-archive-diff": "jardiff",
+    "application/java-jnlp-file": "jnlp",
+    "application/javascript": "js",
+    "application/jnlp": "jnlp",
+    "application/js": "js",
+    "application/json": "json",
+    "application/jsx": "js",
+    "application/kml": "kml",
+    "application/kmz": "kmz",
+    "application/m3u8": "m3u8",
+    "application/mac-binhex40": "hqx",
+    "application/makeself": "run",
+    "application/msword": "doc",
+    "application/odg": "odg",
+    "application/odp": "odp",
+    "application/ods": "ods",
+    "application/odt": "odt",
+    "application/pdb": "prc",
+    "application/pdf": "pdf",
+    "application/pem": "pem",
+    "application/perl": "pl",
+    "application/pilot": "prc",
+    "application/pl": "pl",
+    "application/pm": "pl",
+    "application/postscript": "ps",
+    "application/ppt": "ppt",
+    "application/prc": "prc",
+    "application/ps": "ps",
+    "application/rar": "rar",
+    "application/rar-compressed": "rar",
+    "application/redhat-package-manager": "rpm",
+    "application/rpm": "rpm",
+    "application/rss": "rss",
+    "application/rss+xml": "rss",
+    "application/rtf": "rtf",
+    "application/run": "run",
+    "application/sea": "sea",
+    "application/shockwave-flash": "swf",
+    "application/sit": "sit",
+    "application/stuffit": "sit",
+    "application/swf": "swf",
+    "application/tar": "tar",
+    "application/tcl": "tcl",
+    "application/tk": "tcl",
+    "application/vnd.apple.mpegurl": "m3u8",
+    "application/vnd.google-earth.kml+xml": "kml",
+    "application/vnd.google-earth.kmz": "kmz",
+    "application/vnd.ms-excel": "xls",
+    "application/vnd.ms-fontobject": "eot",
+    "application/vnd.ms-powerpoint": "ppt",
+    "application/vnd.oasis.opendocument.graphics": "odg",
+    "application/vnd.oasis.opendocument.presentation": "odp",
+    "application/vnd.oasis.opendocument.spreadsheet": "ods",
+    "application/vnd.oasis.opendocument.text": "odt",
+    "application/vnd.wap.wmlc": "wmlc",
+    "application/war": "jar",
+    "application/wmlc": "wmlc",
+    "application/x-7z": "7z",
+    "application/x-7z-compressed": "7z",
+    "application/x-ai": "ps",
+    "application/x-atom": "atom",
+    "application/x-atom+xml": "atom",
+    "application/x-bz2": "bz2",
+    "application/x-bzip2": "bz2",
+    "application/x-cco": "cco",
+    "application/x-cocoa": "cco",
+    "application/x-compressed": "gz",
+    "application/x-crt": "pem",
+    "application/x-der": "pem",
+    "application/x-doc": "doc",
+    "application/x-ear": "jar",
+    "application/x-eot": "eot",
+    "application/x-eps": "ps",
+    "application/x-gz": "gz",
+    "application/x-gzip": "gz",
+    "application/x-hqx": "hqx",
+    "application/x-jar": "jar",
+    "application/x-jardiff": "jardiff",
+    "application/x-java-archive": "jar",
+    "application/x-java-archive-diff": "jardiff",
+    "application/x-java-jnlp-file": "jnlp",
+    "application/x-javascript": "js",
+    "application/x-jnlp": "jnlp",
+    "application/x-js": "js",
+    "application/x-json": "json",
+    "application/x-jsx": "js",
+    "application/x-kml": "kml",
+    "application/x-kmz": "kmz",
+    "application/x-m3u8": "m3u8",
+    "application/x-mac-binhex40": "hqx",
+    "application/x-makeself": "run",
+    "application/x-msword": "doc",
+    "application/x-odg": "odg",
+    "application/x-odp": "odp",
+    "application/x-ods": "ods",
+    "application/x-odt": "odt",
+    "application/x-pdb": "prc",
+    "application/x-pdf": "pdf",
+    "application/x-pem": "pem",
+    "application/x-perl": "pl",
+    "application/x-pilot": "prc",
+    "application/x-pl": "pl",
+    "application/x-pm": "pl",
+    "application/x-postscript": "ps",
+    "application/x-ppt": "ppt",
+    "application/x-prc": "prc",
+    "application/x-ps": "ps",
+    "application/x-rar": "rar",
+    "application/x-rar-compressed": "rar",
+    "application/x-redhat-package-manager": "rpm",
+    "application/x-rpm": "rpm",
+    "application/x-rss": "rss",
+    "application/x-rss+xml": "rss",
+    "application/x-rtf": "rtf",
+    "application/x-run": "run",
+    "application/x-sea": "sea",
+    "application/x-shockwave-flash": "swf",
+    "application/x-sit": "sit",
+    "application/x-stuffit": "sit",
+    "application/x-swf": "swf",
+    "application/x-tar": "tar",
+    "application/x-tcl": "tcl",
+    "application/x-tk": "tcl",
+    "application/x-vnd.apple.mpegurl": "m3u8",
+    "application/x-vnd.google-earth.kml+xml": "kml",
+    "application/x-vnd.google-earth.kmz": "kmz",
+    "application/x-vnd.ms-excel": "xls",
+    "application/x-vnd.ms-fontobject": "eot",
+    "application/x-vnd.ms-powerpoint": "ppt",
+    "application/x-vnd.oasis.opendocument.graphics": "odg",
+    "application/x-vnd.oasis.opendocument.presentation": "odp",
+    "application/x-vnd.oasis.opendocument.spreadsheet": "ods",
+    "application/x-vnd.oasis.opendocument.text": "odt",
+    "application/x-vnd.wap.wmlc": "wmlc",
+    "application/x-war": "jar",
+    "application/x-wmlc": "wmlc",
+    "application/x-x509-ca-cert": "pem",
+    "application/x-xhtml": "xhtml",
+    "application/x-xhtml+xml": "xhtml",
+    "application/x-xls": "xls",
+    "application/x-xpi": "xpi",
+    "application/x-xpinstall": "xpi",
+    "application/x-xspf": "xspf",
+    "application/x-xspf+xml": "xspf",
+    "application/x-xz": "xz",
+    "application/x-zip": "zip",
+    "application/x509-ca-cert": "pem",
+    "application/xhtml": "xhtml",
+    "application/xhtml+xml": "xhtml",
+    "application/xls": "xls",
+    "application/xpi": "xpi",
+    "application/xpinstall": "xpi",
+    "application/xspf": "xspf",
+    "application/xspf+xml": "xspf",
+    "application/xz": "xz",
+    "application/zip": "zip",
+    "audio/kar": "mid",
+    "audio/m4a": "m4a",
+    "audio/matroska": "mka",
+    "audio/mid": "mid",
+    "audio/midi": "mid",
+    "audio/mka": "mka",
+    "audio/mp3": "mp3",
+    "audio/mpeg": "mp3",
+    "audio/ogg": "ogg",
+    "audio/ra": "ra",
+    "audio/realaudio": "ra",
+    "audio/x-kar": "mid",
+    "audio/x-m4a": "m4a",
+    "audio/x-matroska": "mka",
+    "audio/x-mid": "mid",
+    "audio/x-midi": "mid",
+    "audio/x-mka": "mka",
+    "audio/x-mp3": "mp3",
+    "audio/x-mpeg": "mp3",
+    "audio/x-ogg": "ogg",
+    "audio/x-ra": "ra",
+    "audio/x-realaudio": "ra",
+    "font/woff": "woff",
+    "font/woff2": "woff2",
+    "font/x-woff": "woff",
+    "font/x-woff2": "woff2",
+    "image/bmp": "bmp",
+    "image/gif": "gif",
+    "image/heic": "heic",
+    "image/heif": "heic",
+    "image/heif-sequence": "heic",
+    "image/ico": "ico",
+    "image/icon": "ico",
+    "image/jfif": "jpg",
+    "image/jng": "jng",
+    "image/jpe": "jpg",
+    "image/jpeg": "jpg",
+    "image/jpg": "jpg",
+    "image/ms-bmp": "bmp",
+    "image/png": "png",
+    "image/svg": "svg",
+    "image/svg+xml": "svg",
+    "image/svgz": "svg",
+    "image/tif": "tif",
+    "image/tiff": "tif",
+    "image/vnd.wap.wbmp": "wbmp",
+    "image/wbmp": "wbmp",
+    "image/webp": "webp",
+    "image/x-bmp": "bmp",
+    "image/x-gif": "gif",
+    "image/x-heic": "heic",
+    "image/x-heif": "heic",
+    "image/x-heif-sequence": "heic",
+    "image/x-ico": "ico",
+    "image/x-icon": "ico",
+    "image/x-jfif": "jpg",
+    "image/x-jng": "jng",
+    "image/x-jpe": "jpg",
+    "image/x-jpeg": "jpg",
+    "image/x-jpg": "jpg",
+    "image/x-ms-bmp": "bmp",
+    "image/x-png": "png",
+    "image/x-svg": "svg",
+    "image/x-svg+xml": "svg",
+    "image/x-svgz": "svg",
+    "image/x-tif": "tif",
+    "image/x-tiff": "tif",
+    "image/x-vnd.wap.wbmp": "wbmp",
+    "image/x-wbmp": "wbmp",
+    "image/x-webp": "webp",
+    "text/component": "htc",
+    "text/css": "css",
+    "text/htc": "htc",
+    "text/htm": "html",
+    "text/html": "html",
+    "text/jad": "jad",
+    "text/javascript": "js",
+    "text/js": "js",
+    "text/jsx": "js",
+    "text/mathml": "mml",
+    "text/mml": "mml",
+    "text/php": "html",
+    "text/plain": "txt",
+    "text/shtml": "html",
+    "text/txt": "txt",
+    "text/vnd.sun.j2me.app-descriptor": "jad",
+    "text/vnd.wap.wml": "wml",
+    "text/wml": "wml",
+    "text/x-component": "htc",
+    "text/x-css": "css",
+    "text/x-htc": "htc",
+    "text/x-htm": "html",
+    "text/x-html": "html",
+    "text/x-jad": "jad",
+    "text/x-javascript": "js",
+    "text/x-js": "js",
+    "text/x-jsx": "js",
+    "text/x-mathml": "mml",
+    "text/x-mml": "mml",
+    "text/x-php": "html",
+    "text/x-plain": "txt",
+    "text/x-shtml": "html",
+    "text/x-txt": "txt",
+    "text/x-vnd.sun.j2me.app-descriptor": "jad",
+    "text/x-vnd.wap.wml": "wml",
+    "text/x-wml": "wml",
+    "text/x-xml": "xml",
+    "text/xml": "xml",
+    "video/3gp": "3gpp",
+    "video/3gpp": "3gpp",
+    "video/asf": "asx",
+    "video/asx": "asx",
+    "video/avi": "avi",
+    "video/flv": "flv",
+    "video/m4v": "m4v",
+    "video/matroska": "mkv",
+    "video/mk3d": "mkv",
+    "video/mks": "mkv",
+    "video/mkv": "mkv",
+    "video/mng": "mng",
+    "video/moov": "mov",
+    "video/mov": "mov",
+    "video/mp2t": "ts",
+    "video/mp4": "mp4",
+    "video/mpe": "mpg",
+    "video/mpeg": "mpg",
+    "video/mpg": "mpg",
+    "video/ms-asf": "asx",
+    "video/ms-wmv": "wmv",
+    "video/msvideo": "avi",
+    "video/opus": "opus",
+    "video/qt": "mov",
+    "video/quicktime": "mov",
+    "video/ts": "ts",
+    "video/webm": "webm",
+    "video/wmv": "wmv",
+    "video/x-3gp": "3gpp",
+    "video/x-3gpp": "3gpp",
+    "video/x-asf": "asx",
+    "video/x-asx": "asx",
+    "video/x-avi": "avi",
+    "video/x-flv": "flv",
+    "video/x-m4v": "m4v",
+    "video/x-matroska": "mkv",
+    "video/x-mk3d": "mkv",
+    "video/x-mks": "mkv",
+    "video/x-mkv": "mkv",
+    "video/x-mng": "mng",
+    "video/x-moov": "mov",
+    "video/x-mov": "mov",
+    "video/x-mp2t": "ts",
+    "video/x-mp4": "mp4",
+    "video/x-mpe": "mpg",
+    "video/x-mpeg": "mpg",
+    "video/x-mpg": "mpg",
+    "video/x-ms-asf": "asx",
+    "video/x-ms-wmv": "wmv",
+    "video/x-msvideo": "avi",
+    "video/x-opus": "opus",
+    "video/x-qt": "mov",
+    "video/x-quicktime": "mov",
+    "video/x-ts": "ts",
+    "video/x-webm": "webm",
+    "video/x-wmv": "wmv"
+  }
+}

data/prefs.json

@@ -6,9 +6,10 @@
 	"open-manager-on-queue": true,
 	"text-links": true,
 	"add-paused": false,
+	"hide-context": false,
 	"conflict-action": "uniquify",
 	"nagging": 0,
-	"nagging-next": 6,
+	"nagging-next": 7,
 	"tooltip": true,
 	"show-urls": false,
 	"remove-missing-on-init": false,

lib/api.ts

@@ -5,7 +5,8 @@ import { TYPE_LINK, TYPE_MEDIA } from "./constants";
 import { filters } from "./filters";
 import { Prefs } from "./prefs";
 import { lazy } from "./util";
-import { Item, makeUniqueItems } from "./item";
+// eslint-disable-next-line no-unused-vars
+import { Item, makeUniqueItems, BaseItem } from "./item";
 import { getManager } from "./manager/man";
 import { select } from "./select";
 import { single } from "./single";
@@ -16,12 +17,17 @@ import { _ } from "./i18n";
 
 const MAX_BATCH = 10000;
 
-export const API = new class {
-  async filter(arr: any, type: number) {
-    return (await filters()).filterItemsByType(arr, type);
+export interface QueueOptions {
+  mask?: string;
+  paused?: boolean;
+}
+
+export const API = new class APIImpl {
+  async filter(arr: BaseItem[], type: number) {
+    return await (await filters()).filterItemsByType(arr, type);
   }
 
-  async queue(items: any, options: any) {
+  async queue(items: BaseItem[], options: QueueOptions) {
     await MASK.init();
     const {mask = MASK.current} = options;
 
@@ -36,12 +42,9 @@ export const API = new class {
       fileName: null,
       title: "",
       description: "",
-      fromMetalink: false,
       startDate: new Date(),
-      hashes: [],
       private: false,
       postData: null,
-      cleanRequest: false,
       mask,
       date: Date.now(),
       paused
@@ -54,7 +57,7 @@ export const API = new class {
       }
       return currentBatch;
     });
-    items = items.map((i: any) => {
+    items = items.map(i => {
       delete i.idx;
       return new Item(i, defaults);
     });
@@ -79,7 +82,7 @@ export const API = new class {
     }
   }
 
-  sanity(links: any[], media: any[]) {
+  sanity(links: BaseItem[], media: BaseItem[]) {
     if (!links.length && !media.length) {
       new Notification(null, _("no-links"));
       return false;
@@ -87,48 +90,53 @@ export const API = new class {
     return true;
   }
 
-  async turbo(links: any[], media: any[]) {
+  async turbo(links: BaseItem[], media: BaseItem[]) {
     if (!this.sanity(links, media)) {
       return false;
     }
-    const selected = makeUniqueItems([
-      await API.filter(links, TYPE_LINK),
-      await API.filter(media, TYPE_MEDIA),
-    ]);
+    const type = await Prefs.get("last-type", "links");
+    const items = await (async () => {
+      if (type === "links") {
+        return await API.filter(links, TYPE_LINK);
+      }
+      return await API.filter(media, TYPE_MEDIA);
+    })();
+    const selected = makeUniqueItems([items]);
     if (!selected.length) {
       return await this.regular(links, media);
     }
     return await this.queue(selected, {paused: await Prefs.get("add-paused")});
   }
 
-  async regularInternal(selected: any) {
-    if (selected.mask && !selected.maskOnce) {
+  async regularInternal(selected: BaseItem[], options: any) {
+    if (options.mask && !options.maskOnce) {
       await MASK.init();
-      await MASK.push(selected.mask);
+      await MASK.push(options.mask);
     }
-    if (typeof selected.fast === "string" && !selected.fastOnce) {
+    if (typeof options.fast === "string" && !options.fastOnce) {
       await FASTFILTER.init();
-      await FASTFILTER.push(selected.fast);
+      await FASTFILTER.push(options.fast);
     }
-    const {items} = selected;
-    delete selected.items;
-    return await this.queue(items, selected);
+    if (typeof options.type === "string") {
+      await Prefs.set("last-type", options.type);
+    }
+    return await this.queue(selected, options);
   }
 
-  async regular(links: any[], media: any[]) {
+  async regular(links: BaseItem[], media: BaseItem[]) {
     if (!this.sanity(links, media)) {
       return false;
     }
-    const selected = await select(links, media);
-    return this.regularInternal(selected);
+    const {items, options} = await select(links, media);
+    return this.regularInternal(items, options);
   }
 
-  async singleTurbo(item: any) {
+  async singleTurbo(item: BaseItem) {
     return await this.queue([item], {paused: await Prefs.get("add-paused")});
   }
 
-  async singleRegular(item: any) {
-    const selected = await single(item);
-    return this.regularInternal(selected);
+  async singleRegular(item: BaseItem | null) {
+    const {items, options} = await single(item);
+    return this.regularInternal(items, options);
   }
 }();

lib/background.ts

@@ -5,7 +5,7 @@ import { ALLOWED_SCHEMES, TRANSFERABLE_PROPERTIES } from "./constants";
 import { API } from "./api";
 import { Finisher, makeUniqueItems } from "./item";
 import { Prefs } from "./prefs";
-import { _ } from "./i18n";
+import { _, locale } from "./i18n";
 import { openPrefs, openManager } from "./windowutils";
 import { filters } from "./filters";
 import { getManager } from "./manager/man";
@@ -13,13 +13,37 @@ import {
   browserAction as action,
   menus as _menus, contextMenus as _cmenus,
   tabs,
-  webNavigation as nav
+  webNavigation as nav,
+  // eslint-disable-next-line no-unused-vars
+  Tab,
+  // eslint-disable-next-line no-unused-vars
+  MenuClickInfo,
+  CHROME,
 } from "./browser";
+import { Bus } from "./bus";
+import { filterInSitu } from "./util";
+
 
 const menus = typeof (_menus) !== "undefined" && _menus || _cmenus;
 
+const GATHER = "/bundles/content-gather.js";
 
-async function runContentJob(tab: any, file: string, msg: any) {
+const CHROME_CONTEXTS = Object.freeze(new Set([
+  "all",
+  "audio",
+  "browser_action",
+  "editable",
+  "frame",
+  "image",
+  "launcher",
+  "link",
+  "page",
+  "page_action",
+  "selection",
+  "video",
+]));
+
+async function runContentJob(tab: Tab, file: string, msg: any) {
   try {
     const res = await tabs.executeScript(tab.id, {
       file,
@@ -48,6 +72,14 @@ async function runContentJob(tab: any, file: string, msg: any) {
   }
 }
 
+type SelectionOptions = {
+  selectionOnly: boolean;
+  allTabs: boolean;
+  turbo: boolean;
+  tab: Tab;
+};
+
+
 class Handler {
   async processResults(turbo = false, results: any[]) {
     const links = this.makeUnique(results, "links");
@@ -59,305 +91,489 @@ class Handler {
     return makeUniqueItems(
       results.filter(e => e[what]).map(e => {
         const finisher = new Finisher(e);
-        return e[what].
-          map((item: any) => finisher.finish(item)).
-          filter((i: any) => i);
+        return filterInSitu(e[what].
+          map((item: any) => finisher.finish(item)), e => !!e);
       }));
   }
+
+  async performSelection(options: SelectionOptions) {
+    try {
+      const toptions: any = {
+        currentWindow: true,
+        discarded: false,
+      };
+      if (!CHROME) {
+        toptions.hidden = false;
+      }
+      const selectedTabs = options.allTabs ?
+        await tabs.query(toptions) as any[] :
+        [options.tab];
+
+      const textLinks = await Prefs.get("text-links", true);
+      const goptions = {
+        type: "DTA:gather",
+        selectionOnly: options.selectionOnly,
+        textLinks,
+        schemes: Array.from(ALLOWED_SCHEMES.values()),
+        transferable: TRANSFERABLE_PROPERTIES,
+      };
+
+      const results = await Promise.all(selectedTabs.
+        map((tab: any) => runContentJob(tab, GATHER, goptions)));
+
+      await this.processResults(options.turbo, results.flat());
+    }
+    catch (ex) {
+      console.error(ex.toString(), ex.stack, ex);
+    }
+  }
 }
 
-new class Action extends Handler {
-  constructor() {
-    super();
-    this.onClicked = this.onClicked.bind(this);
-    action.onClicked.addListener(this.onClicked);
-  }
-
-  async onClicked(tab: {id: number}) {
-    if (!tab.id) {
-      return;
+locale.then(() => {
+  new class Action extends Handler {
+    constructor() {
+      super();
+      this.onClicked = this.onClicked.bind(this);
+      action.onClicked.addListener(this.onClicked);
     }
-    try {
-      await this.processResults(
-        await Prefs.get("global-turbo"),
-        await runContentJob(
-          tab, "/bundles/content-gather.js", {
-            type: "DTA:gather",
-            selectionOnly: false,
-            textLinks: await Prefs.get("text-links", true),
-            schemes: Array.from(ALLOWED_SCHEMES.values()),
-            transferable: TRANSFERABLE_PROPERTIES,
-          }));
-    }
-    catch (ex) {
-      console.error(ex);
-    }
-  }
-}();
 
-new class Menus extends Handler {
-  constructor() {
-    super();
-    this.onClicked = this.onClicked.bind(this);
-    menus.create({
-      id: "DTARegular",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular"),
-    });
-    menus.create({
-      id: "DTATurbo",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo"),
-    });
-    menus.create({
-      id: "DTARegularLink",
-      contexts: ["link"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.link"),
-    });
-    menus.create({
-      id: "DTATurboLink",
-      contexts: ["link"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.link"),
-    });
-    menus.create({
-      id: "DTARegularImage",
-      contexts: ["image"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.image"),
-    });
-    menus.create({
-      id: "DTATurboImage",
-      contexts: ["image"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.image"),
-    });
-    menus.create({
-      id: "DTARegularMedia",
-      contexts: ["video", "audio"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.media"),
-    });
-    menus.create({
-      id: "DTATurboMedia",
-      contexts: ["video", "audio"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.media"),
-    });
-    menus.create({
-      id: "DTARegularSelection",
-      contexts: ["selection"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.selection"),
-    });
-    menus.create({
-      id: "DTATurboSelection",
-      contexts: ["selection"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.selection"),
-    });
-    menus.create({
-      id: "sep-1",
-      contexts: ["all", "browser_action", "tools_menu"],
-      type: "separator"
-    });
-    menus.create({
-      id: "DTAManager",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/button-manager.png",
-        32: "/style/button-manager@2x.png",
-      },
-      title: _("manager.short"),
-    });
-    menus.create({
-      id: "DTAPrefs",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/settings.svg",
-        32: "/style/settings.svg",
-        64: "/style/settings.svg",
-        128: "/style/settings.svg",
-      },
-      title: _("prefs.short"),
-    });
-    menus.onClicked.addListener(this.onClicked);
-  }
+    async onClicked(tab: {id: number}) {
+      if (!tab.id) {
+        return;
+      }
+      try {
+        await this.processResults(
+          true,
+          await runContentJob(
+            tab, "/bundles/content-gather.js", {
+              type: "DTA:gather",
+              selectionOnly: false,
+              textLinks: await Prefs.get("text-links", true),
+              schemes: Array.from(ALLOWED_SCHEMES.values()),
+              transferable: TRANSFERABLE_PROPERTIES,
+            }));
+      }
+      catch (ex) {
+        console.error(ex);
+      }
+    }
+  }();
 
-  *makeSingleItemList(url: string, results: any[]) {
-    for (const result of results) {
-      const finisher = new Finisher(result);
-      for (const list of [result.links, result.media]) {
-        for (const e of list) {
-          if (e.url !== url) {
-            continue;
+  const menuHandler = new class Menus extends Handler {
+    constructor() {
+      super();
+      this.onClicked = this.onClicked.bind(this);
+      const alls = new Map<string, string[]>();
+      const mcreate = (options: any) => {
+        if (CHROME) {
+          delete options.icons;
+          options.contexts = options.contexts.
+            filter((e: string) => CHROME_CONTEXTS.has(e));
+          if (!options.contexts.length) {
+            return;
           }
-          const finished = finisher.finish(e);
-          if (!finished) {
-            continue;
+        }
+        if (options.contexts.includes("all")) {
+          alls.set(options.id, options.contexts);
+        }
+        menus.create(options);
+      };
+      mcreate({
+        id: "DTARegularLink",
+        contexts: ["link"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.link"),
+      });
+      mcreate({
+        id: "DTATurboLink",
+        contexts: ["link"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.link"),
+      });
+      mcreate({
+        id: "DTARegularImage",
+        contexts: ["image"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.image"),
+      });
+      mcreate({
+        id: "DTATurboImage",
+        contexts: ["image"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.image"),
+      });
+      mcreate({
+        id: "DTARegularMedia",
+        contexts: ["video", "audio"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.media"),
+      });
+      mcreate({
+        id: "DTATurboMedia",
+        contexts: ["video", "audio"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.media"),
+      });
+      mcreate({
+        id: "DTARegularSelection",
+        contexts: ["selection"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.selection"),
+      });
+      mcreate({
+        id: "DTATurboSelection",
+        contexts: ["selection"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.selection"),
+      });
+      mcreate({
+        id: "DTARegular",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular"),
+      });
+      mcreate({
+        id: "DTATurbo",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo"),
+      });
+      mcreate({
+        id: "sep-1",
+        contexts: ["all", "browser_action", "tools_menu"],
+        type: "separator"
+      });
+      mcreate({
+        id: "DTARegularAll",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta-regular-all"),
+      });
+      mcreate({
+        id: "DTATurboAll",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta-turbo-all"),
+      });
+      const sep2ctx = menus.ACTION_MENU_TOP_LEVEL_LIMIT === 6 ?
+        ["all", "tools_menu"] :
+        ["all", "browser_action", "tools_menu"];
+      mcreate({
+        id: "sep-2",
+        contexts: sep2ctx,
+        type: "separator"
+      });
+      mcreate({
+        id: "DTAAdd",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/add.svg",
+          32: "/style/add.svg",
+          64: "/style/add.svg",
+          128: "/style/add.svg",
+        },
+        title: _("add-download"),
+      });
+      mcreate({
+        id: "sep-3",
+        contexts: ["all", "browser_action", "tools_menu"],
+        type: "separator"
+      });
+      mcreate({
+        id: "DTAManager",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-manager.png",
+          32: "/style/button-manager@2x.png",
+        },
+        title: _("manager.short"),
+      });
+      mcreate({
+        id: "DTAPrefs",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/settings.svg",
+          32: "/style/settings.svg",
+          64: "/style/settings.svg",
+          128: "/style/settings.svg",
+        },
+        title: _("prefs.short"),
+      });
+      Object.freeze(alls);
+
+      const adjustMenus = (v: boolean) => {
+        for (const [id, contexts] of alls.entries()) {
+          const adjusted = v ?
+            contexts.filter(e => e !== "all") :
+            contexts;
+          menus.update(id, {
+            contexts: adjusted
+          });
+        }
+      };
+      Prefs.get("hide-context", false).then((v: boolean) => {
+      // This is the initial load, so no need to adjust when visible already
+        if (!v) {
+          return;
+        }
+        adjustMenus(v);
+      });
+      Prefs.on("hide-context", (prefs, key, value: boolean) => {
+        adjustMenus(value);
+      });
+
+      menus.onClicked.addListener(this.onClicked);
+    }
+
+    *makeSingleItemList(url: string, results: any[]) {
+      for (const result of results) {
+        const finisher = new Finisher(result);
+        for (const list of [result.links, result.media]) {
+          for (const e of list) {
+            if (e.url !== url) {
+              continue;
+            }
+            const finished = finisher.finish(e);
+            if (!finished) {
+              continue;
+            }
+            yield finished;
           }
-          yield finished;
         }
       }
     }
-  }
 
-  async findSingleItem(tab: any, url: string, turbo = false) {
-    if (!url) {
-      return;
+    async findSingleItem(tab: Tab, url: string, turbo = false) {
+      if (!url) {
+        return;
+      }
+      const results = await runContentJob(
+        tab, "/bundles/content-gather.js", {
+          type: "DTA:gather",
+          selectionOnly: false,
+          schemes: Array.from(ALLOWED_SCHEMES.values()),
+          transferable: TRANSFERABLE_PROPERTIES,
+        });
+      const found = Array.from(this.makeSingleItemList(url, results));
+      const unique = makeUniqueItems([found]);
+      if (!unique.length) {
+        return;
+      }
+      const [item] = unique;
+      API[turbo ? "singleTurbo" : "singleRegular"](item);
     }
-    const results = await runContentJob(
-      tab, "/bundles/content-gather.js", {
-        type: "DTA:gather",
-        selectionOnly: false,
-        schemes: Array.from(ALLOWED_SCHEMES.values()),
-        transferable: TRANSFERABLE_PROPERTIES,
+
+    onClicked(info: MenuClickInfo, tab: Tab) {
+      if (!tab.id) {
+        return;
+      }
+      const {menuItemId} = info;
+      const {[`onClicked${menuItemId}`]: handler}: any = this;
+      if (!handler) {
+        console.error("Invalid Handler for", menuItemId);
+        return;
+      }
+      const rv: Promise<void> | void = handler.call(this, info, tab);
+      if (rv && rv.catch) {
+        rv.catch(console.error);
+      }
+    }
+
+    async enumulate(action: string) {
+      const tab = await tabs.query({
+        active: true,
+        currentWindow: true,
       });
-    const found = Array.from(this.makeSingleItemList(url, results));
-    const unique = makeUniqueItems([found]);
-    if (!unique.length) {
-      return;
+      if (!tab || !tab.length) {
+        return;
+      }
+      this.onClicked({
+        menuItemId: action
+      }, tab[0]);
     }
-    const [item] = unique;
-    API[turbo ? "singleTurbo" : "singleRegular"](item);
-  }
 
-  onClicked(info: any, tab: any) {
-    if (!tab.id) {
-      return;
+    async onClickedDTARegular(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: false,
+        turbo: false,
+        tab,
+      });
     }
-    const {menuItemId} = info;
-    const {[`onClicked${menuItemId}`]: handler}: any = this;
-    if (!handler) {
-      console.error("Invalid Handler for", menuItemId);
-      return;
+
+    async onClickedDTARegularAll(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: true,
+        turbo: false,
+        tab,
+      });
     }
-    handler.call(this, info, tab).catch(console.error);
-  }
 
-  async onClickedDTARegularInternal(
-      selectionOnly: boolean, info: any, tab: any) {
-    try {
-      await this.processResults(
-        false,
-        await runContentJob(
-          tab, "/bundles/content-gather.js", {
-            type: "DTA:gather",
-            selectionOnly,
-            textLinks: await Prefs.get("text-links", true),
-            schemes: Array.from(ALLOWED_SCHEMES.values()),
-            transferable: TRANSFERABLE_PROPERTIES,
-          }));
+    async onClickedDTARegularSelection(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: true,
+        allTabs: false,
+        turbo: false,
+        tab,
+      });
     }
-    catch (ex) {
-      console.error(ex);
+
+    async onClickedDTATurbo(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: false,
+        turbo: true,
+        tab,
+      });
     }
-  }
 
-  async onClickedDTARegular(info: any, tab: any) {
-    return await this.onClickedDTARegularInternal(false, info, tab);
-  }
-
-  async onClickedDTARegularSelection(info: any, tab: any) {
-    return await this.onClickedDTARegularInternal(true, info, tab);
-  }
-
-  async onClickedDTATurboInternal(selectionOnly: boolean, info: any, tab: any) {
-    try {
-      await this.processResults(
-        true,
-        await runContentJob(
-          tab, "/bundles/content-gather.js", {
-            type: "DTA:gather",
-            selectionOnly,
-            textLinks: await Prefs.get("text-links", true),
-            schemes: Array.from(ALLOWED_SCHEMES.values()),
-            transferable: TRANSFERABLE_PROPERTIES,
-          }));
+    async onClickedDTATurboAll(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: true,
+        turbo: true,
+        tab,
+      });
     }
-    catch (ex) {
-      console.error(ex);
+
+    async onClickedDTATurboSelection(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: true,
+        allTabs: false,
+        turbo: true,
+        tab,
+      });
     }
+
+    async onClickedDTARegularLink(info: MenuClickInfo, tab: Tab) {
+      if (!info.linkUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.linkUrl, false);
+    }
+
+    async onClickedDTATurboLink(info: MenuClickInfo, tab: Tab) {
+      if (!info.linkUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.linkUrl, true);
+    }
+
+    async onClickedDTARegularImage(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, false);
+    }
+
+    async onClickedDTATurboImage(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, true);
+    }
+
+    async onClickedDTARegularMedia(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, false);
+    }
+
+    async onClickedDTATurboMedia(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, true);
+    }
+
+    onClickedDTAAdd() {
+      API.singleRegular(null);
+    }
+
+    async onClickedDTAManager() {
+      await openManager();
+    }
+
+    async onClickedDTAPrefs() {
+      await openPrefs();
+    }
+  }();
+
+  Bus.on("do-regular", () => menuHandler.enumulate("DTARegular"));
+  Bus.on("do-regular-all", () => menuHandler.enumulate("DTARegularAll"));
+  Bus.on("do-turbo", () => menuHandler.enumulate("DTATurbo"));
+  Bus.on("do-turbo-all", () => menuHandler.enumulate("DTATurboAll"));
+  Bus.on("do-single", () => API.singleRegular(null));
+  Bus.on("open-manager", () => openManager(true));
+  Bus.on("open-prefs", () => openPrefs());
+
+  function adjustAction(globalTurbo: boolean) {
+    action.setPopup({
+      popup: globalTurbo ? "" : "/windows/popup.html"
+    });
+    action.setIcon({
+      path: globalTurbo ? {
+        16: "/style/button-turbo.png",
+        32: "/style/button-turbo@2x.png",
+      } : {
+        16: "/style/icon16.png",
+        32: "/style/icon32.png",
+        48: "/style/icon48.png",
+        64: "/style/icon64.png",
+        96: "/style/icon96.png",
+        128: "/style/icon128.png",
+        256: "/style/icon256.png"
+      }
+    });
   }
 
-  async onClickedDTATurbo(info: any, tab: any) {
-    return await this.onClickedDTATurboInternal(false, info, tab);
-  }
-
-  async onClickedDTATurboSelection(info: any, tab: any) {
-    return await this.onClickedDTATurboInternal(false, info, tab);
-  }
-
-  async onClickedDTARegularLink(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.linkUrl, false);
-  }
-
-  async onClickedDTATurboLink(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.linkUrl, true);
-  }
-
-  async onClickedDTARegularImage(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, false);
-  }
-
-  async onClickedDTATurboImage(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, true);
-  }
-
-  async onClickedDTARegularMedia(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, false);
-  }
-
-  async onClickedDTATurboMedia(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, true);
-  }
-
-  async onClickedDTAManager() {
-    await openManager();
-  }
-
-  async onClickedDTAPrefs() {
-    await openPrefs();
-  }
-}();
-
-(async function init() {
-  await Prefs.set("last-run", new Date());
-  await filters();
-  await getManager();
-})().catch(ex => {
-  console.error("Failed to init components", ex.toString(), ex.stack, ex);
+  (async function init() {
+    await Prefs.set("last-run", new Date());
+    Prefs.get("global-turbo", false).then(v => adjustAction(v));
+    Prefs.on("global-turbo", (prefs, key, value) => {
+      adjustAction(value);
+    });
+    await filters();
+    await getManager();
+  })().catch(ex => {
+    console.error("Failed to init components", ex.toString(), ex.stack, ex);
+  });
 });

lib/batches.ts

@@ -98,9 +98,9 @@ export class BatchGenerator implements Generator {
 
   public readonly hasInvalid: boolean;
 
-  public readonly length: any;
+  public readonly length: number;
 
-  public readonly preview: any;
+  public readonly preview: string;
 
   constructor(str: string) {
     this.gens = [];

lib/browser.ts

@@ -3,7 +3,42 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const polyfill = require("webextension-polyfill");
 
-export const {i18n} = polyfill;
+interface ExtensionListener {
+  addListener: (listener: Function) => void;
+  removeListener: (listener: Function) => void;
+}
+
+export interface MessageSender {
+  tab?: Tab;
+  frameId?: number;
+  id?: number;
+  url?: string;
+  tlsChannelId?: string;
+}
+
+
+export interface Tab {
+  id?: number;
+}
+
+export interface MenuClickInfo {
+  menuItemId: string | number;
+  button?: number;
+  linkUrl?: string;
+  srcUrl?: string;
+}
+
+
+export interface RawPort {
+  error: any;
+  name: string;
+  onDisconnect: ExtensionListener;
+  onMessage: ExtensionListener;
+  sender?: MessageSender;
+  disconnect: () => void;
+  postMessage: (message: any) => void;
+}
+
 export const {extension} = polyfill;
 export const {notifications} = polyfill;
 export const {browserAction} = polyfill;
@@ -14,4 +49,7 @@ export const {runtime} = polyfill;
 export const {storage} = polyfill;
 export const {tabs} = polyfill;
 export const {webNavigation} = polyfill;
+export const {webRequest} = polyfill;
 export const {windows} = polyfill;
+
+export const CHROME = navigator.appVersion.includes("Chrome/");

lib/bus.ts

@@ -2,22 +2,18 @@
 // License: MIT
 
 import { EventEmitter } from "./events";
-import {runtime, tabs} from "./browser";
+// eslint-disable-next-line no-unused-vars
+import {runtime, tabs, RawPort, MessageSender} from "./browser";
 
 export class Port extends EventEmitter {
-  private port: any;
+  private port: RawPort | null;
 
-  constructor(port: any) {
+  constructor(port: RawPort) {
     super();
     this.port = port;
 
     let disconnected = false;
-    let tabListener: any;
     const disconnect = () => {
-      if (tabListener) {
-        tabs.onRemoved.removeListener(tabListener);
-        tabListener = null;
-      }
       if (disconnected) {
         return;
       }
@@ -41,11 +37,17 @@ export class Port extends EventEmitter {
   }
 
   get name() {
+    if (!this.port) {
+      return null;
+    }
     return this.port.name;
   }
 
   get id() {
-    return this.port.sender && this.port.sender.extensionId;
+    if (!this.port || !this.port.sender) {
+      return null;
+    }
+    return this.port.sender.id;
   }
 
   get isSelf() {
@@ -53,6 +55,9 @@ export class Port extends EventEmitter {
   }
 
   post(msg: string, ...data: any[]) {
+    if (!this.port) {
+      return;
+    }
     if (!data) {
       this.port.postMessage({msg});
       return;
@@ -64,14 +69,17 @@ export class Port extends EventEmitter {
   }
 
   onMessage(message: any) {
-    if (Object.keys(message).includes("msg")) {
-      this.emit(message.msg, message);
+    if (!this.port) {
       return;
     }
     if (Array.isArray(message)) {
       message.forEach(this.onMessage, this);
       return;
     }
+    if (Object.keys(message).includes("msg")) {
+      this.emit(message.msg, message);
+      return;
+    }
     if (typeof message === "string") {
       this.emit(message);
       return;
@@ -99,7 +107,7 @@ export const Bus = new class extends EventEmitter {
     runtime.onConnect.addListener(this.onConnect.bind(this));
   }
 
-  onMessage(msg: any, sender: any, callback: any) {
+  onMessage(msg: any, sender: MessageSender, callback: any) {
     let {type = null} = msg;
     if (!type) {
       type = msg;
@@ -107,7 +115,7 @@ export const Bus = new class extends EventEmitter {
     this.emit(type, msg, callback);
   }
 
-  onConnect(port: any) {
+  onConnect(port: RawPort) {
     if (!port.name) {
       port.disconnect();
       return;

lib/db.ts

@@ -1,5 +1,8 @@
 "use strict";
 
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
+
 // License: MIT
 
 const VERSION = 1;
@@ -40,12 +43,12 @@ export const DB = new class DB {
     });
   }
 
-  getAllInternal(resolve: (items: any[]) => void, reject: Function) {
+  getAllInternal(resolve: (items: BaseItem[]) => void, reject: Function) {
     if (!this.db) {
       reject(new Error("db closed"));
       return;
     }
-    const items: any[] = [];
+    const items: BaseItem[] = [];
     const transaction = this.db.transaction(STORE, "readonly");
     transaction.onerror = ex => reject(ex);
     const store = transaction.objectStore(STORE);

lib/filters.ts

@@ -4,13 +4,16 @@
 import uuid from "./uuid";
 
 import "./objectoverlay";
-import { storage, i18n } from "./browser";
+import { storage } from "./browser";
 import { EventEmitter } from "./events";
-import { Prefs } from "./prefs";
 import { TYPE_LINK, TYPE_MEDIA, TYPE_ALL } from "./constants";
 // eslint-disable-next-line no-unused-vars
 import { Overlayable } from "./objectoverlay";
-import * as DEFAULT_FILTERS from "../data/filters.json";
+import DEFAULT_FILTERS from "../data/filters.json";
+import { FASTFILTER } from "./recentlist";
+import { _, locale } from "./i18n";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
 
 const REG_ESCAPE = /[{}()[\]\\^$.]/g;
 const REG_FNMATCH = /[*?]/;
@@ -91,7 +94,7 @@ function *parseIntoRegexpInternal(str: string): Iterable<RegExp> {
 
   // multi-expression
   if (str.includes(",")) {
-    for (const part in str.split(",")) {
+    for (const part of str.split(",")) {
       yield *parseIntoRegexpInternal(part);
     }
     return;
@@ -173,25 +176,37 @@ export class Matcher {
   }
   /* eslint-enable no-unused-vars */
 
-  matchItem(item: any) {
+  matchItem(item: BaseItem) {
     const {usable = "", title = "", description = "", fileName = ""} = item;
     return this.match(usable) || this.match(title) ||
              this.match(description) || this.match(fileName);
   }
 }
 
+interface RawFilter extends Object {
+  active: boolean;
+  type: number;
+  label: string;
+  expr: string;
+  icon?: string;
+  custom?: boolean;
+  isOverridden?: (prop: string) => boolean;
+  reset?: () => void;
+  toJSON?: () => any;
+}
+
 export class Filter {
   private readonly owner: Filters;
 
-  public readonly id: any;
+  public readonly id: string | symbol;
 
-  private readonly raw: any;
+  private readonly raw: RawFilter;
 
   private _label: string;
 
   private _reg: Matcher;
 
-  constructor(owner: Filters, id: any, raw: any) {
+  constructor(owner: Filters, id: string | symbol, raw: RawFilter) {
     if (!owner || !id || !raw) {
       throw new Error("null argument");
     }
@@ -203,9 +218,11 @@ export class Filter {
 
   init() {
     this._label = this.raw.label;
-    if (this.id !== FAST && this.id.startsWith("deffilter-") &&
-      !this.raw.isOverridden("label")) {
-      this._label = i18n.getMessage(this.id) || this._label;
+    if (typeof this.raw.isOverridden !== "undefined" &&
+        typeof this.id === "string") {
+      if (this.id.startsWith("deffilter-") && !this.raw.isOverridden("label")) {
+        this._label = _(this.id) || this._label;
+      }
     }
     this._reg = Matcher.fromExpression(this.expr);
     Object.seal(this);
@@ -281,7 +298,7 @@ export class Filter {
   }
 
   async reset() {
-    if (this.raw.custom) {
+    if (!this.raw.reset) {
       throw Error("Cannot reset non-default filter");
     }
     this.raw.reset();
@@ -291,7 +308,10 @@ export class Filter {
 
   async "delete"() {
     if (!this.raw.custom) {
-      throw Error("Cannot delete default filter");
+      throw new Error("Cannot delete default filter");
+    }
+    if (typeof this.id !== "string") {
+      throw new Error("Cannot delete symbolized");
     }
     await this.owner.delete(this.id);
   }
@@ -300,7 +320,7 @@ export class Filter {
     return this._reg.match(str);
   }
 
-  matchItem(item: any) {
+  matchItem(item: BaseItem) {
     return this._reg.matchItem(item);
   }
 
@@ -315,8 +335,7 @@ class FastFilter extends Filter {
       throw new Error("Invalid fast filter value");
     }
     super(owner, FAST, {
-      id: FAST,
-      label: FAST,
+      label: "fast",
       type: TYPE_ALL,
       active: true,
       expr: value,
@@ -351,8 +370,6 @@ class Filters extends EventEmitter {
 
   private filters: Filter[];
 
-  private fastFilter: string | null;
-
   ignoreNext: boolean;
 
   private readonly typeMatchers: Map<number, Matcher>;
@@ -362,10 +379,8 @@ class Filters extends EventEmitter {
     this.typeMatchers = new Map();
     this.loaded = false;
     this.filters = [];
-    this.fastFilter = null;
     this.ignoreNext = false;
     this.regenerate();
-    Prefs.on("fast-filter", this.updateFastFilter.bind(this));
     storage.onChanged.addListener(async (changes: any) => {
       if (this.ignoreNext) {
         this.ignoreNext = false;
@@ -403,6 +418,7 @@ class Filters extends EventEmitter {
     const id = `custom-${uuid()}`;
     const filter = new Filter(this, id, {
       active: true,
+      custom: true,
       label,
       expr,
       type,
@@ -411,11 +427,11 @@ class Filters extends EventEmitter {
     await this.save();
   }
 
-  "get"(id: any) {
+  "get"(id: string | symbol) {
     return this.filters.find(e => e.id === id);
   }
 
-  async "delete"(id: any) {
+  async "delete"(id: string) {
     const idx = this.filters.findIndex(e => e.id === id);
     if (idx < 0) {
       return;
@@ -438,21 +454,12 @@ class Filters extends EventEmitter {
     return new FastFilter(this, value);
   }
 
-  getFastFilter() {
-    if (!this.fastFilter) {
-      throw new Error("Nothing stored");
+  async getFastFilter() {
+    await FASTFILTER.init();
+    if (!FASTFILTER.current) {
+      return null;
     }
-    return new FastFilter(this, this.fastFilter);
-  }
-
-  async setFastFilter(value: string) {
-    this.fastFilter = value || "";
-    await Prefs.set("fast-filter", this.fastFilter);
-  }
-
-  updateFastFilter(pref: any, key: string, value: string) {
-    this.fastFilter = value || null;
-    this.regenerate();
+    return new FastFilter(this, FASTFILTER.current);
   }
 
   regenerate() {
@@ -480,17 +487,6 @@ class Filters extends EventEmitter {
         console.error("Filter", current.label || "unknown", ex);
       }
     }
-    if (this.fastFilter) {
-      try {
-        const fastFilter = new FastFilter(this, this.fastFilter);
-        all.push(fastFilter);
-        links.push(fastFilter);
-        media.push(fastFilter);
-      }
-      catch (ex) {
-        console.error("fast filter", this.fastFilter, "is invalid", ex);
-      }
-    }
     this.typeMatchers.set(TYPE_ALL, new Matcher(all));
     this.typeMatchers.set(TYPE_LINK, new Matcher(links));
     this.typeMatchers.set(TYPE_MEDIA, new Matcher(media));
@@ -498,6 +494,7 @@ class Filters extends EventEmitter {
   }
 
   async load() {
+    await locale;
     const defaultFilters = DEFAULT_FILTERS as any;
     let savedFilters = (await storage.local.get("userFilters"));
     if (savedFilters && "userFilters" in savedFilters) {
@@ -534,14 +531,17 @@ class Filters extends EventEmitter {
         defaultFilters[filter]);
       this.filters.push(new Filter(this, filter, current));
     }
-    this.fastFilter = await Prefs.get("fast-filter", null);
     this.loaded = true;
     this.regenerate();
   }
 
-  filterItemsByType(items: any[], type: number) {
+  async filterItemsByType(items: BaseItem[], type: number) {
     const matcher = this.typeMatchers.get(type);
+    const fast = await this.getFastFilter();
     return items.filter(function(item) {
+      if (fast && fast.matchItem(item)) {
+        return true;
+      }
       return matcher && matcher.matchItem(item);
     });
   }
@@ -562,12 +562,14 @@ class Filters extends EventEmitter {
   }
 }
 
-let _filters: any;
+let _filters: Filters;
+let _loader: Promise<void>;
 
 export async function filters(): Promise<Filters> {
-  if (!_filters) {
+  if (!_loader) {
     _filters = new Filters();
-    await _filters.load();
+    _loader = _filters.load();
   }
+  await _loader;
   return _filters;
 }

lib/i18n.ts

@@ -2,50 +2,239 @@
 // License: MIT
 
 import {memoize} from "./memoize";
+import langs from "../_locales/all.json";
+import { sorted, naturalCaseCompare } from "./sorting";
 
-function load() {
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const {i18n} = require("webextension-polyfill");
 
-    return i18n;
+export const ALL_LANGS = Object.freeze(new Map<string, string>(
+  sorted(Object.entries(langs), e => {
+    return [e[1], e[0]];
+  }, naturalCaseCompare)));
+
+let CURRENT = "en";
+export function getCurrentLanguage() {
+  return CURRENT;
+}
+
+declare let browser: any;
+declare let chrome: any;
+
+const CACHE_KEY = "_cached_locales";
+const CUSTOM_KEY = "_custom_locale";
+
+const normalizer = /[^A-Za-z0-9_]/g;
+
+interface JSONEntry {
+  message: string;
+  placeholders: any;
+}
+
+class Entry {
+  private message: string;
+
+  constructor(entry: JSONEntry) {
+    if (!entry.message.includes("$")) {
+      throw new Error("Not entry-able");
+    }
+    let hit = false;
+    this.message = entry.message.replace(/\$[A-Z0-9]+\$/g, (r: string) => {
+      hit = true;
+      const id = r.substr(1, r.length - 2).toLocaleLowerCase();
+      const pholder = entry.placeholders[id];
+      if (!pholder || !pholder.content) {
+        throw new Error(`Invalid placeholder: ${id}`);
+      }
+      return `${pholder.content}$`;
+    });
+    if (!hit) {
+      throw new Error("Not entry-able");
+    }
   }
-  catch (ex) {
+
+  localize(args: any[]) {
+    return this.message.replace(/\$\d+\$/g, (r: string) => {
+      const idx = parseInt(r.substr(1, r.length - 2), 10) - 1;
+      return args[idx] || "";
+    });
+  }
+}
+
+class Localization {
+  private strings: Map<string, Entry | string>;
+
+  constructor(baseLanguage: any, ...overlayLanguages: any) {
+    this.strings = new Map();
+    const mapLanguage = (lang: any) => {
+      for (const [id, entry] of Object.entries<JSONEntry>(lang)) {
+        if (!entry.message) {
+          continue;
+        }
+        try {
+          if (entry.message.includes("$")) {
+            this.strings.set(id, new Entry(entry));
+          }
+          else {
+            this.strings.set(id, entry.message);
+          }
+        }
+        catch (ex) {
+          this.strings.set(id, entry.message);
+        }
+      }
+    };
+    mapLanguage(baseLanguage);
+    overlayLanguages.forEach(mapLanguage);
+  }
+
+  localize(id: string, ...args: any[]) {
+    const entry = this.strings.get(id.replace(normalizer, "_"));
+    if (!entry) {
+      return "";
+    }
+    if (typeof entry === "string") {
+      return entry;
+    }
+    if (args.length === 1 && Array.isArray(args)) {
+      [args] = args;
+    }
+    return entry.localize(args);
+  }
+}
+
+function checkBrowser() {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  if (typeof browser !== "undefined" && browser.i18n) {
+    return;
+  }
+  if (typeof chrome !== "undefined" && chrome.i18n) {
+    return;
+  }
+  throw new Error("not in a webext");
+}
+
+async function fetchLanguage(code: string) {
+  try {
+    const resp = await fetch(`/_locales/${code}/messages.json`);
+    return await resp.json();
+  }
+  catch {
+    return null;
+  }
+}
+
+
+function loadCached() {
+  if (document.location.pathname.includes("/windows/")) {
+    const cached = localStorage.getItem(CACHE_KEY);
+    if (cached) {
+      return JSON.parse(cached) as any[];
+    }
+  }
+  return null;
+}
+
+async function loadRawLocales() {
+  // en is the base locale, always to be loaded
+  // The loader will override string from it with more specific string
+  // from other locales
+  const langs = new Set<string>(["en"]);
+
+  const uiLang: string = (typeof browser !== "undefined" ? browser : chrome).
+    i18n.getUILanguage();
+
+  // Chrome will only look for underscore versions of locale codes,
+  // while Firefox will look for both.
+  // So we better normalize the code to the underscore version.
+  // However, the API seems to always return the dash-version.
+
+  // Add all base locales into ascending order of priority,
+  // starting with the most unspecific base locale, ending
+  // with the most specific locale.
+  // e.g. this will transform ["zh", "CN"] -> ["zh", "zh_CN"]
+  uiLang.split(/[_-]/g).reduce<string[]>((prev, curr) => {
+    prev.push(curr);
+    langs.add(prev.join("_"));
+    return prev;
+  }, []);
+
+  if (CURRENT && CURRENT !== "default") {
+    langs.delete(CURRENT);
+    langs.add(CURRENT);
+  }
+
+  const valid = Array.from(langs).filter(e => ALL_LANGS.has(e));
+  const fetched = await Promise.all(Array.from(valid, fetchLanguage));
+  return fetched.filter(e => !!e);
+}
+
+async function load(): Promise<Localization> {
+  try {
+    checkBrowser();
+    try {
+      let currentLang: any = "";
+      if (typeof browser !== "undefined") {
+        currentLang = await browser.storage.sync.get("language");
+      }
+      else {
+        currentLang = await new Promise(
+          resolve => chrome.storage.sync.get("language", resolve));
+      }
+      if ("language" in currentLang) {
+        currentLang = currentLang.language;
+      }
+      if (!currentLang || !currentLang.length) {
+        currentLang = "default";
+      }
+      CURRENT = currentLang;
+      // en is the base locale
+      let valid = loadCached();
+      if (!valid) {
+        valid = await loadRawLocales();
+        localStorage.setItem(CACHE_KEY, JSON.stringify(valid));
+      }
+      if (!valid.length) {
+        throw new Error("Could not lood ANY of these locales");
+      }
+
+      const custom = localStorage.getItem(CUSTOM_KEY);
+      if (custom) {
+        try {
+          valid.push(JSON.parse(custom));
+        }
+        catch (ex) {
+          console.error(ex);
+          // ignored
+        }
+      }
+
+      const base = valid.shift();
+      const rv = new Localization(base, ...valid);
+      return rv;
+    }
+    catch (ex) {
+      console.error("Failed to load locale", ex.toString(), ex.stack, ex);
+      return new Localization({});
+    }
+  }
+  catch {
     // We might be running under node for tests
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const messages = require("../_locales/en/messages.json");
 
-    const map = new Map();
-    for (const [k, v] of Object.entries<any>(messages)) {
-      const {placeholders = {}} = v;
-      let {message = ""} = v;
-      for (const [pname, pval] of Object.entries<any>(placeholders)) {
-        message = message.replace(`$${pname.toUpperCase()}$`, `${pval.content}$`);
-      }
-      map.set(k, message);
-    }
-
-    return {
-      getMessage(id: string, subst: string[]) {
-        const m = map.get(id);
-        if (typeof subst === undefined) {
-          return m;
-        }
-        if (!Array.isArray(subst)) {
-          subst = [subst];
-        }
-        return m.replace(/\$\d+\$/g, (r: string) => {
-          const idx = parseInt(r.substr(1, r.length - 2), 10) - 1;
-          return subst[idx] || "";
-        });
-      }
-    };
+    return new Localization(messages);
   }
 }
 
-const i18n = load();
-const memoGetMessage = memoize(i18n.getMessage, 10 * 1000, 0);
+type MemoLocalize = (id: string, ...args: any[]) => string;
+
+export const locale = load();
+let loc: Localization | null;
+let memoLocalize: MemoLocalize | null = null;
+locale.then(l => {
+  loc = l;
+  memoLocalize = memoize(loc.localize.bind(loc), 10 * 1000, 10);
+});
 
 /**
  * Localize a message
@@ -53,22 +242,22 @@ const memoGetMessage = memoize(i18n.getMessage, 10 * 1000, 0);
  * @param {string[]} [subst] Message substituations
  * @returns {string} Localized message
  */
-function _(id: string, ...subst: any[]) {
+export function _(id: string, ...subst: any[]) {
+  if (!loc || !memoLocalize) {
+    console.trace("TOO SOON");
+    throw new Error("Called too soon");
+  }
   if (!subst.length) {
-    return memoGetMessage(id);
+    return memoLocalize(id);
   }
-  if (subst.length === 1 && Array.isArray(subst[0])) {
-    subst = subst.pop();
-  }
-  return i18n.getMessage(id, subst);
+  return loc.localize(id, subst);
 }
 
-/**
- * Localize a DOM
- * @param {Element} elem DOM to localize
- * @returns {Element} Passed in element (fluent)
- */
-function localize(elem: HTMLElement) {
+function localize_<T extends HTMLElement | DocumentFragment>(elem: T): T {
+  for (const tmpl of elem.querySelectorAll<HTMLTemplateElement>("template")) {
+    localize_(tmpl.content);
+  }
+
   for (const el of elem.querySelectorAll<HTMLElement>("*[data-i18n]")) {
     const {i18n: i} = el.dataset;
     if (!i) {
@@ -99,8 +288,25 @@ function localize(elem: HTMLElement) {
   for (const el of document.querySelectorAll("*[data-l18n]")) {
     console.error("wrong!", el);
   }
-  return elem;
+  return elem as T;
 }
 
+/**
+ * Localize a DOM
+ * @param {Element} elem DOM to localize
+ * @returns {Element} Passed in element (fluent)
+ */
+export async function localize<T extends HTMLElement | DocumentFragment>(
+    elem: T): Promise<T> {
+  await locale;
+  return localize_(elem);
+}
 
-export {localize, _};
+export function saveCustomLocale(data?: string) {
+  if (!data) {
+    localStorage.removeItem(CUSTOM_KEY);
+    return;
+  }
+  new Localization(JSON.parse(data));
+  localStorage.setItem(CUSTOM_KEY, data);
+}

lib/iconcache.ts

@@ -0,0 +1,162 @@
+"use strict";
+// License: MIT
+
+import { downloads, CHROME } from "./browser";
+import { EventEmitter } from "../uikit/lib/events";
+import { PromiseSerializer } from "./pserializer";
+
+const VERSION = 1;
+const STORE = "iconcache";
+// eslint-disable-next-line no-magic-numbers
+const CACHE_SIZES = CHROME ? [16, 32] : [16, 32, 64, 127];
+
+const BLACKLISTED = Object.freeze(new Set([
+  "",
+  "ext",
+  "ico",
+  "pif",
+  "scr",
+  "ani",
+  "cur",
+  "ttf",
+  "otf",
+  "woff",
+  "woff2",
+  "cpl",
+  "desktop",
+  "app",
+]));
+
+async function getIcon(size: number, manId: number) {
+  const raw = await downloads.getFileIcon(manId, {size});
+  const icon = new URL(raw);
+  if (icon.protocol === "data:") {
+    const res = await fetch(icon.toString());
+    const blob = await res.blob();
+    return {size, icon: blob};
+  }
+  return {size, icon};
+}
+
+const SYNONYMS = Object.freeze(new Map<string, string>([
+  ["jpe", "jpg"],
+  ["jpeg", "jpg"],
+  ["jfif", "jpg"],
+  ["mpe", "mpg"],
+  ["mpeg", "mpg"],
+  ["m4v", "mp4"],
+]));
+
+export const IconCache = new class IconCache extends EventEmitter {
+  private db: Promise<IDBDatabase>;
+
+  private cache: Map<string, string>;
+
+  constructor() {
+    super();
+    this.db = this.init();
+    this.cache = new Map();
+    this.get = PromiseSerializer.wrapNew(8, this, this.get);
+    this.set = PromiseSerializer.wrapNew(1, this, this.set);
+  }
+
+  private async init() {
+    return await new Promise<IDBDatabase>((resolve, reject) => {
+      const req = indexedDB.open(STORE, VERSION);
+      req.onupgradeneeded = evt => {
+        const db = req.result;
+        switch (evt.oldVersion) {
+        case 0: {
+          db.createObjectStore(STORE);
+          break;
+        }
+        }
+      };
+      req.onerror = ex => reject(ex);
+      req.onsuccess = () => {
+        resolve(req.result);
+      };
+    });
+  }
+
+  private normalize(ext: string) {
+    ext = ext.toLocaleLowerCase();
+    return SYNONYMS.get(ext) || ext;
+  }
+
+  // eslint-disable-next-line no-magic-numbers
+  async get(ext: string, size = 16) {
+    ext = this.normalize(ext);
+    if (BLACKLISTED.has(ext)) {
+      return undefined;
+    }
+    const sext = `${ext}-${size}`;
+    let rv = this.cache.get(sext);
+    if (rv) {
+      return rv;
+    }
+    const db = await this.db;
+    rv = this.cache.get(sext);
+    if (rv) {
+      return rv;
+    }
+    return await new Promise<string | undefined>(resolve => {
+      const trans = db.transaction(STORE, "readonly");
+      trans.onerror = () => resolve(undefined);
+      const store = trans.objectStore(STORE);
+      const req = store.get(sext);
+      req.onerror = () => resolve(undefined);
+      req.onsuccess = () => {
+        const rv = this.cache.get(sext);
+        if (rv) {
+          resolve(rv);
+          return;
+        }
+        let {result} = req;
+        if (!result) {
+          resolve(undefined);
+          return;
+        }
+        if (typeof req.result !== "string") {
+          result = URL.createObjectURL(result).toString();
+        }
+        this.cache.set(sext, result);
+        this.cache.set(ext, "");
+        resolve(result);
+      };
+    });
+  }
+
+  async set(ext: string, manId: number) {
+    ext = this.normalize(ext);
+    if (BLACKLISTED.has(ext)) {
+      return;
+    }
+    if (this.cache.has(ext)) {
+      // already processed in this session
+      return;
+    }
+    // eslint-disable-next-line no-magic-numbers
+    const urls = await Promise.all(CACHE_SIZES.map(
+      size => getIcon(size, manId)));
+    if (this.cache.has(ext)) {
+      // already processed in this session
+      return;
+    }
+    for (const {size, icon} of urls) {
+      this.cache.set(`${ext}-${size}`, URL.createObjectURL(icon));
+    }
+    this.cache.set(ext, "");
+    const db = await this.db;
+    await new Promise((resolve, reject) => {
+      const trans = db.transaction(STORE, "readwrite");
+      trans.onerror = reject;
+      trans.oncomplete = resolve;
+      const store = trans.objectStore(STORE);
+      for (const {size, icon} of urls) {
+        store.put(icon, `${ext}-${size}`);
+      }
+    });
+    this.emit("cached", ext);
+  }
+}();

lib/item.ts

@@ -4,18 +4,32 @@
 import { ALLOWED_SCHEMES } from "./constants";
 import { TRANSFERABLE_PROPERTIES } from "./constants";
 
+export interface BaseItem {
+  url: string;
+  usable: string;
+  referrer?: string;
+  usableReferrer?: string;
+  description?: string;
+  title?: string;
+  fileName?: string;
+  batch?: number;
+  idx: number;
+  mask?: string;
+  startDate?: number;
+  private?: boolean;
+  postData?: string;
+  paused?: boolean;
+}
+
 const OPTIONPROPS = Object.freeze([
   "referrer", "usableReferrer",
   "description", "title",
   "fileName",
   "batch", "idx",
   "mask",
-  "fromMetalink",
   "startDate",
-  "hashes",
   "private",
   "postData",
-  "cleanRequest",
   "paused"
 ]);
 
@@ -34,7 +48,7 @@ function maybeAssign(options: any, what: any) {
   this[what] = val;
 }
 
-export class Item {
+export class Item implements BaseItem {
   public url: string;
 
   public usable: string;
@@ -43,6 +57,8 @@ export class Item {
 
   public usableReferrer: string;
 
+  public idx: number;
+
   constructor(raw: any, options?: any) {
     Object.assign(this, raw);
     OPTIONPROPS.forEach(maybeAssign.bind(this, options || {}));
@@ -99,7 +115,7 @@ function transfer(e: any, other: any) {
 }
 
 
-export function makeUniqueItems(items: any, mapping?: Function) {
+export function makeUniqueItems(items: any[][], mapping?: Function) {
   const known = new Map();
   const unique = [];
   for (const itemlist of items) {

lib/manager/basedownload.ts

@@ -27,10 +27,11 @@ const SAVEDPROPS = [
   "written",
   // server stuff
   "serverName",
+  "browserName",
+  "mime",
+  "prerolled",
   // other options
   "private",
-  "fromMetalink",
-  "cleanRequest",
   // db
   "manId",
   "dbId",
@@ -41,10 +42,13 @@ const DEFAULTS = {
   state: QUEUED,
   error: "",
   serverName: "",
+  browserName: "",
   fileName: "",
   totalSize: 0,
   written: 0,
   manId: 0,
+  mime: "",
+  prerolled: false
 };
 
 let sessionId = 0;
@@ -61,14 +65,26 @@ export class BaseDownload {
 
   public url: string;
 
+  public usable: string;
+
   public uReferrer: URLd;
 
   public referrer: string;
 
+  public usableReferrer: string;
+
   public startDate: Date;
 
   public fileName: string;
 
+  public description?: string;
+
+  public title?: string;
+
+  public batch: number;
+
+  public idx: number;
+
   public error: string;
 
   public postData: any;
@@ -81,8 +97,13 @@ export class BaseDownload {
 
   public serverName: string;
 
+  public browserName: string;
+
+  public mime: string;
+
   public mask: string;
 
+  public prerolled: boolean;
 
   constructor(options: any) {
     Object.assign(this, DEFAULTS);
@@ -117,6 +138,10 @@ export class BaseDownload {
     return this.serverName || this.fileName || this.urlName || "index.html";
   }
 
+  get currentName() {
+    return this.browserName || this.dest.name || this.finalName;
+  }
+
   get urlName() {
     const path = parsePath(this.uURL);
     if (path.name) {
@@ -154,7 +179,9 @@ export class BaseDownload {
     rv.destName = dest.name;
     rv.destPath = dest.path;
     rv.destFull = dest.full;
+    rv.currentName = this.browserName || rv.destName || rv.finalName;
     rv.error = this.error;
+    rv.ext = this.renamer.p_ext;
     return rv;
   }
 }

lib/manager/download.ts

@@ -1,22 +1,82 @@
 "use strict";
 // License: MIT
 
+import MimeType from "whatwg-mimetype";
+import { CHROME, downloads, webRequest } from "../browser";
 import { Prefs } from "../prefs";
-import { parsePath } from "../util";
-import {
-  QUEUED, RUNNING, CANCELED, PAUSED, MISSING, DONE,
-  FORCABLE, PAUSABLE, CANCELABLE,
-} from "./state";
-import { BaseDownload } from "./basedownload";
 import { PromiseSerializer } from "../pserializer";
+import { filterInSitu, parsePath, sanitizePath } from "../util";
+import { BaseDownload } from "./basedownload";
 // eslint-disable-next-line no-unused-vars
 import { Manager } from "./man";
-import { downloads } from "../browser";
+import Renamer from "./renamer";
+import {
+  CANCELABLE,
+  CANCELED,
+  DONE,
+  FORCABLE,
+  MISSING,
+  PAUSABLE,
+  PAUSED,
+  QUEUED,
+  RUNNING
+} from "./state";
 
+const PREROLL_HEURISTICS = /dl|attach|download|name|file|get|retr|^n$|\.(php|asp|py|pl|action|htm|shtm)/i;
+const PREROLL_HOSTS = /4cdn|chan/;
+const PREROLL_TIMEOUT = 10000;
+const PREROLL_NOPE = new Set<string>();
 
-const setShelfEnabled = downloads.setShelfEnabled || function() {
-  // ignored
-};
+function parseDisposition(disp: MimeType) {
+  if (!disp) {
+    return "";
+  }
+  let encoding = (disp.parameters.get("charset") || "utf-8").trim();
+  let file = (disp.parameters.get("filename") || "").trim().replace(/^(["'])(.*)\1$/, "$2");
+  if (!file) {
+    const encoded = disp.parameters.get("filename*");
+    if (!encoded) {
+      return "";
+    }
+    const pieces = encoded.split("'", 3);
+    if (pieces.length !== 3) {
+      return "";
+    }
+    encoding = pieces[0].trim() || encoding;
+    file = (pieces[3] || "").trim().replace(/^(["'])(.*)\1$/, "$2");
+  }
+  file = file.trim();
+  if (!file) {
+    return "";
+  }
+
+  try {
+    // And now for the tricky part...
+    // First unescape the string, to get the raw bytes
+    // not utf-8-interpreted bytes
+    // Then convert the string into an uint8[]
+    // Then decode
+    return new TextDecoder(encoding).decode(
+      new Uint8Array(unescape(file).split("").map(e => e.charCodeAt(0)))
+    );
+  }
+  catch (ex) {
+    console.error("Cannot decode", encoding, file, ex);
+  }
+  return "";
+}
+
+type Header = {name: string; value: string};
+interface Options {
+  conflictAction: string;
+  filename: string;
+  saveAs: boolean;
+  url: string;
+  method?: string;
+  body?: string;
+  incognito?: boolean;
+  headers: Header[];
+}
 
 export class Download extends BaseDownload {
   public manager: Manager;
@@ -38,6 +98,7 @@ export class Download extends BaseDownload {
   }
 
   markDirty() {
+    this.renamer = new Renamer(this);
     this.manager.setDirty(this);
   }
 
@@ -65,6 +126,11 @@ export class Download extends BaseDownload {
           this.updateStateFromBrowser();
           return;
         }
+        if (state[0].state === "complete") {
+          this.changeState(DONE);
+          this.updateStateFromBrowser();
+          return;
+        }
         if (!state[0].canResume) {
           throw new Error("Cannot resume");
         }
@@ -82,46 +148,58 @@ export class Download extends BaseDownload {
     if (this.state !== QUEUED) {
       throw new Error("invalid state");
     }
-    console.trace("starting", this.toString(), this.dest, this.mask);
+    console.log("starting", this.toString(), this.toMsg());
     this.changeState(RUNNING);
+
+    // Do NOT await
+    this.reallyStart();
+  }
+
+  private async reallyStart() {
     try {
-      const options: any = {
+      if (!this.prerolled) {
+        await this.maybePreroll();
+        if (this.state !== RUNNING) {
+          // Aborted by preroll
+          return;
+        }
+      }
+      const options: Options = {
         conflictAction: await Prefs.get("conflict-action"),
         filename: this.dest.full,
         saveAs: false,
         url: this.url,
-        headers: [{
-          name: "X-DTA-Tag",
-          value: this.sessionId.toString(),
-        }],
+        headers: [],
       };
+      if (!CHROME && this.private) {
+        options.incognito = true;
+      }
       if (this.postData) {
         options.body = this.postData;
         options.method = "POST";
       }
-      if (this.private) {
-        options.incognito = true;
-      }
-      /* XXX "forbidden"
-         Cannot be worked around with webRequest either
-         as those do not see downloads.
-      if (this.referrer) {
+      if (!CHROME && this.referrer) {
         options.headers.push({
           name: "Referer",
           value: this.referrer
         });
       }
-      */
       if (this.manId) {
         this.manager.removeManId(this.manId);
       }
-      setShelfEnabled(false);
+
       try {
         this.manager.addManId(
           this.manId = await downloads.download(options), this);
       }
-      finally {
-        setShelfEnabled(true);
+      catch (ex) {
+        if (!this.referrer) {
+          throw ex;
+        }
+        // Re-attempt without referrer
+        filterInSitu(options.headers, h => h.name !== "Referer");
+        this.manager.addManId(
+          this.manId = await downloads.download(options), this);
       }
       this.markDirty();
     }
@@ -132,6 +210,146 @@ export class Download extends BaseDownload {
     }
   }
 
+  private get shouldPreroll() {
+    const {pathname, search, host} = this.uURL;
+    if (PREROLL_NOPE.has(host)) {
+      return false;
+    }
+    if (!this.renamer.p_ext) {
+      return true;
+    }
+    if (search.length) {
+      return true;
+    }
+    if (this.uURL.pathname.endsWith("/")) {
+      return true;
+    }
+    if (PREROLL_HEURISTICS.test(pathname)) {
+      return true;
+    }
+    if (PREROLL_HOSTS.test(host)) {
+      return true;
+    }
+    return false;
+  }
+
+  private async maybePreroll() {
+    try {
+      if (this.prerolled) {
+        // Check again, just in case, async and all
+        return;
+      }
+      if (!this.shouldPreroll) {
+        return;
+      }
+      await (CHROME ? this.prerollChrome() : this.prerollFirefox());
+    }
+    catch (ex) {
+      console.error("Failed to preroll", this, ex.toString(), ex.stack, ex);
+    }
+    finally {
+      if (this.state === RUNNING) {
+        this.prerolled = true;
+        this.markDirty();
+      }
+    }
+  }
+
+  private async prerollFirefox() {
+    const controller = new AbortController();
+    const {signal} = controller;
+    const res = await fetch(this.uURL.toString(), {
+      method: "HEAD",
+      mode: "same-origin",
+      signal,
+    });
+    controller.abort();
+    const {headers} = res;
+    this.prerollFinialize(headers, res);
+  }
+
+  async prerollChrome() {
+    let rid = "";
+    const rurl = this.uURL.toString();
+    let listener: any;
+    const wr = new Promise<any[]>(resolve => {
+      listener = (details: any) => {
+        const {url, requestId, statusCode} = details;
+        if (rid !== requestId && url !== rurl) {
+          return;
+        }
+        // eslint-disable-next-line no-magic-numbers
+        if (statusCode >= 300 && statusCode < 400) {
+          // Redirect, continue tracking;
+          rid = requestId;
+          return;
+        }
+        resolve(details.responseHeaders);
+      };
+      webRequest.onHeadersReceived.addListener(
+        listener, {urls: ["<all_urls>"]}, ["responseHeaders"]);
+    });
+    const p = Promise.race([
+      wr,
+      new Promise<any[]>((_, reject) =>
+        setTimeout(() => reject(new Error("timeout")), PREROLL_TIMEOUT))
+    ]);
+
+    p.finally(() => {
+      webRequest.onHeadersReceived.removeListener(listener);
+    });
+    const controller = new AbortController();
+    const {signal} = controller;
+    const res = await fetch(rurl, {
+      method: "HEAD",
+      signal,
+    });
+    controller.abort();
+    const headers = await p;
+    this.prerollFinialize(
+      new Headers(headers.map(i => [i.name, i.value])), res);
+  }
+
+
+  private prerollFinialize(headers: Headers, res: Response) {
+    const type = MimeType.parse(headers.get("content-type") || "");
+    const dispHeader = headers.get("content-disposition");
+    let file = "";
+    if (dispHeader) {
+      const disp = new MimeType(`${type && type.toString() || "application/octet-stream"}; ${dispHeader}`);
+      file = parseDisposition(disp);
+      // Sanitize
+      file = sanitizePath(file.replace(/[/\\]+/g, "-"));
+    }
+    if (type) {
+      this.mime = type.essence;
+    }
+    this.serverName = file;
+    this.markDirty();
+    const {status} = res;
+    /* eslint-disable no-magic-numbers */
+    if (status === 404) {
+      this.cancel();
+      this.error = "SERVER_BAD_CONTENT";
+    }
+    else if (status === 403) {
+      this.cancel();
+      this.error = "SERVER_FORBIDDEN";
+    }
+    else if (status === 402 || status === 407) {
+      this.cancel();
+      this.error = "SERVER_UNAUTHORIZED";
+    }
+    else if (status === 400 || status === 405) {
+      PREROLL_NOPE.add(this.uURL.host);
+    }
+    else if (status > 400 && status < 500) {
+      this.cancel();
+      this.error = "SERVER_FAILED";
+    }
+    /* eslint-enable no-magic-numbers */
+  }
+
   resume(forced = false) {
     if (!(FORCABLE & this.state)) {
       return;
@@ -161,9 +379,10 @@ export class Download extends BaseDownload {
   }
 
   reset() {
+    this.prerolled = false;
     this.manId = 0;
     this.written = this.totalSize = 0;
-    this.serverName = "";
+    this.mime = this.serverName = this.browserName = "";
   }
 
   async removeFromBrowser() {
@@ -240,8 +459,11 @@ export class Download extends BaseDownload {
       const state = (await downloads.search({id: this.manId})).pop();
       const {filename, error} = state;
       const path = parsePath(filename);
-      this.serverName = path.name;
+      this.browserName = path.name;
       this.adoptSize(state);
+      if (!this.mime && state.mime) {
+        this.mime = state.mime;
+      }
       this.markDirty();
       switch (state.state) {
       case "in_progress":

lib/manager/man.ts

@@ -12,22 +12,27 @@ import { Prefs } from "../prefs";
 import { _ } from "../i18n";
 import { CoalescedUpdate, mapFilterInSitu, filterInSitu } from "../util";
 import { PromiseSerializer } from "../pserializer";
-import {Download} from "./download";
-import {ManagerPort} from "./port";
-import {Scheduler} from "./scheduler";
-import {Limits} from "./limits";
-import { downloads } from "../browser";
+import { Download } from "./download";
+import { ManagerPort } from "./port";
+import { Scheduler } from "./scheduler";
+import { Limits } from "./limits";
+import { downloads, runtime } from "../browser";
 
 
 const AUTOSAVE_TIMEOUT = 2000;
 const DIRTY_TIMEOUT = 100;
 // eslint-disable-next-line no-magic-numbers
 const MISSING_TIMEOUT = 12 * 1000;
+const RELOAD_TIMEOUT = 10 * 1000;
+
+const setShelfEnabled = downloads.setShelfEnabled || function() {
+  // ignored
+};
 
 export class Manager extends EventEmitter {
   private items: Download[];
 
-  private active: boolean;
+  public active: boolean;
 
   private notifiedFinished: boolean;
 
@@ -45,9 +50,12 @@ export class Manager extends EventEmitter {
 
   private scheduler: Scheduler | null;
 
+  private shouldReload: boolean;
+
   constructor() {
     super();
     this.active = true;
+    this.shouldReload = false;
     this.notifiedFinished = true;
     this.items = [];
     this.saveQueue = new CoalescedUpdate(
@@ -88,9 +96,19 @@ export class Manager extends EventEmitter {
       }
       this.items.push(rv);
     });
-    await this.resetScheduler();
+
+    // Do not wait for the scheduler
+    this.resetScheduler();
+
     this.emit("inited");
     setTimeout(() => this.checkMissing(), MISSING_TIMEOUT);
+    runtime.onUpdateAvailable.addListener(() => {
+      if (this.running.size) {
+        this.shouldReload = true;
+        return;
+      }
+      runtime.reload();
+    });
     return this;
   }
 
@@ -136,7 +154,7 @@ export class Manager extends EventEmitter {
       }
       const next = await this.scheduler.next(this.running);
       if (!next) {
-        this.maybeNotifyFinished();
+        this.maybeRunFinishActions();
         break;
       }
       if (this.running.has(next) || next.state !== QUEUED) {
@@ -147,6 +165,7 @@ export class Manager extends EventEmitter {
       }
       catch (ex) {
         next.changeState(CANCELED);
+        next.error = ex.toString();
         console.error(ex.toString(), ex);
       }
     }
@@ -155,10 +174,31 @@ export class Manager extends EventEmitter {
   async startDownload(download: Download) {
     // Add to running first, so we don't confuse the scheduler and other parts
     this.running.add(download);
+    setShelfEnabled(false);
     await download.start();
     this.notifiedFinished = false;
   }
 
+  async maybeRunFinishActions() {
+    if (this.running.size) {
+      return;
+    }
+    await this.maybeNotifyFinished();
+    if (this.running.size) {
+      return;
+    }
+    if (this.shouldReload) {
+      this.saveQueue.trigger();
+      setTimeout(() => {
+        if (this.running.size) {
+          return;
+        }
+        runtime.reload();
+      }, RELOAD_TIMEOUT);
+    }
+    setShelfEnabled(true);
+  }
+
   async maybeNotifyFinished() {
     if (!(await Prefs.get("finish-notification"))) {
       return;
@@ -215,7 +255,7 @@ export class Manager extends EventEmitter {
     this.emit("dirty", items);
   }
 
-  save(items: Download[]) {
+  private save(items: Download[]) {
     DB.saveItems(items.filter(i => !i.removed)).
       catch(console.error);
   }
@@ -265,7 +305,6 @@ export class Manager extends EventEmitter {
   changedState(download: Download, oldState: number, newState: number) {
     if (oldState === RUNNING) {
       this.running.delete(download);
-      this.maybeNotifyFinished();
     }
     if (newState === QUEUED) {
       this.resetScheduler();
@@ -278,7 +317,7 @@ export class Manager extends EventEmitter {
       this.running.add(download);
     }
     else {
-      this.startNext();
+      this.startNext().catch(console.error);
     }
   }
 
@@ -341,6 +380,10 @@ export class Manager extends EventEmitter {
     }
     this.emit("active", this.active);
   }
+
+  getMsgItems() {
+    return this.items.map(e => e.toMsg());
+  }
 }
 
 let inited: Promise<Manager>;

lib/manager/port.ts

@@ -5,6 +5,10 @@ import { donate, openPrefs } from "../windowutils";
 import { API } from "../api";
 // eslint-disable-next-line no-unused-vars
 import { BaseDownload } from "./basedownload";
+// eslint-disable-next-line no-unused-vars
+import { Manager } from "./man";
+// eslint-disable-next-line no-unused-vars
+import { Port } from "../bus";
 
 type SID = {sid: number};
 type SIDS = {
@@ -13,9 +17,9 @@ type SIDS = {
 };
 
 export class ManagerPort {
-  private manager: any;
+  private manager: Manager;
 
-  private port: any;
+  private port: Port;
 
   constructor(manager: any, port: any) {
     this.manager = manager;
@@ -61,6 +65,7 @@ export class ManagerPort {
       delete this.manager;
       delete this.port;
     });
+
     this.port.post("active", this.manager.active);
     this.sendAll();
   }
@@ -78,7 +83,6 @@ export class ManagerPort {
   }
 
   sendAll() {
-    this.port.post(
-      "all", this.manager.items.map((e: BaseDownload) => e.toMsg()));
+    this.port.post("all", this.manager.getMsgItems());
   }
 }

lib/manager/renamer.ts

@@ -2,8 +2,12 @@
 "use strict";
 // License: MIT
 
-import { parsePath, sanitizePath } from "../util";
 import { _ } from "../i18n";
+import { MimeDB } from "../mime";
+// eslint-disable-next-line no-unused-vars
+import { parsePath, PathInfo, sanitizePath } from "../util";
+// eslint-disable-next-line no-unused-vars
+import { BaseDownload } from "./basedownload";
 
 const REPLACE_EXPR = /\*\w+\*/gi;
 
@@ -22,21 +26,41 @@ const DATE_FORMATTER = new Intl.NumberFormat(undefined, {
 });
 
 export default class Renamer {
-  private readonly d: any;
+  private readonly d: BaseDownload;
 
-  constructor(download: any) {
+  private readonly nameinfo: PathInfo;
+
+  constructor(download: BaseDownload) {
     this.d = download;
+    const info = parsePath(this.d.finalName);
+    this.nameinfo = this.fixupExtension(info);
   }
 
-  get nameinfo() {
-    return parsePath(this.d.finalName);
+  private fixupExtension(info: PathInfo): PathInfo {
+    if (!this.d.mime) {
+      return info;
+    }
+    const mime = MimeDB.getMime(this.d.mime);
+    if (!mime) {
+      return info;
+    }
+    const {ext} = info;
+    if (mime.major === "image" || mime.major === "video") {
+      if (ext && mime.extensions.has(ext.toLowerCase())) {
+        return info;
+      }
+      return new PathInfo(info.base, mime.primary, info.path);
+    }
+    if (ext) {
+      return info;
+    }
+    return new PathInfo(info.base, mime.primary, info.path);
   }
 
   get ref() {
     return this.d.uReferrer;
   }
 
-
   get p_name() {
     return this.nameinfo.base;
   }
@@ -184,7 +208,7 @@ export default class Renamer {
         (self[prop] || "").trim() :
         type;
       if (flat) {
-        return rv.replace(/\/+/g, "-");
+        return rv.replace(/[/\\]+/g, "-");
       }
       return rv;
     }));

lib/mime.ts

@@ -0,0 +1,55 @@
+"use strict";
+// License: MIT
+
+import mime from "../data/mime.json";
+
+export class MimeInfo {
+  public readonly type: string;
+
+  public readonly extensions: Set<string>;
+
+  public readonly major: string;
+
+  public readonly minor: string;
+
+  public readonly primary: string;
+
+  constructor(type: string, extensions: string[]) {
+    this.type = type;
+    const [major, minor] = type.split("/", 2);
+    this.major = major;
+    this.minor = minor;
+    [this.primary] = extensions;
+    this.extensions = new Set(extensions);
+    Object.freeze(this);
+  }
+}
+
+export const MimeDB = new class {
+  private readonly mimeToExts: Map<string, MimeInfo>;
+
+  constructor() {
+    const exts = new Map<string, string[]>();
+    for (const [prim, more] of Object.entries(mime.e)) {
+      let toadd = more;
+      if (!Array.isArray(toadd)) {
+        toadd = [toadd];
+      }
+      toadd.unshift(prim);
+      exts.set(prim, toadd);
+    }
+    this.mimeToExts = new Map(Array.from(
+      Object.entries(mime.m),
+      ([mime, prim]) => [mime, new MimeInfo(mime, exts.get(prim) || [prim])]
+    ));
+  }
+
+  getPrimary(mime: string) {
+    const info = this.mimeToExts.get(mime.trim().toLocaleLowerCase());
+    return info ? info.primary : "";
+  }
+
+  getMime(mime: string) {
+    return this.mimeToExts.get(mime.trim().toLocaleLowerCase());
+  }
+}();

lib/notifications.ts

@@ -12,13 +12,20 @@ const DEFAULTS = {
   message: "message",
 };
 
+const TIMEOUT = 4000;
+
+let gid = 1;
+
 export class Notification extends EventEmitter {
   private notification: any;
 
+  private readonly generated: boolean;
+
   constructor(id: string | null, options = {}) {
     super();
 
-    id = id || "DownThemAll-notification";
+    this.generated = !id;
+    id = id || `DownThemAll-notification${++gid}`;
     if (typeof options === "string") {
       options = {message: options};
     }
@@ -39,11 +46,16 @@ export class Notification extends EventEmitter {
   opened(notification: any) {
     this.notification = notification;
     this.emit("opened", this);
+    if (this.generated) {
+      setTimeout(() => {
+        notifications.clear(notification);
+      }, TIMEOUT);
+    }
   }
 
   clicked(notification: any, button?: number) {
     // We can only be clicked, when we were opened, at which point the
-    // notification id is availablfalse
+    // notification id is available
     if (notification !== this.notification) {
       return;
     }
@@ -52,6 +64,7 @@ export class Notification extends EventEmitter {
       return;
     }
     this.emit("clicked", this);
+    console.log("clicked", notification);
   }
 
   async closed(notification: any) {

lib/prefs.ts

@@ -1,9 +1,9 @@
 "use strict";
 // License: MIT
 
-import * as DEFAULT_PREFS from "../data/prefs.json";
+import DEFAULT_PREFS from "../data/prefs.json";
 import { EventEmitter } from "./events";
-import {loadOverlay} from "./objectoverlay";
+import { loadOverlay } from "./objectoverlay";
 import { storage } from "./browser";
 
 const PREFS = Symbol("PREFS");

lib/recentlist.ts

@@ -36,7 +36,7 @@ export class RecentList {
     this.pref = `savedlist-${pref}`;
     this.defaults = Array.from(defaults);
     this[LIST] = [];
-    this.limit = 5;
+    this.limit = 15;
   }
 
   get values() {

lib/select.ts

@@ -10,10 +10,24 @@ import { donate, openPrefs, openUrls } from "./windowutils";
 import { filters, FAST, Filter } from "./filters";
 import { WindowStateTracker } from "./windowstatetracker";
 import { windows } from "./browser";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
 
+interface BaseMatchedItem extends BaseItem {
+  matched?: string | null;
+  prevMatched?: string | null;
+}
 
-function computeSelection(filters: any[], items: any[], onlyFast: boolean) {
-  let ws = items.map((item: any, idx: number) => {
+export interface ItemDelta {
+  idx: number;
+  matched?: string | null;
+}
+
+function computeSelection(
+    filters: Filter[],
+    items: BaseMatchedItem[],
+    onlyFast: boolean): ItemDelta[] {
+  let ws = items.map((item, idx: number) => {
     item.idx = idx;
     const {matched = null} = item;
     item.prevMatched = matched;
@@ -23,14 +37,20 @@ function computeSelection(filters: any[], items: any[], onlyFast: boolean) {
   for (const filter of filters) {
     ws = ws.filter(item => {
       if (filter.matchItem(item)) {
-        item.matched = filter.id === FAST ?
-          "fast" :
-          (onlyFast ? null : filter.id);
+        if (filter.id === FAST) {
+          item.matched = "fast";
+        }
+        else if (!onlyFast && typeof filter.id === "string") {
+          item.matched = filter.id;
+        }
+        else {
+          item.matched = null;
+        }
       }
       return !item.matched;
     });
   }
-  return items.filter(item => item.prevMatched !== item.matched). map(item => {
+  return items.filter(item => item.prevMatched !== item.matched).map(item => {
     return {
       idx: item.idx,
       matched: item.matched
@@ -41,6 +61,9 @@ function computeSelection(filters: any[], items: any[], onlyFast: boolean) {
 function *computeActiveFiltersGen(
     filters: Filter[], activeOverrides: Map<string, boolean>) {
   for (const filter of filters) {
+    if (typeof filter.id !== "string") {
+      continue;
+    }
     const override = activeOverrides.get(filter.id);
     if (typeof override === "boolean") {
       if (override) {
@@ -59,11 +82,11 @@ function computeActiveFilters(
   return Array.from(computeActiveFiltersGen(filters, activeOverrides));
 }
 
-function filtersToDescs(filters: any[]) {
+function filtersToDescs(filters: Filter[]) {
   return filters.map(f => f.descriptor);
 }
 
-export async function select(links: any[], media: any[]) {
+export async function select(links: BaseItem[], media: BaseItem[]) {
   const fm = await filters();
   const tracker = new WindowStateTracker("select", {
     minWidth: 700,
@@ -85,26 +108,26 @@ export async function select(links: any[], media: any[]) {
     tracker.track(window.id, port);
 
     const overrides = new Map();
-    let fast: any = null;
+    let fast: Filter | null = null;
     let onlyFast: false;
     try {
-      fast = fm.getFastFilter();
+      fast = await fm.getFastFilter();
     }
     catch (ex) {
       // ignored
     }
 
     const sendFilters = function(delta = false) {
-      let {linkFilters, mediaFilters} = fm;
+      const {linkFilters, mediaFilters} = fm;
       const alink = computeActiveFilters(linkFilters, overrides);
       const amedia = computeActiveFilters(mediaFilters, overrides);
       const sactiveFilters = new Set<any>();
       [alink, amedia].forEach(
         a => a.forEach(filter => sactiveFilters.add(filter.id)));
       const activeFilters = Array.from(sactiveFilters);
-      linkFilters = filtersToDescs(linkFilters);
-      mediaFilters = filtersToDescs(mediaFilters);
-      port.post("filters", {linkFilters, mediaFilters, activeFilters});
+      const linkFilterDescs = filtersToDescs(linkFilters);
+      const mediaFilterDescs = filtersToDescs(mediaFilters);
+      port.post("filters", {linkFilterDescs, mediaFilterDescs, activeFilters});
 
       if (fast) {
         alink.unshift(fast);
@@ -128,9 +151,6 @@ export async function select(links: any[], media: any[]) {
     });
 
     port.on("queue", (msg: any) => {
-      const selected = new Set<number>(msg.items);
-      const items = (msg.type === "links" ? links : media);
-      msg.items = items.filter((item: any, idx: number) => selected.has(idx));
       done.resolve(msg);
     });
 
@@ -175,7 +195,11 @@ export async function select(links: any[], media: any[]) {
       sendFilters(false);
       const type = await Prefs.get("last-type", "links");
       port.post("items", {type, links, media});
-      const result = await done;
+      const {items, options} = await done;
+      const selectedIndexes = new Set<number>(items);
+      const selectedList = (options.type === "links" ? links : media);
+      const selectedItems = selectedList.filter(
+        (item: BaseItem, idx: number) => selectedIndexes.has(idx));
       for (const [filter, override] of overrides) {
         const f = fm.get(filter);
         if (f) {
@@ -183,7 +207,7 @@ export async function select(links: any[], media: any[]) {
         }
       }
       await fm.save();
-      return result;
+      return {items: selectedItems, options};
     }
     finally {
       fm.off("changed", sendFilters);

lib/single.ts

@@ -7,8 +7,10 @@ import { WindowStateTracker } from "./windowstatetracker";
 import { Promised, timeout } from "./util";
 import { donate } from "./windowutils";
 import { windows } from "./browser";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
 
-export async function single(item: any) {
+export async function single(item: BaseItem | null) {
   const tracker = new WindowStateTracker("single", {
     minWidth: 700,
     minHeight: 460
@@ -46,7 +48,9 @@ export async function single(item: any) {
       donate();
     });
 
-    port.post("item", item);
+    if (item) {
+      port.post("item", {item});
+    }
     return await done;
   }
   finally {

lib/util.ts

@@ -2,8 +2,8 @@
 // License: MIT
 
 import * as psl from "psl";
-import {memoize, identity} from "./memoize";
-export {debounce} from "../uikit/lib/util";
+import { identity, memoize } from "./memoize";
+export { debounce } from "../uikit/lib/util";
 
 export class Promised {
   private promise: Promise<any>;
@@ -96,8 +96,72 @@ export const IS_WIN = typeof navigator !== "undefined" &&
 export const sanitizePath = identity(
   IS_WIN ? sanitizePathWindows : sanitizePathGeneric);
 
+export class PathInfo {
+  private baseField: string;
+
+  private extField: string;
+
+  private pathField: string;
+
+  private nameField: string;
+
+  private fullField: string;
+
+  constructor(base: string, ext: string, path: string) {
+    this.baseField = base;
+    this.extField = ext;
+    this.pathField = path;
+    this.update();
+  }
+
+  get base() {
+    return this.baseField;
+  }
+
+  set base(nv) {
+    this.baseField = sanitizePath(nv);
+    this.update();
+  }
+
+  get ext() {
+    return this.extField;
+  }
+
+  set ext(nv) {
+    this.extField = sanitizePath(nv);
+    this.update();
+  }
+
+  get name() {
+    return this.nameField;
+  }
+
+  get path() {
+    return this.pathField;
+  }
+
+  set path(nv) {
+    this.pathField = sanitizePath(nv);
+    this.update();
+  }
+
+  get full() {
+    return this.fullField;
+  }
+
+  private update() {
+    this.nameField = this.extField ? `${this.baseField}.${this.extField}` : this.baseField;
+    this.fullField = this.pathField ? `${this.pathField}/${this.nameField}` : this.nameField;
+  }
+
+  clone() {
+    return new PathInfo(this.baseField, this.extField, this.pathField);
+  }
+}
+
 // XXX cleanup + test
-export const parsePath = memoize(function parsePath(path: string | URL) {
+export const parsePath = memoize(function parsePath(
+    path: string | URL): PathInfo {
   if (path instanceof URL) {
     path = decodeURIComponent(path.pathname);
   }
@@ -127,13 +191,7 @@ export const parsePath = memoize(function parsePath(path: string | URL) {
   }
 
   path = pieces.join("/");
-  return {
-    path,
-    name,
-    base,
-    ext,
-    full: path ? `${path}/${name}` : name
-  };
+  return new PathInfo(base, ext, path);
 });
 
 export class CoalescedUpdate<T> extends Set<T> {

lib/windowutils.ts

@@ -3,17 +3,31 @@
 
 import { windows, tabs, runtime } from "../lib/browser";
 import {getManager} from "./manager/man";
-import * as DEFAULT_ICONS from "../data/icons.json";
+import DEFAULT_ICONS from "../data/icons.json";
 
 const DONATE_URL = "https://www.downthemall.org/howto/donate/";
 const MANAGER_URL = "/windows/manager.html";
 
-const IS_CHROME = navigator && navigator.userAgent.includes("Chrome");
-
-
 export async function mostRecentBrowser(): Promise<any> {
-  let window = Array.from(await windows.getAll({windowTypes: ["normal"]})).
-    filter((w: any) => w.type === "normal").pop();
+  let window;
+  try {
+    window = await windows.getCurrent({windowTypes: ["normal"]});
+    if (window.type !== "normal") {
+      throw new Error("not a normal window");
+    }
+  }
+  catch {
+    try {
+      window = await windows.getlastFocused({windowTypes: ["normal"]});
+      if (window.type !== "normal") {
+        throw new Error("not a normal window");
+      }
+    }
+    catch {
+      window = Array.from(await windows.getAll({windowTypes: ["normal"]})).
+        filter((w: any) => w.type === "normal").pop();
+    }
+  }
   if (!window) {
     window = await windows.create({
       url: DONATE_URL,
@@ -106,32 +120,10 @@ const ICONS = Object.freeze((() => {
   return new Map<string, string>(rv);
 })());
 
-let iconForPathPlatform: Function;
-if (IS_CHROME) {
-  const FOUR = 128;
-  const DOUBLE = 64;
-  iconForPathPlatform = function(icon: string, size: number) {
-    let scale = "1x";
-    if (size > FOUR) {
-      // wishful thinking at this point
-      scale = "4x";
-    }
-    else if (size > DOUBLE) {
-      scale = "2x";
-    }
-    return `chrome://fileicon/${icon}?scale=${scale}`;
-  };
-}
-else {
-  // eslint-disable-next-line no-unused-vars
-  iconForPathPlatform = function(icon: string, size: number) {
-    return ICONS.get(icon) || "icon-file-generic";
-  };
-}
+export const DEFAULT_ICON_SIZE = 16;
 
-
-// eslint-disable-next-line no-magic-numbers
-export function iconForPath(path: string, size = 16) {
+// eslint-disable-next-line no-unused-vars
+export function iconForPath(path: string, size = DEFAULT_ICON_SIZE) {
   const web = /^https?:\/\//.test(path);
   let file = path.split(/[\\/]/).pop();
   if (file) {
@@ -152,7 +144,7 @@ export function iconForPath(path: string, size = 16) {
       file = "file";
     }
   }
-  return iconForPathPlatform(file, size);
+  return ICONS.get(file) || "icon-file-generic";
 }
 
 /**

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "DownThemAll!",
-  "version": "4.0.2",
+  "version": "4.0.9",
 
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://downthemall.org/",
@@ -9,6 +9,8 @@
 
   "default_locale": "en",
 
+  "content_security_policy": "script-src 'self'; style-src 'self' 'unsafe-inline'; img-src data: blob: 'self'; connect-src data: blob: http: https: 'self'; default-src 'self'",
+
   "icons": {
     "16": "style/icon16.png",
     "32": "style/icon32.png",
@@ -29,7 +31,8 @@
     "notifications",
     "storage",
     "tabs",
-    "webNavigation"
+    "webNavigation",
+    "webRequest"
   ],
 
   "background": {
@@ -40,7 +43,8 @@
   },
 
   "browser_action": {
-    "browser_style": false,
+    "browser_style": true,
+    "default_popup": "windows/popup.html",
     "default_icon": {
       "16": "style/icon16.png",
       "32": "style/icon32.png",

package.json

@@ -22,18 +22,20 @@
     "@typescript-eslint/eslint-plugin": "^2.0.0",
     "@typescript-eslint/parser": "^2.0.0",
     "chai": "^4.1.2",
-    "eslint": "^6.1.0",
+    "eslint": "^6.2.2",
     "mocha": "^6.2.0",
     "ts-loader": "^6.0.4",
     "ts-node": "^8.3.0",
     "typescript": "^3.5.3",
-    "webpack": "^4.39.2",
-    "webpack-cli": "^3.3.6",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.7",
     "xregexp": "^4.2.4"
   },
   "dependencies": {
     "@types/psl": "^1.1.0",
+    "@types/whatwg-mimetype": "^2.1.0",
     "psl": "^1.3.0",
-    "webextension-polyfill": "^0.4.0"
+    "webextension-polyfill": "^0.4.0",
+    "whatwg-mimetype": "^2.3.0"
   }
 }

scripts/gather.ts

@@ -28,7 +28,9 @@ return url;
 }();
 
 function makeURL(url: string) {
-  return new URL(url, baseURL);
+  const rv = new URL(url, baseURL);
+  rv.hash = "";
+  return rv;
 }
 
 function sanitize(str: string | null | undefined) {
@@ -293,7 +295,7 @@ class Gatherer {
 function gather(msg: any, sender: any, callback: Function) {
   try {
     if (!msg || msg.type !== "DTA:gather" || !callback) {
-      return;
+      return Promise.resolve(null);
     }
     const gatherer = new Gatherer(msg);
     const result = {
@@ -311,10 +313,11 @@ function gather(msg: any, sender: any, callback: Function) {
       ),
     };
     urlToUsable(result, result.baseURL);
-    callback(result);
+    return Promise.resolve(result);
   }
   catch (ex) {
     console.error(ex.toString(), ex.stack, ex);
+    return Promise.resolve(null);
   }
 }
 

style/add.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm-1.5 3h3v3.5h3.5v3h-3.5v3.5h-3v-3.5h-3.5v-3h3.5v-3.5z" fill="#000080" fill-rule="evenodd"/>
+</svg>

style/common.css

@@ -18,6 +18,7 @@
   --folder-color: rgb(214, 165, 4);
   --maskbutton-color: rgb(236, 185, 16);
   --missing-color: rgb(0, 82, 204);
+  --open-color: rgba(236, 185, 16, 0.8);
 }
 
 html[data-platform="mac"] {

style/manager.css

@@ -46,6 +46,11 @@ body > * {
   background: rgb(246,246,246);
   color: black;
   transition: box-shadow 0.5s, background 1s;
+  font-size: 24px;
+  line-height: 24px;
+}
+#toolbar > .button > span:before {
+  display: block;
 }
 
 #toolbar > .button.disabled {
@@ -63,13 +68,6 @@ body > * {
   box-shadow: 0px 0px 7px 2px rgba(220,220,220,0.75);
 }
 
-#toolbar > .button > span {
-  display: block;
-  flex-grow: 0;
-  width: 24px;
-  line-height: 24px;
-}
-
 #toolbar > .button > .icon-add {
   color: var(--add-color);
 }
@@ -110,11 +108,11 @@ body > * {
 }
 
 #colURL {
-  width: 38%;
+  width: 42%;
 }
 
 #colPercent {
-  width: 3em;
+  width: 4em;
   min-width: 3em;
 }
 
@@ -123,11 +121,11 @@ body > * {
 }
 
 #colSize {
-  width: 15em;
+  width: 14em;
 }
 
 #colSpeed {
-  width: 6em;
+  width: 7em;
 }
 
 #colDomain,
@@ -156,6 +154,14 @@ body > * {
   height: 26px;
 }
 
+.virtualtable-row.opening {
+  background: var(--open-color) !important;
+}
+
+.virtualtable-progress-container {
+  border-radius: 2px;
+}
+
 .virtualtable-progress-bar {
   height: 14px;
 }
@@ -264,6 +270,7 @@ body > * {
 }
 
 .virtualtable-column-6,
+.virtualtable-column-4,
 .virtualtable-column-3 {
   text-align: right;
 }
@@ -432,6 +439,8 @@ body > * {
   justify-items: stretch;
   border-radius: 4px;
   box-shadow: 2px 2px 6px black;
+  -webkit-user-select: none;
+  user-select: none;
 }
 
 #tooltip-infos {
@@ -444,8 +453,13 @@ body > * {
 }
 
 #tooltip-icon {
-  font-size: 48px;
-  line-height: 48px;
+  height: 64px;
+  width: 64px;
+  background-size: 64px 64px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  font-size: 64px;
+  line-height: 64px;
   padding: 6px;
   text-align: center;
   grid-row: 1/-1;

style/prefs.css

@@ -19,7 +19,7 @@ article {
 
 #tabs {
   display: flex;
-  background: url(icon64.png) 1em 0/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
+  background: url(icon64.png) 1em 50%/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
   padding-left: calc(2em + 32px);
   color: white;
 }
@@ -28,7 +28,7 @@ input.tab {
   display: none;
 }
 
-#tabs > label{
+#tabs > label {
   display: inline-block;
   cursor: pointer;
   font-size: 150%;

style/select.css

@@ -117,7 +117,7 @@ body > * {
 }
 @media (-webkit-min-device-pixel-ratio: 1.3), (min-resolution: 124.8dpi) {
   #tabs {
-    background: url(icon64.png) 1em 0/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
+    background: url(icon64.png) 1em 50%/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
   }
 }
 
@@ -147,7 +147,7 @@ body > * {
   background: var(--toolbar-bg-color);
   color: white;
   min-width: 10em;
-  padding: 1.2ex;
+  padding: 1ex;
   padding-left: 1em;
   cursor: pointer;
   border: 0;
@@ -232,3 +232,7 @@ body > * {
 #maskButton {
   justify-self: flex-start;
 }
+
+#btnDownload {
+  font-weight: bold;
+}

style/single.css

@@ -49,7 +49,7 @@ p.example {
 }
 
 #options > * {
-  margin: 0;
+  margin: 2px;
 }
 
 #options > input {
@@ -81,3 +81,7 @@ h3 {
   font-weight: normal;
   font-style: italic;
 }
+
+#btnDownload {
+  font-weight: bold;
+}

tests/test_renamer.js

@@ -19,7 +19,7 @@ const OPTS = {
   state: DownloadState.QUEUED,
   batch: 42,
   idx: 23,
-  mask: "*name*.*ext",
+  mask: "*name*.*ext*",
   description: "desc / ript.ion .",
   title: " *** TITLE *** ",
 };
@@ -57,6 +57,49 @@ describe("Renamer", function() {
       expect(dest.path).to.equal("");
     });
 
+    it("*name*.*ext* (mime override)", function() {
+      const {dest} = new BaseDownload(
+        Object.assign({}, OPTS, {
+          mask: "*name* *batch*.*ext*",
+          mime: "image/jpeg"
+        }));
+      expect(dest.full).to.equal("filenäme 042.jpg");
+      expect(dest.name).to.equal("filenäme 042.jpg");
+      expect(dest.base).to.equal("filenäme 042");
+      expect(dest.ext).to.equal("jpg");
+      expect(dest.path).to.equal("");
+    });
+
+    it("*name*.*ext* (mime no override)", function() {
+      const {dest} = new BaseDownload(
+        Object.assign({}, OPTS, {
+          mask: "*name* *batch*.*ext*",
+          mime: "image/jpeg",
+          url: "https://www.example.co.uk/filen%C3%A4me.JPe",
+          usable: "https://www.example.co.uk/filenäme.JPe",
+        }));
+      expect(dest.full).to.equal("filenäme 042.JPe");
+      expect(dest.name).to.equal("filenäme 042.JPe");
+      expect(dest.base).to.equal("filenäme 042");
+      expect(dest.ext).to.equal("JPe");
+      expect(dest.path).to.equal("");
+    });
+
+    it("*name*.*ext* (mime override; missing ext)", function() {
+      const {dest} = new BaseDownload(
+        Object.assign({}, OPTS, {
+          mask: "*name* *batch*.*ext*",
+          mime: "application/json",
+          url: "https://www.example.co.uk/filen%C3%A4me",
+          usable: "https://www.example.co.uk/filenäme",
+        }));
+      expect(dest.full).to.equal("filenäme 042.json");
+      expect(dest.name).to.equal("filenäme 042.json");
+      expect(dest.base).to.equal("filenäme 042");
+      expect(dest.ext).to.equal("json");
+      expect(dest.path).to.equal("");
+    });
+
     it("*text*", function() {
       const dest = makeOne("*text*");
       expect(dest.full).to.equal("desc/ript.ion");

tsconfig.json

@@ -12,6 +12,8 @@
     "noImplicitReturns": true,
     "noUnusedLocals": true,
     "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "importHelpers": true,
     "sourceMap": true
   }
 }

uikit/css/modal.css

@@ -33,7 +33,7 @@
 .modal-footer {
   display: flex;
   flex-wrap: nowrap;
-  justify-content: right;
+  justify-content: flex-end;
   background: rgba(30, 30, 30, 0.2);
   margin-top: 2em;
   border-top: 1px solid rgba(30, 30, 30, 0.5);

uikit/lib/basetable.ts

@@ -14,6 +14,8 @@ import {
 } from "./tablesymbols";
 import { InvalidatedSet, UpdateRecord } from "./tableutil";
 import { addClass, clampUInt, IS_MAC } from "./util";
+// eslint-disable-next-line no-unused-vars
+import { TableConfig } from "./config";
 
 const ROWS_SMALL_UPDATE = 5;
 const PIXEL_PREC = 5;
@@ -79,7 +81,7 @@ export class BaseTable extends AbstractTable {
 
   [COLS]: Columns;
 
-  constructor(elem: any, config: any, version?: number) {
+  constructor(elem: any, config: TableConfig | null, version?: number) {
     config = (config && config.version === version && config) || {};
     super();
 
@@ -121,9 +123,9 @@ export class BaseTable extends AbstractTable {
     this.makeDOM(config);
   }
 
-  makeDOM(config: any) {
+  makeDOM(config: TableConfig) {
     const configColumns = "columns" in config ? config.columns : null;
-    const cols = this[COLS] = new Columns(this, configColumns);
+    const cols = this[COLS] = new Columns(this, configColumns || null);
 
     const container = document.createElement("div");
     const thead = document.createElement("div");
@@ -241,7 +243,7 @@ export class BaseTable extends AbstractTable {
     return new SelectionRange(firstIdx, lastIdx);
   }
 
-  get config() {
+  get config(): TableConfig {
     return {
       version: this.version,
       columns: this.columnConfig

uikit/lib/column.ts

@@ -1,14 +1,12 @@
 "use strict";
+// License: MIT
 
 /* eslint-disable no-unused-vars */
 import { TableEvents } from "./tableevents";
 import {addClass, debounce, sum} from "./util";
 import {EventEmitter} from "./events";
 import {APOOL} from "./animationpool";
-
-/* eslint-enable no-unused-vars */
-
-// License: MIT
+import { ColumnConfig, ColumnConfigs } from "./config";
 
 const PIXLIT_WIDTH = 2;
 const MIN_COL_WIDTH = 16;
@@ -55,8 +53,7 @@ export class Column extends EventEmitter {
       columns: Columns,
       col: HTMLTableHeaderCellElement,
       id: number,
-      config: any) {
-    config = config || {};
+      config: ColumnConfig | null) {
     super();
     this.columns = columns;
     this.elem = col;
@@ -89,7 +86,7 @@ export class Column extends EventEmitter {
 
     this.elem.appendChild(containerElem);
 
-    if ("visible" in config) {
+    if (config) {
       this.visible = config.visible;
     }
     this.initWidths(config);
@@ -148,18 +145,18 @@ export class Column extends EventEmitter {
     return Math.max(0, this.currentWidth - this.minWidth);
   }
 
-  get config() {
+  get config(): ColumnConfig {
     return {
       visible: this.visible,
       width: this.currentWidth,
     };
   }
 
-  initWidths(config: any) {
+  initWidths(config: ColumnConfig | null) {
     const style = getComputedStyle(this.elem, null);
     this.minWidth = toPixel(style.getPropertyValue("min-width"), MIN_COL_WIDTH);
     this.maxWidth = toPixel(style.getPropertyValue("max-width"), 0);
-    const width = config.width || this.baseWidth;
+    const width = (config && config.width) || this.baseWidth;
     this.setWidth(width);
   }
 
@@ -236,7 +233,7 @@ export class Columns extends EventEmitter {
 
   public visible: Column[];
 
-  constructor(table: any, config: any) {
+  constructor(table: any, config: ColumnConfigs | null) {
     config = config || {};
     super();
     this.table = table;
@@ -247,7 +244,9 @@ export class Columns extends EventEmitter {
     this.named = new Map<string, Column>();
     this.cols = Array.from(table.elem.querySelectorAll("th")).
       map((colEl: HTMLTableHeaderCellElement, colid: number) => {
-        const columnConfig = colEl.id in config ? config[colEl.id] : null;
+        const columnConfig = config && colEl.id in config ?
+          config[colEl.id] :
+          null;
         const col = new Column(this, colEl, colid, columnConfig);
         col.on("gripmoved", this.gripmoved);
         this.named.set(colEl.id, col);
@@ -261,7 +260,7 @@ export class Columns extends EventEmitter {
     Object.seal(this);
   }
 
-  get config() {
+  get config(): ColumnConfigs {
     const rv: any = {};
     for (const c of this.cols) {
       rv[c.elem.id] = c.config;

uikit/lib/config.ts

@@ -0,0 +1,13 @@
+"use strict";
+// License: MIT
+
+export interface ColumnConfig {
+  visible: boolean;
+  width: number;
+}
+export type ColumnConfigs ={ [name: string]: ColumnConfig };
+
+export interface TableConfig {
+  version?: number;
+  columns?: ColumnConfigs;
+}

uikit/lib/contextmenu.ts

@@ -10,7 +10,7 @@ const MENU_OPEN_BOUNCE = 500;
 
 let ids = 0;
 
-const Keys = new Map([
+export const Keys = new Map([
   ["ACCEL", IS_MAC ? "⌘" : "Ctrl"],
   ["CTRL", "Ctrl"],
   ["ALT", IS_MAC ? "⌥" : "Alt"],
@@ -33,6 +33,14 @@ export interface MenuPosition {
   clientY: number;
 }
 
+interface MenuOptions {
+  disabled?: string;
+  allowClick?: string;
+  icon?: string;
+  key?: string;
+  autoHide?: string;
+}
+
 export class MenuItemBase {
   public readonly owner: ContextMenu;
 
@@ -44,7 +52,7 @@ export class MenuItemBase {
 
   public readonly key: string;
 
-  public readonly autohide: boolean;
+  public readonly autoHide: boolean;
 
   public readonly elem: HTMLLIElement;
 
@@ -54,18 +62,16 @@ export class MenuItemBase {
 
   public readonly keyElem: HTMLSpanElement;
 
-  constructor(owner: ContextMenu, id = "", text = "", {
-    key = "", icon = "", autohide = Object()
-  }) {
+  constructor(owner: ContextMenu, id = "", text = "", options: MenuOptions) {
     this.owner = owner;
     if (!id) {
       id = `contextmenu-${++ids}`;
     }
     this.id = id;
     this.text = text || "";
-    this.icon = icon || "";
-    this.key = key || "";
-    this.autohide = autohide !== "false" && autohide !== false;
+    this.icon = options.icon || "";
+    this.key = options.key || "";
+    this.autoHide = options.autoHide !== "false";
 
     this.elem = document.createElement("li");
     this.elem.id = this.id;
@@ -96,13 +102,14 @@ export class MenuItemBase {
 }
 
 export class MenuItem extends MenuItemBase {
-  constructor(owner: ContextMenu, id = "", text = "", options: any = {}) {
+  constructor(
+      owner: ContextMenu, id = "", text = "", options: MenuOptions = {}) {
     options = options || {};
     super(owner, id, text, options);
-    this.disabled = !!options.disabled;
+    this.disabled = options.disabled === "true";
     this.elem.setAttribute("aria-role", "menuitem");
     this.elem.addEventListener(
-      "click", () => this.owner.emit("clicked", this.id, this.autohide));
+      "click", () => this.owner.emit("clicked", this.id, this.autoHide));
   }
 
   get disabled() {
@@ -132,7 +139,8 @@ export class SubMenuItem extends MenuItemBase {
 
   public readonly expandElem: HTMLSpanElement;
 
-  constructor(owner: ContextMenu, id = "", text = "", options: any = {}) {
+  constructor(
+      owner: ContextMenu, id = "", text = "", options: MenuOptions = {}) {
     super(owner, id, text, options);
     this.elem.setAttribute("aria-role", "menuitem");
     this.elem.setAttribute("aria-haspopup", "true");
@@ -145,8 +153,8 @@ export class SubMenuItem extends MenuItemBase {
     this.expandElem.textContent = "►";
     this.elem.appendChild(this.expandElem);
     this.elem.addEventListener("click", event => {
-      if (options.allowClick) {
-        this.owner.emit("clicked", this.id, this.autohide);
+      if (options.allowClick === "true") {
+        this.owner.emit("clicked", this.id, this.autoHide);
       }
       event.stopPropagation();
       event.preventDefault();
@@ -160,7 +168,7 @@ export class SubMenuItem extends MenuItemBase {
     this.owner.on("showing", () => {
       this.menu.dismiss();
     });
-    this.menu.on("clicked", (...args: any) => {
+    this.menu.on("clicked", (...args: any[]) => {
       this.owner.emit("clicked", ...args);
     });
   }
@@ -215,7 +223,7 @@ export class SubMenuItem extends MenuItemBase {
 export class ContextMenu extends EventEmitter {
   id: string;
 
-  items: any[];
+  items: MenuItemBase[];
 
   itemMap: Map<string, MenuItemBase>;
 
@@ -223,7 +231,7 @@ export class ContextMenu extends EventEmitter {
 
   showing: boolean;
 
-  _maybeDismiss: any;
+  _maybeDismiss: (this: Window, ev: MouseEvent) => any;
 
   constructor(el?: any) {
     super();
@@ -348,10 +356,12 @@ export class ContextMenu extends EventEmitter {
     return this.itemMap.get(id);
   }
 
-  add(item: MenuItemBase, before: any = "") {
+  add(item: MenuItemBase, before: MenuItemBase | string = "") {
     let idx = this.items.length;
     if (before) {
-      before = before.id || before;
+      if (typeof before !== "string") {
+        before = before.id;
+      }
       const ni = this.items.findIndex(i => i.id === before);
       if (ni >= 0) {
         idx = ni;
@@ -366,8 +376,8 @@ export class ContextMenu extends EventEmitter {
     this.itemMap.set(item.id, item);
   }
 
-  remove(item: any) {
-    const id = item.id || item;
+  remove(item: MenuItemBase | string) {
+    const id = typeof item === "string" ? item : item.id;
     const idx = this.items.findIndex(i => i.id === id);
     if (idx >= 0) {
       this.items.splice(idx, 1);

uikit/lib/modal.ts

@@ -1,15 +1,20 @@
 "use strict";
 // License: MIT
 
-interface ModalButton {
+export interface ModalButton {
   title: string;
   value: string;
   default?: boolean;
   dismiss?: boolean;
 }
 
-export default class ModalDialog {
-  private _showing: any;
+interface Promised {
+  resolve: Function;
+  reject: Function;
+}
+
+export default abstract class ModalDialog {
+  private _showing: Promised | null;
 
   private _dismiss: HTMLButtonElement | null;
 
@@ -23,7 +28,7 @@ export default class ModalDialog {
     this._default = null;
   }
 
-  _makeEl() {
+  async _makeEl() {
     this._dismiss = null;
     this._default = null;
 
@@ -35,7 +40,7 @@ export default class ModalDialog {
 
     const body = document.createElement("article");
     body.classList.add("modal-body");
-    body.appendChild(this.content);
+    body.appendChild(await this.getContent());
     cont.appendChild(body);
 
     const footer = document.createElement("footer");
@@ -87,9 +92,8 @@ export default class ModalDialog {
     return el;
   }
 
-  get content(): DocumentFragment | HTMLElement {
-    throw new Error("Not implemented");
-  }
+  abstract getContent():
+    Promise<DocumentFragment | HTMLElement> | HTMLElement | DocumentFragment;
 
   get buttons(): ModalButton[] {
     return [
@@ -108,7 +112,10 @@ export default class ModalDialog {
     ];
   }
 
-  done(button: any) {
+  done(button: ModalButton) {
+    if (!this._showing) {
+      return;
+    }
     const value = this.convertValue(button.value);
     if (button.dismiss) {
       this._showing.reject(new Error(value));
@@ -131,7 +138,7 @@ export default class ModalDialog {
   }
 
 
-  async show() {
+  async show(): Promise<any> {
     if (this._showing) {
       throw new Error("Double show");
     }
@@ -160,7 +167,7 @@ export default class ModalDialog {
       return;
     };
 
-    document.body.appendChild(this.el = this._makeEl());
+    document.body.appendChild(this.el = await this._makeEl());
     this.shown();
     addEventListener("keydown", escapeHandler);
     addEventListener("keydown", enterHandler);
@@ -205,7 +212,7 @@ export default class ModalDialog {
    */
   static async inform(title: string, text: string, oktext: string) {
     const dialog = new class extends ModalDialog {
-      get content() {
+      getContent() {
         const rv = document.createDocumentFragment();
         const h = document.createElement("h1");
         h.textContent = title || "Information";
@@ -241,7 +248,7 @@ export default class ModalDialog {
 
   static async confirm(title: string, text: string) {
     const dialog = new class extends ModalDialog {
-      get content() {
+      getContent() {
         const rv = document.createDocumentFragment();
         const h = document.createElement("h1");
         h.textContent = title || "Confirm";
@@ -280,7 +287,7 @@ export default class ModalDialog {
     const dialog = new class extends ModalDialog {
       _input: HTMLInputElement;
 
-      get content() {
+      getContent() {
         const rv = document.createDocumentFragment();
         const h = document.createElement("h1");
         h.textContent = title || "Confirm";

uikit/lib/row.ts

@@ -38,7 +38,7 @@ class Hover {
 
   private hovering: boolean;
 
-  private timer: any;
+  private timer: number | null;
 
   constructor(row: Row) {
     this.row = row;
@@ -62,7 +62,7 @@ class Hover {
     this.elem.addEventListener("mousemove", this.onmove, {passive: true});
     this.x = evt.clientX;
     this.y = evt.clientY;
-    this.timer = setTimeout(this.onhover, HOVER_TIME);
+    this.timer = window.setTimeout(this.onhover, HOVER_TIME);
   }
 
   onleave() {
@@ -93,7 +93,7 @@ class Hover {
       if (this.timer) {
         clearTimeout(this.timer);
       }
-      this.timer = setTimeout(this.onhover, HOVER_TIME);
+      this.timer = window.setTimeout(this.onhover, HOVER_TIME);
     }
   }
 

uikit/lib/tableevents.ts

@@ -12,6 +12,8 @@ import {Row} from "./row";
 import {APOOL} from "./animationpool";
 import {COLS, ROWCACHE, VISIBLE} from "./tablesymbols";
 import {ContextMenu, MenuItem} from "./contextmenu";
+// eslint-disable-next-line no-unused-vars
+import { TableConfig } from "./config";
 
 const RESIZE_DEBOUNCE = 500;
 const SCROLL_DEBOUNCE = 250;
@@ -19,7 +21,7 @@ const SCROLL_DEBOUNCE = 250;
 export class TableEvents extends BaseTable {
   private oldVisibleTop: number;
 
-  constructor(elem: any, config?: any, version?: number) {
+  constructor(elem: any, config: TableConfig | null, version?: number) {
     super(elem, config, version);
     const {selection} = this;
     selection.on("selection-added", this.selectionAdded.bind(this));
@@ -172,7 +174,7 @@ export class TableEvents extends BaseTable {
         ctx,
         id,
         col.spanElem.textContent || "",
-        {autohide: "false"});
+        {autoHide: "false"});
       ctx.add(item);
       item.iconElem.textContent = col.visible ? "✓" : " ";
       ctx.on(id, async () => {

uikit/lib/tableutil.ts

@@ -8,6 +8,8 @@ import { Row } from "./row";
 import {APOOL} from "./animationpool";
 import {ROW_CACHE_SIZE, ROW_REUSE_SIZE} from "./constants";
 import {clampUInt} from "./util";
+// eslint-disable-next-line no-unused-vars
+import { BaseTable } from "./basetable";
 
 
 export class InvalidatedSet<T> extends Set<T> {
@@ -70,7 +72,7 @@ export class UpdateRecord {
 
   bottom: number;
 
-  constructor(table: any, cols: Column[]) {
+  constructor(table: BaseTable, cols: Column[]) {
     this.rowCount = table.rowCount;
     this.scrollTop = table.visibleTop;
     this.rowHeight = table.rowHeight;

uikit/lib/util.ts

@@ -13,14 +13,25 @@ export function addClass(elem: HTMLElement, ...cls: string[]) {
   }
 }
 
-export function debounce(fn: Function, to: number) {
-  let timer: any;
+interface Timer {
+  args: any[];
+  id: number;
+}
+
+export function debounce(fn: Function, to: number, reset?: boolean) {
+  let timer: Timer | null;
   return function(...args: any[]) {
     if (timer) {
-      timer.args = args;
-      return;
+      if (!reset) {
+        timer.args = args;
+        return;
+      }
+      window.clearTimeout(timer.id);
     }
-    setTimeout(function() {
+    const id = window.setTimeout(function() {
+      if (!timer) {
+        return;
+      }
       const {args} = timer;
       timer = null;
       try {
@@ -30,7 +41,7 @@ export function debounce(fn: Function, to: number) {
         console.error(ex.toString(), ex);
       }
     }, to);
-    timer = {args};
+    timer = {args, id};
   };
 }
 
@@ -38,7 +49,7 @@ function sumreduce(p: number, c: number) {
   return p + c;
 }
 
-export function sum(arr: any[]) {
+export function sum(arr: number[]) {
   return arr.reduce(sumreduce, 0);
 }
 

util/additional.types

@@ -0,0 +1,23 @@
+types {
+  application/x-x509-ca-cert pem crt der;
+  application/javascript js jsx;
+  audio/x-matroska mka;
+  image/bmp bmp;
+  image/heic heic heif;
+  image/heic heic heif;
+  image/heif-sequence heic heif;
+  image/heif-sequence heic heif;
+  image/jpeg jpg jpeg jpe jfif;
+  image/webp webp;
+  text/html html htm shtml php;
+  text/javascript js jsx;
+  video/mpeg mpg mpe mpeg mpg;
+  video/opus opus;
+  video/x-matroska mkv mk3d mks;
+  video/quicktime mov qt moov;
+  application/x-compressed gz;
+  application/x-gzip gz gzip;
+  application/x-bzip2 bz2;
+  application/x-tar tar;
+  application/x-xz xz;
+}

util/build.py

@@ -26,7 +26,8 @@ UNCOMPRESSABLE = set((".png", ".jpg", ".zip", ".woff2"))
 LICENSED = set((".css", ".html", ".js", "*.ts"))
 IGNORED = set((".DS_Store", "Thumbs.db"))
 
-PERM_IGNORED_FX = set(("downloads.shelf",))
+PERM_IGNORED_FX = set(("downloads.shelf", "webRequest"))
+PERM_IGNORED_CHROME = set(("menus",))
 
 SCRIPTS = [
   "yarn build:regexps",
@@ -90,8 +91,6 @@ def build_firefox(args):
   else:
     infos["browser_specific_settings"]["gecko"]["id"] = RELEASE_ID
 
-
-  
   infos["permissions"] = [p for p in infos.get("permissions") if not p in PERM_IGNORED_FX]
   out = Path("web-ext-artifacts") / f"dta-{version}-{args.mode}-fx.zip"
   if not out.parent.exists():
@@ -101,6 +100,33 @@ def build_firefox(args):
   print("Output", out)
   build(out, json.dumps(infos, indent=2).encode("utf-8"))
 
+  
+def build_chrome(args):
+  now = datetime.now().strftime("%Y%m%d%H%M%S")
+  with open("manifest.json") as manip:
+    infos = json.load(manip, object_pairs_hook=OrderedDict)
+
+  version = infos.get("version")
+  if args.mode == "nightly":
+    version = infos["version"] = f"{version}.{now}"
+
+  version = infos.get("version")
+
+  del infos["browser_specific_settings"]
+  if args.mode != "release":
+    infos["version_name"] = f"{version}-{args.mode}"
+    infos["short_name"] = infos.get("name")
+    infos["name"] = f"{infos.get('name')} {args.mode}"
+  
+  infos["permissions"] = [p for p in infos.get("permissions") if not p in PERM_IGNORED_CHROME]
+  out = Path("web-ext-artifacts") / f"dta-{version}-{args.mode}-crx.zip"
+  if not out.parent.exists():
+    out.parent.mkdir()
+  if out.exists():
+    out.unlink()
+  print("Output", out)
+  build(out, json.dumps(infos, indent=2).encode("utf-8"))
+
 def main():
   from argparse import ArgumentParser
   args = ArgumentParser()
@@ -114,6 +140,7 @@ def main():
     else:
       run([script], shell=True)
   build_firefox(args)
+  build_chrome(args)
   print("DONE.")
 
 if __name__ == "__main__":

util/i18ntochrome.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+import json
+import re
+from collections import OrderedDict
+from pathlib import Path
+
+re_valid = re.compile("[^A-Za-z0-9_]")
+
+for file in Path("_locales/").glob("**/*.json"):
+  with file.open("r") as filep:
+    messages = json.load(filep, object_pairs_hook=OrderedDict)
+  for x in list(messages):
+    prev = x
+    while True:
+      y = re_valid.sub("_", x)
+      if prev == y:
+        break
+      prev = y
+    if x == y:
+      continue
+    messages[y] = messages[x]
+    del messages[x]
+  with file.open("w", encoding="utf-8") as filep:
+    json.dump(messages, filep, ensure_ascii=False, indent=2)

util/makelocalelist.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+import json
+from pathlib import Path
+
+langs = sorted(Path("_locales").glob("**/messages.json"), key=lambda p: p.parent.name.casefold())
+all = {}
+for m in langs:
+  loc = m.parent.name
+  with m.open("r") as mp:
+    lang = json.load(mp).get("language").get("message")
+  if not lang:
+    raise Exception(f"{m}: no language")
+  lang = f"{lang} [{loc}]"
+  all[loc] = lang
+with open("_locales/all.json", "wb") as op:
+  op.write(json.dumps(all, indent=2, ensure_ascii=False).encode("utf-8"))

util/mime.types

@@ -0,0 +1,98 @@
+https://github.com/nginx/nginx/raw/master/conf/mime.types
+
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

util/seed_mime.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python3
+
+import json
+import re
+import sys
+from collections import OrderedDict
+
+def unique(seq):
+  return list(OrderedDict([i, None] for i in seq if i))
+
+def generate(major, minor, exts):
+  exts = exts[:]
+  yield f"{major}/{minor}", exts
+  if (minor.startswith("x-")):
+    yield f"{major}/{minor[2:]}", exts
+  else:
+    yield f"{major}/x-{minor}", exts
+  for ext in exts:
+    yield f"{major}/{ext}", exts
+    yield f"{major}/x-{ext}", exts
+
+
+def make(text, final):
+  lines = "".join([
+    line.strip()
+    for line in re.search(r"\{(.*)\}", text, re.S).group(1).split("\n")
+    if line.strip() and not line.strip().startswith("#")
+  ]).split(";")
+
+  additional = []
+  for line in lines:
+    if not line:
+      continue
+    m = re.match(r"([a-z1-9]+)/([^\s]+)\s+(.+?)$", line)
+    if not m:
+      continue
+    [major, minor, exts] = m.groups()
+    exts = unique(e.lower().strip() for e in exts.split(" ") if e.strip())
+    mime = f"{major}/{minor}"
+    if mime == "application/octet-stream":
+      continue
+    if mime in final:
+      final[mime] += exts
+      continue
+    final[mime] = exts
+    additional += (major, minor, exts),
+
+  for [major, minor, exts] in additional:
+    for [mime, exts] in generate(major, minor, exts):
+      if mime in final:
+        continue
+      final[mime] = exts
+
+final = OrderedDict()
+for file in sys.argv[1:]:
+  with open(file, "r") as fp:
+    make(fp.read(), final)
+
+multi = dict()
+for [mime, exts] in list(final.items()):
+  exts = unique(exts)
+  prim = exts[0]
+  final[mime] = prim
+  if len(exts) == 1:
+    continue
+  exts = exts[1:]
+  if len(exts) == 1:
+    multi[prim] = exts[0]
+  else:
+    multi[prim] = exts
+
+final = OrderedDict(sorted(final.items()))
+multi = OrderedDict(sorted(multi.items()))
+
+print(json.dumps(dict(e=multi, m=final), indent=2))
+print("generated", len(final), "mimes", "with", len(multi), "multis", file=sys.stderr)

webpack.config.js

@@ -25,13 +25,14 @@ module.exports = {
     "select": "./windows/select.ts",
     "single": "./windows/single.ts",
     "prefs": "./windows/prefs.ts",
+    "content-popup": "./windows/popup.ts",
     "content-gather": "./scripts/gather.ts",
   },
   externals(context, request, callback) {
     if (request === "crypto") {
       return callback(null, "crypto");
     }
-    if (request.includes("_locales")) {
+    if (/_locales.*messages\.json/.test(request)) {
       return callback(null, "null");
     }
     return callback();
@@ -41,6 +42,11 @@ module.exports = {
     filename: "[name].js"
   },
   devtool: "source-map",
+  stats: {
+    hash: true,
+    timings: true,
+    maxModules: 2,
+  },
   watchOptions: {
     ignored: /node_modules|bundles/
   },

windows/broadcaster.ts

@@ -1,9 +1,8 @@
 "use strict";
 // License: MIT
 
-import {Keys} from "./keys";
-
-const $ = document.querySelector.bind(document);
+import { Keys } from "./keys";
+import { $ } from "./winutil";
 
 export class Broadcaster {
   private readonly els: HTMLElement[];
@@ -38,7 +37,7 @@ export class Broadcaster {
   }
 
   onkey(evt: KeyboardEvent) {
-    const {localName} = evt.target as HTMLElement;
+    const { localName } = evt.target as HTMLElement;
     if (localName === "input" || localName === "textarea") {
       return undefined;
     }

windows/contextmenu.ts

@@ -0,0 +1,22 @@
+"use strict";
+// License: MIT
+
+export * from "../uikit/lib/contextmenu";
+import { Keys } from "../uikit/lib/contextmenu";
+import { IS_MAC } from "../uikit/lib/util";
+import { locale, _ } from "../lib/i18n";
+
+locale.then(() => {
+  Keys.clear();
+  [
+    ["ACCEL", IS_MAC ? "⌘" : _("key-ctrl")],
+    ["CTRL", _("key-ctrl")],
+    ["ALT", IS_MAC ? "⌥" : _("key-alt")],
+    ["DELETE", _("key-delete")],
+    ["PAGEUP", _("key-pageup")],
+    ["PAGEDOWN", _("key-pagedown")],
+    ["HOME", _("key-home")],
+    ["END", _("key-end")],
+    ["SHIFT", "⇧"],
+  ].forEach(([k, v]) => Keys.set(k, v));
+});

windows/dropdown.ts

@@ -13,7 +13,7 @@ export class Dropdown extends EventEmitter {
 
   select: HTMLSelectElement;
 
-  constructor(el: string, options: any[] = []) {
+  constructor(el: string, options: string[] = []) {
     super();
     let input = document.querySelector(el);
     if (!input || !input.parentElement) {

windows/icons.ts

@@ -19,7 +19,7 @@ export class Icons extends Map {
     }
     let cls = super.get(url);
     if (!cls) {
-      cls = `icon-${++this.running}`;
+      cls = `iconcache-${++this.running}`;
       const rule = `.${cls} { background-image: url(${url}); }`;
       this.sheet.insertRule(rule);
       super.set(url, cls);

windows/keys.ts

@@ -3,7 +3,7 @@
 
 import {EventEmitter} from "../lib/events";
 // eslint-disable-next-line no-unused-vars
-import { ContextMenu } from "../uikit/lib/contextmenu";
+import { ContextMenu } from "./contextmenu";
 import { runtime } from "../lib/browser";
 
 export const Keys = new class extends EventEmitter {

windows/manager.html

@@ -128,8 +128,8 @@
   <template id="menufilter-template">
     <ul>
       <li id="ctx-menufilter-seperator">-</li>
-      <li id="ctx-menufilter-invert" data-autohide="false">Invert</li>
-      <li id="ctx-menufilter-clear" data-autohide="false">Clear</li>
+      <li id="ctx-menufilter-invert" data-auto-hide="false">Invert</li>
+      <li id="ctx-menufilter-clear" data-auto-hide="false">Clear</li>
       <li>-</li>
       <li id="ctx-menufilter-sort-ascending" data-icon="icon-sort-asc">Sort ascending</li>
       <li id="ctx-menufilter-sort-descending" data-icon="icon-sort-desc">Sort descending</li>

windows/manager.ts

@@ -6,6 +6,8 @@ import {_, localize} from "../lib/i18n";
 import {Prefs} from "../lib/prefs";
 import PORT from "./manager/port";
 import { runtime } from "../lib/browser";
+import { Promised } from "../lib/util";
+import { PromiseSerializer } from "../lib/pserializer";
 
 const $ = document.querySelector.bind(document);
 
@@ -18,37 +20,6 @@ const LOADED = new Promise(resolve => {
   });
 });
 
-LOADED.then(async () => {
-  const nag = await Prefs.get("nagging", 0);
-  const nagnext = await Prefs.get("nagging-next", 6);
-  const next = Math.ceil(Math.log2(Math.max(1, nag)));
-  const el = $("#nagging");
-  const remove = () => {
-    el.parentElement.removeChild(el);
-  };
-  if (next <= nagnext) {
-    return;
-  }
-  setTimeout(() => {
-    $("#nagging-donate").addEventListener("click", () => {
-      PORT.post("donate");
-      Prefs.set("nagging-next", next);
-      remove();
-    });
-    $("#nagging-later").addEventListener("click", () => {
-      Prefs.set("nagging-next", next);
-      remove();
-    });
-    $("#nagging-never").addEventListener("click", () => {
-      Prefs.set("nagging-next", Number.MAX_SAFE_INTEGER);
-      remove();
-    });
-    $("#nagging-message").textContent = _(
-      "nagging-message", nag.toLocaleString());
-    $("#nagging").classList.remove("hidden");
-  }, 2 * 1000);
-});
-
 addEventListener("DOMContentLoaded", function dom() {
   removeEventListener("DOMContentLoaded", dom);
 
@@ -67,9 +38,41 @@ addEventListener("DOMContentLoaded", function dom() {
     }
   })();
 
-  const loaded = Promise.all([LOADED, platformed]);
+  const tabled = new Promised();
+  const localized = localize(document.documentElement);
+  const loaded = Promise.all([LOADED, platformed, localized]);
+  const fullyloaded = Promise.all([LOADED, platformed, tabled, localized]);
+  fullyloaded.then(async () => {
+    const nag = await Prefs.get("nagging", 0);
+    const nagnext = await Prefs.get("nagging-next", 7);
+    const next = Math.ceil(Math.log2(Math.max(1, nag)));
+    const el = $("#nagging");
+    const remove = () => {
+      el.parentElement.removeChild(el);
+    };
+    if (next <= nagnext) {
+      return;
+    }
+    setTimeout(() => {
+      $("#nagging-donate").addEventListener("click", () => {
+        PORT.post("donate");
+        Prefs.set("nagging-next", next);
+        remove();
+      });
+      $("#nagging-later").addEventListener("click", () => {
+        Prefs.set("nagging-next", next);
+        remove();
+      });
+      $("#nagging-never").addEventListener("click", () => {
+        Prefs.set("nagging-next", Number.MAX_SAFE_INTEGER);
+        remove();
+      });
+      $("#nagging-message").textContent = _(
+        "nagging-message", nag.toLocaleString());
+      $("#nagging").classList.remove("hidden");
+    }, 2 * 1000);
+  });
 
-  localize(document.documentElement);
   $("#donate").addEventListener("click", () => {
     PORT.post("donate");
   });
@@ -85,24 +88,29 @@ addEventListener("DOMContentLoaded", function dom() {
         Table.init();
         const loading = $("#loading");
         loading.parentElement.removeChild(loading);
+        tabled.resolve();
       }
       Table.setItems(items);
     });
   });
-  PORT.on("dirty", async items => {
-    await loaded;
+
+  // Updates
+  const serializer = new PromiseSerializer(1);
+  PORT.on("dirty", serializer.wrap(this, async (items: any[]) => {
+    await fullyloaded;
     Table.updateItems(items);
-  });
-  PORT.on("removed", async sids => {
-    await loaded;
+  }));
+  PORT.on("removed", serializer.wrap(this, async (sids: number[]) => {
+    await fullyloaded;
     Table.removedItems(sids);
-  });
+  }));
 
   const statusNetwork = $("#statusNetwork");
   statusNetwork.addEventListener("click", () => {
     PORT.post("toggle-active");
   });
-  PORT.on("active", active => {
+  PORT.on("active", async (active: boolean) => {
+    await loaded;
     if (active) {
       statusNetwork.className = "icon-network-on";
       statusNetwork.setAttribute("title", _("statusNetwork-active.title"));

windows/manager/buttons.ts

@@ -2,8 +2,7 @@
 // License: MIT
 
 import { EventEmitter } from "../../lib/events";
-
-const $ = document.querySelector.bind(document);
+import { $ } from "../winutil";
 
 export class Buttons extends EventEmitter {
   private readonly parent: HTMLElement;

windows/manager/itemfilters.ts

@@ -10,7 +10,7 @@ import {
   MenuItemBase,
   // eslint-disable-next-line no-unused-vars
   MenuPosition,
-} from "../../uikit/lib/contextmenu";
+} from "../contextmenu";
 import {EventEmitter} from "../../lib/events";
 // eslint-disable-next-line no-unused-vars
 import {filters, Matcher, Filter} from "../../lib/filters";
@@ -19,12 +19,10 @@ import {sort, defaultCompare, naturalCaseCompare} from "../../lib/sorting";
 import {DownloadItem, DownloadTable} from "./table";
 import {formatSize} from "../../lib/formatters";
 import {_} from "../../lib/i18n";
-import {StateTexts} from "./state";
+import {$} from "../winutil";
 
 const TIMEOUT_SEARCH = 750;
 
-const $ = document.querySelector.bind(document);
-
 class ItemFilter {
   public readonly id: string;
 
@@ -43,7 +41,7 @@ export class TextFilter extends ItemFilter {
 
   private box: HTMLInputElement;
 
-  private timer: any;
+  private timer: number | null;
 
   private current: string;
 
@@ -60,7 +58,7 @@ export class TextFilter extends ItemFilter {
       if (this.timer) {
         return;
       }
-      this.timer = setTimeout(() => this.update(), TIMEOUT_SEARCH);
+      this.timer = window.setTimeout(() => this.update(), TIMEOUT_SEARCH);
     });
     this.box.addEventListener("keydown", e => {
       if (e.key !== "Escape") {
@@ -96,8 +94,10 @@ export class TextFilter extends ItemFilter {
   }
 
   allow(item: DownloadItem) {
-    return this.expr.test(
-      [item.usable, item.description, item.finalName].join(" "));
+    const {expr} = this;
+    return expr.test(item.currentName) ||
+      expr.test(item.usable) ||
+      expr.test(item.description);
   }
 }
 
@@ -119,8 +119,10 @@ export class MenuFilter extends ItemFilter {
   constructor(id: string) {
     super(id);
     this.items = new Map();
+    const tmpl = $<HTMLTemplateElement>("#menufilter-template").
+      content.cloneNode(true);
     this.menu = new ContextMenu(
-      $("#menufilter-template").content.cloneNode(true).firstElementChild);
+      (tmpl as HTMLElement).firstElementChild);
     this.menu.on("clicked", this.onclicked.bind(this));
     this.menu.on("ctx-menufilter-invert", () => this.invert());
     this.menu.on("ctx-menufilter-clear", () => this.clear());
@@ -152,7 +154,7 @@ export class MenuFilter extends ItemFilter {
       return;
     }
     const item = new MenuItem(this.menu, id, text, {
-      autohide: false,
+      autoHide: "false",
     });
     item.iconElem.textContent = checked ? "✓" : "";
     this.items.set(id, {item, callback});
@@ -202,16 +204,24 @@ export class MenuFilter extends ItemFilter {
   }
 }
 
+type ChainedFunction = (item: DownloadItem) => boolean;
+
+interface ChainedItem {
+  text: string;
+  fn: ChainedFunction;
+}
+
 class FixedMenuFilter extends MenuFilter {
   collection: FilteredCollection;
 
-  selected: Set<any>;
+  selected: Set<ChainedItem>;
 
-  fixed: Set<any>;
+  fixed: Set<ChainedItem>;
 
-  chain: any;
+  chain: ChainedFunction | null;
 
-  constructor(id: string, collection: FilteredCollection, items: any[]) {
+  constructor(
+      id: string, collection: FilteredCollection, items: ChainedItem[]) {
     super(id);
     this.collection = collection;
     this.selected = new Set();
@@ -226,7 +236,7 @@ class FixedMenuFilter extends MenuFilter {
     });
   }
 
-  toggle(item: MenuItem) {
+  toggle(item: ChainedItem) {
     if (this.selected.has(item)) {
       this.selected.delete(item);
     }
@@ -241,14 +251,18 @@ class FixedMenuFilter extends MenuFilter {
       this.collection.removeFilter(this);
       return;
     }
-    this.chain = Array.from(this.selected).reduce((prev, curr) => {
-      return (item: DownloadItem) => curr.fn(item) || (prev && prev(item));
-    }, null);
+    this.chain = null;
+    this.chain = Array.from(this.selected).reduce(
+      (prev: ChainedFunction | null, curr) => {
+        return (item: DownloadItem) => {
+          return curr.fn(item) || (prev !== null && prev(item));
+        };
+      }, this.chain);
     this.collection.addFilter(this);
   }
 
   allow(item: DownloadItem) {
-    return this.chain(item);
+    return this.chain !== null && this.chain(item);
   }
 
   clear() {
@@ -259,7 +273,9 @@ class FixedMenuFilter extends MenuFilter {
 }
 
 export class StateMenuFilter extends FixedMenuFilter {
-  constructor(collection: FilteredCollection) {
+  constructor(
+      collection: FilteredCollection,
+      StateTexts: Readonly<Map<number, string>>) {
     const items = Array.from(StateTexts.entries()).map(([state, text]) => {
       return {
         state,
@@ -326,20 +342,25 @@ export class UrlMenuFilter extends MenuFilter {
   async populate() {
     const filts = await filters();
     for (const i of filts.all.filter(e => e.id !== "deffilter-all")) {
-      this.addItem(i.label, this.toggleRegularFilter.bind(this, i));
+      this.addItem(
+        i.label, this.toggleRegularFilter.bind(this, i), this.filters.has(i));
     }
-    this.addItem("-");
-    sort(
+    const domains = sort(
       Array.from(new Set(this.collection.items.map(e => e.domain))),
       undefined,
       naturalCaseCompare
-    ).forEach(e => {
+    );
+    if (!domains.length) {
+      return;
+    }
+    this.addItem("-");
+    domains.forEach(e => {
       this.addItem(
         e, this.toggleDomainFilter.bind(this, e), this.domains.has(e));
     });
   }
 
-  toggleRegularFilter(filter: any) {
+  toggleRegularFilter(filter: Filter) {
     if (this.filters.has(filter)) {
       this.filters.delete(filter);
     }
@@ -659,6 +680,11 @@ export class FilteredCollection extends EventEmitter {
       this.emit("sorted");
     }
   }
+
+  invalidateIcons() {
+    this.items.forEach(item => item.clearFontIcons());
+    this.recalculate();
+  }
 }
 
 module.exports = {

windows/manager/port.ts

@@ -2,14 +2,18 @@
 // License: MIT
 
 import { EventEmitter } from "../../lib/events";
-import { runtime } from "../../lib/browser";
+// eslint-disable-next-line no-unused-vars
+import { runtime, RawPort } from "../../lib/browser";
 
 const PORT = new class Port extends EventEmitter {
-  port: any;
+  port: RawPort | null;
 
   constructor() {
     super();
     this.port = runtime.connect(null, { name: "manager" });
+    if (!this.port) {
+      throw new Error("Could not connect");
+    }
     this.port.onMessage.addListener((msg: any) => {
       if (typeof msg === "string") {
         this.emit(msg);
@@ -23,10 +27,16 @@ const PORT = new class Port extends EventEmitter {
   }
 
   post(msg: string, data?: any) {
+    if (!this.port) {
+      return;
+    }
     this.port.postMessage(Object.assign({msg}, data));
   }
 
   disconnect() {
+    if (!this.port) {
+      return;
+    }
     this.port.disconnect();
     this.port = null;
   }

windows/manager/removaldlg.ts

@@ -5,8 +5,7 @@ import ModalDialog from "../../uikit/lib/modal";
 import { _, localize } from "../../lib/i18n";
 import { Prefs } from "../../lib/prefs";
 import { Keys } from "../keys";
-
-const $ = document.querySelector.bind(document);
+import { $ } from "../winutil";
 
 export default class RemovalModalDialog extends ModalDialog {
   private readonly text: string;
@@ -22,11 +21,12 @@ export default class RemovalModalDialog extends ModalDialog {
     this.check = null;
   }
 
-  get content() {
-    const content = $("#removal-template").content.cloneNode(true);
-    localize(content);
+  async getContent() {
+    const content = $<HTMLTemplateElement>("#removal-template").
+      content.cloneNode(true) as DocumentFragment;
+    await localize(content);
     this.check = content.querySelector(".removal-remember");
-    content.querySelector(".removal-text").textContent = this.text;
+    $(".removal-text", content).textContent = this.text;
     return content;
   }