From 5064d960eb803dc9e41b649d608b05455b49b87a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 27 Sep 2017 23:49:34 +0200
Subject: [PATCH 001/171] wip implementation

---
 browsepy/compat.py                            |   2 +
 browsepy/manager.py                           |   6 +-
 browsepy/plugin/file_actions/__init__.py      | 174 ++++++++++++++++++
 browsepy/plugin/file_actions/clipboard.py     | 120 ++++++++++++
 .../file_actions/templates/clipboard.html     |  42 +++++
 .../templates/create_directory.html           |  12 ++
 browsepy/plugin/file_actions/tests.py         |   0
 browsepy/static/base.css                      |  55 ++++--
 browsepy/templates/400.html                   |   6 +-
 browsepy/templates/404.html                   |   3 +-
 browsepy/templates/browse.html                |  10 +-
 browsepy/templates/remove.html                |   6 +-
 12 files changed, 408 insertions(+), 28 deletions(-)
 create mode 100644 browsepy/plugin/file_actions/__init__.py
 create mode 100644 browsepy/plugin/file_actions/clipboard.py
 create mode 100644 browsepy/plugin/file_actions/templates/clipboard.html
 create mode 100644 browsepy/plugin/file_actions/templates/create_directory.html
 create mode 100644 browsepy/plugin/file_actions/tests.py

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 913588b..914b64b 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -316,6 +316,7 @@ if PY_LEGACY:
     FileNotFoundError = OSError  # noqa
     range = xrange  # noqa
     filter = itertools.ifilter
+    map = itertools.imap
     basestring = basestring  # noqa
     unicode = unicode  # noqa
     chr = unichr  # noqa
@@ -324,6 +325,7 @@ else:
     FileNotFoundError = FileNotFoundError
     range = range
     filter = filter
+    map = map
     basestring = str
     unicode = str
     chr = chr
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 5ad868a..81e2074 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -104,6 +104,7 @@ class PluginManagerBase(object):
         :type plugin: str
         :raises PluginNotFoundError: if not found on any namespace
         '''
+        plugin = plugin.replace('-', '_')
         names = [
             '%s%s%s' % (namespace, '' if namespace[-1] == '_' else '.', plugin)
             if namespace else
@@ -119,8 +120,9 @@ class PluginManagerBase(object):
             try:
                 __import__(name)
                 return sys.modules[name]
-            except (ImportError, KeyError):
-                pass
+            except (ImportError, KeyError) as e:
+                if not (e.args and e.args[0].endswith('\'{}\''.format(name))):
+                    raise e
 
         raise PluginNotFoundError(
             'No plugin module %r found, tried %r' % (plugin, names),
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
new file mode 100644
index 0000000..8a8b04f
--- /dev/null
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -0,0 +1,174 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+import os
+import os.path
+import shutil
+
+from flask import Blueprint, render_template, request, redirect, url_for
+from werkzeug.exceptions import NotFound
+
+from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
+from browsepy.file import Node
+from browsepy.compat import map
+from browsepy.exceptions import OutsideDirectoryBase
+
+from .clipboard import Clipboard
+
+
+__basedir__ = os.path.dirname(os.path.abspath(__file__))
+
+actions = Blueprint(
+    'file_actions',
+    __name__,
+    url_prefix='/file-actions',
+    template_folder=os.path.join(__basedir__, 'templates'),
+    static_folder=os.path.join(__basedir__, 'static'),
+    )
+
+
+@actions.route('/create/directory', methods=('GET', 'POST'),
+               defaults={'path': ''})
+@actions.route('/create/directory/<path:path>', methods=('GET', 'POST'))
+def create_directory(path):
+    try:
+        directory = Node.from_urlpath(path)
+    except OutsideDirectoryBase:
+        return NotFound()
+
+    if not directory.is_directory or not directory.can_upload:
+        return NotFound()
+
+    if request.method == 'GET':
+        return render_template('create_directory.html', file=directory)
+
+    os.mkdir(os.path.join(directory.path, request.form['name']))
+
+    return redirect(url_for('browse', path=directory.urlpath))
+
+
+@actions.route('/clipboard', methods=('GET', 'POST'), defaults={'path': ''})
+@actions.route('/clipboard/<path:path>', methods=('GET', 'POST'))
+def clipboard(path):
+    sort_property = get_cookie_browse_sorting(path, 'text')
+    sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
+
+    try:
+        directory = Node.from_urlpath(path)
+    except OutsideDirectoryBase:
+        return NotFound()
+
+    if directory.is_excluded or not directory.is_directory:
+        return NotFound()
+
+    if request.method == 'POST':
+        mode = 'cut' if request.form.get('mode-cut', None) else 'copy'
+        response = redirect(url_for('browse', path=directory.urlpath))
+        clipboard = Clipboard(request.form.getlist('path'), mode)
+        clipboard.to_response(response)
+        return response
+
+    clipboard = Clipboard.from_request()
+    return render_template(
+        'clipboard.html',
+        file=directory,
+        clipboard=clipboard,
+        sort_property=sort_property,
+        sort_fnc=sort_fnc,
+        sort_reverse=sort_reverse,
+        )
+
+
+@actions.route('/clipboard/paste', defaults={'path': ''})
+@actions.route('/clipboard/paste/<path:path>')
+def clipboard_paste(path):
+    try:
+        directory = Node.from_urlpath(path)
+    except OutsideDirectoryBase:
+        return NotFound()
+
+    if (
+      not directory.is_directory or
+      directory.is_excluded or
+      not directory.can_upload
+      ):
+        return NotFound()
+
+    response = redirect(url_for('browse', path=directory.urlpath))
+    clipboard = Clipboard.from_request()
+    cut = clipboard.mode == 'cut'
+
+    for node in map(Node.from_urlpath, clipboard):
+        if not node.is_excluded:
+            if not cut:
+                if node.is_directory:
+                    shutil.copytree(node.path, directory.path)
+                else:
+                    shutil.copy2(node.path, directory.path)
+            elif node.parent.can_remove:
+                shutil.move(node.path, directory.path)
+
+    clipboard.clear()
+    clipboard.to_response(response)
+    return response
+
+
+@actions.route('/clipboard/clear', defaults={'path': ''})
+@actions.route('/clipboard/clear/<path:path>')
+def clipboard_clear(path):
+    response = redirect(url_for('browse', path=path))
+    clipboard = Clipboard.from_request()
+    clipboard.clear()
+    clipboard.to_response(response)
+    return response
+
+
+def register_plugin(manager):
+    '''
+    Register blueprints and actions using given plugin manager.
+
+    :param manager: plugin manager
+    :type manager: browsepy.manager.PluginManager
+    '''
+    manager.register_blueprint(actions)
+
+    # add style tag
+    manager.register_widget(
+        place='styles',
+        type='stylesheet',
+        endpoint='file_actions.static',
+        filename='css/browse.css'
+        )
+
+    # register header button
+    manager.register_widget(
+        place='header',
+        type='button',
+        endpoint='file_actions.create_directory',
+        text='Create directory',
+        filter=lambda file: file.can_upload,
+        )
+    manager.register_widget(
+        place='header',
+        type='button',
+        endpoint='file_actions.clipboard',
+        text=lambda file: (
+            '{} items selected'.format(Clipboard.count())
+            if Clipboard.count() else
+            'Selection...'
+            ),
+        )
+    manager.register_widget(
+        place='header',
+        type='button',
+        endpoint='file_actions.clipboard_paste',
+        text='Paste here',
+        filter=Clipboard.detect_target,
+        )
+    manager.register_widget(
+        place='header',
+        type='button',
+        endpoint='file_actions.clipboard_clear',
+        text='Clear',
+        filter=Clipboard.detect,
+        )
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
new file mode 100644
index 0000000..ac1d494
--- /dev/null
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+import os
+import json
+import base64
+import logging
+import hashlib
+
+from flask import request
+from browsepy.compat import range
+
+
+logger = logging.getLogger(__name__)
+
+
+class Clipboard(set):
+    cookie_secret = os.urandom(256)
+    cookie_sign_name = 'clipboard-signature'
+    cookie_mode_name = 'clipboard-mode'
+    cookie_list_name = 'clipboard-{:x}'
+    request_cache_field = '_browsepy_file_actions_clipboard_cache'
+    max_pages = 0xffffffff
+
+    @classmethod
+    def count(cls, request=request):
+        return len(cls.from_request(request))
+
+    @classmethod
+    def detect(cls, node):
+        return bool(cls.count())
+
+    @classmethod
+    def detect_target(cls, node):
+        return node.can_upload and cls.detect(node)
+
+    @classmethod
+    def from_request(cls, request=request):
+        cached = getattr(request, cls.request_cache_field, None)
+        if cached is not None:
+            return cached
+        self = cls()
+        signature = cls._cookiebytes(cls.cookie_sign_name, request)
+        data = cls._read_paginated_cookie(request)
+        method = cls._cookietext(cls.cookie_mode_name, request)
+        if cls._signature(data, method) == signature:
+            try:
+                self.method = method
+                self.update(json.loads(base64.b64decode(data).decode('utf-8')))
+            except BaseException as e:
+                logger.warn('Bad cookie')
+        return self
+
+    @classmethod
+    def _cookiebytes(cls, name, request=request):
+        return request.cookies.get(name, '').encode('ascii')
+
+    @classmethod
+    def _cookietext(cls, name, request=request):
+        return request.cookies.get(name, '')
+
+    @classmethod
+    def _paginated_cookie_length(cls, page=0, path='/'):
+        name_fnc = cls.cookie_list_name.format
+        return 3990 - len(name_fnc(page) + path)  # 4000 - len('=""; Path=')
+
+    @classmethod
+    def _read_paginated_cookie(cls, request=request):
+        chunks = []
+        if request:
+            name_fnc = cls.cookie_list_name.format
+            for i in range(cls.max_pages):  # 2 ** 32 - 1
+                cookie = request.cookies.get(name_fnc(i), '').encode('ascii')
+                chunks.append(cookie)
+                if len(cookie) < cls._paginated_cookie_length(i):
+                    break
+        return b''.join(chunks)
+
+    @classmethod
+    def _write_paginated_cookie(cls, data, response):
+        name_fnc = cls.cookie_list_name.format
+        start = 0
+        size = len(data)
+        for i in range(cls.max_pages):
+            end = cls._paginated_cookie_length(i)
+            response.set_cookie(name_fnc(i), data[start:end].decode('ascii'))
+            start = end
+            if start > size:  # we need an empty page after start == size
+                return i
+        return 0
+
+    @classmethod
+    def _delete_paginated_cookie(cls, response, start=0, request=request):
+        name_fnc = cls.cookie_list_name.format
+        for i in range(start, cls.max_pages):
+            name = name_fnc(i)
+            if name not in request.cookies:
+                break
+            response.set_cookie(name, '', expires=0)
+
+    @classmethod
+    def _signature(cls, data, method):
+        data = cls.cookie_secret + method.encode('utf-8') + data
+        return base64.b64encode(hashlib.sha512(data).digest())
+
+    def __init__(self, iterable=(), mode='copy'):
+        self.mode = mode
+        super(Clipboard, self).__init__(iterable)
+
+    def to_response(self, response, request=request):
+        if self:
+            data = base64.b64encode(json.dumps(list(self)).encode('utf-8'))
+            signature = self._signature(data, self.mode)
+            start = self._write_paginated_cookie(data, response)
+        else:
+            signature = b''
+            start = 0
+        self._delete_paginated_cookie(response, start, request)
+        response.set_cookie(self.cookie_mode_name, self.mode)
+        response.set_cookie(self.cookie_sign_name, signature)
diff --git a/browsepy/plugin/file_actions/templates/clipboard.html b/browsepy/plugin/file_actions/templates/clipboard.html
new file mode 100644
index 0000000..ff4d1f4
--- /dev/null
+++ b/browsepy/plugin/file_actions/templates/clipboard.html
@@ -0,0 +1,42 @@
+{% extends "browse.html" %}
+
+{% block content_header %}
+  <form method="post">
+    <input class="button text" type="submit" name="mode-cut" value="Cut selected">
+    <input class="button text" type="submit" name="mode-copy" value="Copy selected">
+    <a class="button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
+{% endblock %}
+
+{% block content_table %}
+{% if file.is_empty %}
+  <p>No files in directory</p>
+{% else %}
+  <table class="browser">
+    <thead>
+      <tr>
+        {{ th('Name', colspan=2) }}
+        {{ th('Mimetype') }}
+        {{ th('Modified') }}
+        {{ th('Size') }}
+      </tr>
+    </thead>
+    <tbody>
+      {% for f in file.listdir(sortkey=sort_fnc, reverse=sort_reverse) %}
+        {% if f.link and f.link.text %}
+          <tr>
+            <td><input type="checkbox" name="path" value="{{ f.urlpath }}"></td>
+            <td>{{ f.link.text }}</td>
+            <td>{{ f.type or '' }}</td>
+            <td>{{ f.modified or '' }}</td>
+            <td>{{ f.size or '' }}</td>
+          </tr>
+        {% endif %}
+      {% endfor %}
+    </tbody>
+  </table>
+{% endif %}
+{% endblock %}
+
+{% block content_footer %}
+    </form>
+{% endblock %}
diff --git a/browsepy/plugin/file_actions/templates/create_directory.html b/browsepy/plugin/file_actions/templates/create_directory.html
new file mode 100644
index 0000000..8cf4831
--- /dev/null
+++ b/browsepy/plugin/file_actions/templates/create_directory.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block content %}
+  <h1>Create directory</h1>
+
+  <p></p>
+  <form method="post" class="remove">
+    <input type="text" name="name" />
+    <a class="button text long" title="Go back">Cancel</a>
+    <input class="button text long suggested" type="submit" value="Accept" />
+  </form>
+{% endblock %}
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
new file mode 100644
index 0000000..e69de29
diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index 016797b..f0a0f20 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -97,14 +97,6 @@ form.upload input {
   margin: 0.5em 1em;
 }
 
-form.remove {
-  display: inline-block;
-}
-
-form.remove input[type=submit] {
-  min-width: 10em;
-}
-
 html.autosubmit-support form.autosubmit{
   border: 0;
   background: transparent;
@@ -302,8 +294,9 @@ a.sorting.numeric.desc.active:after {
   content: "\ea4b";
 }
 
-a.button,
+a.button, input.button,
 html.autosubmit-support form.autosubmit label {
+  font-size: 1em;
   color: white;
   background: #333;
   display: inline-block;
@@ -316,33 +309,65 @@ html.autosubmit-support form.autosubmit label {
   text-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 0 0 black, -1px 0 0 black, 0 -1px 0 black, 0 1px 0 black;
 }
 
-a.button:active,
+a.button:active, input.button:active,
 html.autosubmit-support form.autosubmit label:active{
   border: 1px solid black;
 }
 
-a.button:hover,
+a.button:hover, input.button:hover,
 html.autosubmit-support form.autosubmit label:hover {
   color: white;
   background: black;
 }
 
-a.button,
+a.button.long, input.button.long {
+  min-width: 10em;
+}
+
+a.button.destructive, input.button.destructive {
+  background: #f31;
+  border-color: #f88;
+}
+
+a.button.destructive:hover, input.button.destructive:hover {
+  background: #d10;
+}
+
+a.button.destructive:active, input.button.destructive:active {
+  background: #d10;
+  border-color: #d10;
+}
+
+a.button.suggested, input.button.suggested {
+  background: #29f;
+  border-color: #8cF;
+}
+
+a.button.suggested:hover, input.button.suggested:hover {
+  background: #16e;
+}
+
+a.button.suggested:active, input.button.suggested:active {
+  background: #16e;
+  border-color: #16e;
+}
+
+a.button, input.button,
 html.autosubmit-support form.autosubmit{
   margin-left: 3px;
 }
 
-a.button {
+a.button, input.button {
   width: 1.5em;
   height: 1.5em;
 }
 
-a.button.text{
+a.button.text, input.button.text{
   width: auto;
   height: auto;
 }
 
-a.button.text,
+a.button.text, input.button.text,
 html.autosubmit-support form.autosubmit label{
   padding: 0.25em 0.5em;
 }
diff --git a/browsepy/templates/400.html b/browsepy/templates/400.html
index 714fc69..33f60ff 100644
--- a/browsepy/templates/400.html
+++ b/browsepy/templates/400.html
@@ -42,8 +42,8 @@
   <h1>Bad Request</h1>
   {{ description }}
   {% if file %}
-    <form method="get" class="remove" action="{{ url_for('browse', path=file.urlpath) }}">
-      <input type="submit" class="cancel" alt="Go back" value="Go back" />
-    </form>
+    <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
+  {% else %}
+    <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
   {% endif %}
 {% endblock %}
diff --git a/browsepy/templates/404.html b/browsepy/templates/404.html
index 4734727..99568a0 100644
--- a/browsepy/templates/404.html
+++ b/browsepy/templates/404.html
@@ -4,5 +4,6 @@
 {% block content %}
   <h1>Not Found</h1>
   <img src="{{ url_for('static', filename='giorgio.jpg') }}" alt=""/>
-  <p></p>
+  <p>The resource you're looking for is not available.</p>
+  <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
 {% endblock %}
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index d94e7bb..508bf13 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -29,9 +29,9 @@
           enctype="multipart/form-data">
       <label>
         <h2>{{ widget.text or 'Upload' }}</h2>
-        <input type="file" name="file[]" multiple=""/>
+        <input class="button text suggested" type="file" name="file[]" multiple=""/>
       </label>
-      <input type="submit"/>
+      <input class="button text" type="submit"/>
     </form>
   {%- elif widget.type == 'html' -%}
     {{ widget.html|safe }}
@@ -46,8 +46,9 @@
   {%- endfor -%}
 {%- endmacro %}
 
-{% macro th(text, property, type='text', colspan=1) -%}
+{% macro th(text, property=None, type='text', colspan=1) -%}
 <th{% if colspan > 1 %} colspan="{{ colspan }}"{% endif %}>
+  {% if property %}
     {% set urlpath = file.urlpath or None %}
     {% set property_desc = '-{}'.format(property) %}
     {% set prop = property_desc if sort_property == property else property %}
@@ -56,6 +57,9 @@
     <a href="{{ url_for('sort', path=urlpath, property=prop) }}"
        class="{{type}} sorting{{active}}{{desc}}"
        >{{ text }}</a>
+  {% else %}
+    {{- text -}}
+  {% endif %}
 </th>
 {%- endmacro %}
 
diff --git a/browsepy/templates/remove.html b/browsepy/templates/remove.html
index 2e44488..475f94e 100644
--- a/browsepy/templates/remove.html
+++ b/browsepy/templates/remove.html
@@ -6,9 +6,7 @@
     {%- if file.parent.urlpath %} data-prefix="{{ file.parent.urlpath }}/"{%- endif -%}
     >{{ file.name }}</strong>?</p>
   <form method="post" class="remove">
-    <input type="submit" value="Yes" />
-  </form>
-  <form method="get" class="remove" action="{{ url_for('browse', path=file.parent.urlpath) }}">
-    <input type="submit" class="cancel" alt="Go back" value="Cancel" />
+    <a class="long button text" href="{{ url_for('browse', path=file.parent.urlpath) }}" title="Go back">Cancel</a>
+    <input class="long button destructive text" type="submit" value="Yes" />
   </form>
 {% endblock %}
-- 
GitLab


From eff3c986af3c1a819dd695630732761e833e53fb Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 29 Sep 2017 00:58:42 +0200
Subject: [PATCH 002/171] clipboard css, js and fixes

---
 browsepy/file.py                              |  4 +-
 browsepy/plugin/file_actions/__init__.py      | 26 +++++---
 browsepy/plugin/file_actions/clipboard.py     | 35 ++++++++---
 .../plugin/file_actions/static/clipboard.css  | 48 ++++++++++++++
 .../plugin/file_actions/static/clipboard.js   | 63 +++++++++++++++++++
 .../file_actions/templates/clipboard.html     |  9 ++-
 browsepy/plugin/player/__init__.py            | 10 +--
 browsepy/static/base.css                      |  2 +
 8 files changed, 171 insertions(+), 26 deletions(-)
 create mode 100644 browsepy/plugin/file_actions/static/clipboard.css
 create mode 100644 browsepy/plugin/file_actions/static/clipboard.js

diff --git a/browsepy/file.py b/browsepy/file.py
index 33c50dd..e981c2e 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -509,14 +509,14 @@ class Directory(Node):
                     file=self,
                     endpoint='static',
                     filename='browse.directory.head.js'
-                ),
+                    ),
                 self.plugin_manager.create_widget(
                     'scripts',
                     'script',
                     file=self,
                     endpoint='static',
                     filename='browse.directory.body.js'
-                ),
+                    ),
                 self.plugin_manager.create_widget(
                     'header',
                     'upload',
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 8a8b04f..4c6ff01 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -62,13 +62,14 @@ def clipboard(path):
         return NotFound()
 
     if request.method == 'POST':
-        mode = 'cut' if request.form.get('mode-cut', None) else 'copy'
+        mode = 'cut' if request.form.get('mode-cut') else 'copy'
         response = redirect(url_for('browse', path=directory.urlpath))
         clipboard = Clipboard(request.form.getlist('path'), mode)
         clipboard.to_response(response)
         return response
 
     clipboard = Clipboard.from_request()
+    clipboard.mode = 'select'  # disables exclusion
     return render_template(
         'clipboard.html',
         file=directory,
@@ -97,6 +98,7 @@ def clipboard_paste(path):
     response = redirect(url_for('browse', path=directory.urlpath))
     clipboard = Clipboard.from_request()
     cut = clipboard.mode == 'cut'
+    clipboard.mode = 'paste'  # disables exclusion
 
     for node in map(Node.from_urlpath, clipboard):
         if not node.is_excluded:
@@ -130,17 +132,27 @@ def register_plugin(manager):
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
     '''
+    excluded = manager.app.config.get('exclude_fnc')
+    manager.app.config['exclude_fnc'] = (
+        Clipboard.excluded
+        if not excluded else
+        lambda path: Clipboard.excluded(path) or excluded(path)
+        )
     manager.register_blueprint(actions)
-
-    # add style tag
     manager.register_widget(
         place='styles',
         type='stylesheet',
         endpoint='file_actions.static',
-        filename='css/browse.css'
+        filename='clipboard.css',
+        filter=Clipboard.detect_selection,
+        )
+    manager.register_widget(
+        place='scripts',
+        type='script',
+        endpoint='file_actions.static',
+        filename='clipboard.js',
+        filter=Clipboard.detect_selection,
         )
-
-    # register header button
     manager.register_widget(
         place='header',
         type='button',
@@ -153,7 +165,7 @@ def register_plugin(manager):
         type='button',
         endpoint='file_actions.clipboard',
         text=lambda file: (
-            '{} items selected'.format(Clipboard.count())
+            'Selection ({})...'.format(Clipboard.count())
             if Clipboard.count() else
             'Selection...'
             ),
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index ac1d494..e0a0cc7 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -7,8 +7,9 @@ import base64
 import logging
 import hashlib
 
-from flask import request
+from flask import request, current_app
 from browsepy.compat import range
+from browsepy.file import abspath_to_urlpath
 
 
 logger = logging.getLogger(__name__)
@@ -19,6 +20,7 @@ class Clipboard(set):
     cookie_sign_name = 'clipboard-signature'
     cookie_mode_name = 'clipboard-mode'
     cookie_list_name = 'clipboard-{:x}'
+    cookie_path = '/'
     request_cache_field = '_browsepy_file_actions_clipboard_cache'
     max_pages = 0xffffffff
 
@@ -34,18 +36,30 @@ class Clipboard(set):
     def detect_target(cls, node):
         return node.can_upload and cls.detect(node)
 
+    @classmethod
+    def detect_selection(cls, node):
+        return cls.from_request(request).mode == 'select'
+
+    @classmethod
+    def excluded(cls, path, request=request, app=current_app):
+        if request and app:
+            urlpath = abspath_to_urlpath(path, app.config['directory_base'])
+            self = cls.from_request(request)
+            return self.mode == 'cut' and urlpath in self
+
     @classmethod
     def from_request(cls, request=request):
         cached = getattr(request, cls.request_cache_field, None)
         if cached is not None:
             return cached
         self = cls()
+        setattr(request, cls.request_cache_field, self)
         signature = cls._cookiebytes(cls.cookie_sign_name, request)
         data = cls._read_paginated_cookie(request)
-        method = cls._cookietext(cls.cookie_mode_name, request)
-        if cls._signature(data, method) == signature:
+        mode = cls._cookietext(cls.cookie_mode_name, request)
+        if cls._signature(data, mode) == signature:
             try:
-                self.method = method
+                self.mode = mode
                 self.update(json.loads(base64.b64decode(data).decode('utf-8')))
             except BaseException as e:
                 logger.warn('Bad cookie')
@@ -60,9 +74,9 @@ class Clipboard(set):
         return request.cookies.get(name, '')
 
     @classmethod
-    def _paginated_cookie_length(cls, page=0, path='/'):
+    def _paginated_cookie_length(cls, page=0):
         name_fnc = cls.cookie_list_name.format
-        return 3990 - len(name_fnc(page) + path)  # 4000 - len('=""; Path=')
+        return 3990 - len(name_fnc(page) + cls.cookie_path)
 
     @classmethod
     def _read_paginated_cookie(cls, request=request):
@@ -111,10 +125,11 @@ class Clipboard(set):
         if self:
             data = base64.b64encode(json.dumps(list(self)).encode('utf-8'))
             signature = self._signature(data, self.mode)
-            start = self._write_paginated_cookie(data, response)
+            start = self._write_paginated_cookie(data, response) + 1
+            response.set_cookie(self.cookie_mode_name, self.mode)
+            response.set_cookie(self.cookie_sign_name, signature)
         else:
-            signature = b''
             start = 0
+            response.set_cookie(self.cookie_mode_name, '', expires=0)
+            response.set_cookie(self.cookie_sign_name, '', expires=0)
         self._delete_paginated_cookie(response, start, request)
-        response.set_cookie(self.cookie_mode_name, self.mode)
-        response.set_cookie(self.cookie_sign_name, signature)
diff --git a/browsepy/plugin/file_actions/static/clipboard.css b/browsepy/plugin/file_actions/static/clipboard.css
new file mode 100644
index 0000000..132ffa9
--- /dev/null
+++ b/browsepy/plugin/file_actions/static/clipboard.css
@@ -0,0 +1,48 @@
+input[type=checkbox] {
+  cursor: pointer;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  outline: 0;
+}
+input[type=checkbox]:after {
+  content: " ";
+  min-width: 1.5em;
+  min-height: 1.5em;
+
+  font-family: 'icomoon';
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  font-size: 1em;
+  color: white;
+  background: #333;
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 1.5em;
+  text-align: center;
+  border-radius: 0.25em;
+  border: 1px solid gray;
+  box-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black;
+  text-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 0 0 black, -1px 0 0 black, 0 -1px 0 black, 0 1px 0 black;
+}
+input[type=checkbox]:hover:after {
+  color: white;
+  background: black;
+}
+input[type=checkbox]:checked:after {
+  content: "\ea10";
+  background: black;
+  border: 1px solid black;
+}
+tr.clickable:hover {
+  cursor: pointer;
+}
+tr.clickable:hover > td{
+  background-color: #ddd;
+}
diff --git a/browsepy/plugin/file_actions/static/clipboard.js b/browsepy/plugin/file_actions/static/clipboard.js
new file mode 100644
index 0000000..cd3739e
--- /dev/null
+++ b/browsepy/plugin/file_actions/static/clipboard.js
@@ -0,0 +1,63 @@
+(function() {
+  if (document.querySelectorAll && document.addEventListener) {
+    function every (arr, fnc) {
+      for (let i = 0, l=arr.length; i<l; i++) {
+        if (!fnc(arr[i], i, arr)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    function event (element, event, callback) {
+      var args = Array.prototype.slice.call(arguments, 3);
+      element.addEventListener(event, function () {
+        var args2 = Array.prototype.slice.call(arguments);
+        callback.apply(this, args.concat(args2));
+      });
+    }
+    function form (element) {
+      var parent = element.form || element;
+      while (parent && parent.tagName !== 'form') {
+        parent = parent.parentNode;
+      }
+      return parent;
+    }
+    function checkAll (checkbox) {
+      checkbox.form
+        .querySelectorAll('td input[type=checkbox]')
+        .forEach(function (target) {target.checked = checkbox.checked;});
+    }
+    function checkRow (tr, event) {
+      if (!event || !event.target || event.target.type !== 'checkbox') {
+        var
+          targets = tr.querySelectorAll('td input[type=checkbox]'),
+          checked = every(targets, function (target) {return target.checked;});
+        targets.forEach(function (target) {target.checked = !checked;});
+      }
+    }
+    function check (checkbox) {
+      checkbox.checked = every(
+        checkbox.form.querySelectorAll('td input[type=checkbox]'),
+        function (checkbox) {return checkbox.checked;});
+    }
+    document
+      .querySelectorAll('form th.select-all-container')
+      .forEach(function (container) {
+        var checkbox = document.createElement('input');
+        checkbox.type = 'checkbox';
+        container.appendChild(checkbox);
+        event(checkbox, 'change', checkAll, checkbox);
+        checkbox.form
+          .querySelectorAll('td input[type=checkbox]')
+          .forEach(function (input) {
+            event(input, 'change', check, checkbox);
+          });
+        checkbox.form
+          .querySelectorAll('tbody tr')
+          .forEach(function (tr) {
+            tr.className += ' clickable';
+            event(tr, 'click', checkRow, tr);
+          });
+      });
+  }
+}());
diff --git a/browsepy/plugin/file_actions/templates/clipboard.html b/browsepy/plugin/file_actions/templates/clipboard.html
index ff4d1f4..befd9ab 100644
--- a/browsepy/plugin/file_actions/templates/clipboard.html
+++ b/browsepy/plugin/file_actions/templates/clipboard.html
@@ -14,7 +14,8 @@
   <table class="browser">
     <thead>
       <tr>
-        {{ th('Name', colspan=2) }}
+        <th class="select-all-container"></th>
+        {{ th('Name') }}
         {{ th('Mimetype') }}
         {{ th('Modified') }}
         {{ th('Size') }}
@@ -24,7 +25,11 @@
       {% for f in file.listdir(sortkey=sort_fnc, reverse=sort_reverse) %}
         {% if f.link and f.link.text %}
           <tr>
-            <td><input type="checkbox" name="path" value="{{ f.urlpath }}"></td>
+            <td>
+              <input type="checkbox" name="path" value="{{ f.urlpath }}"
+              {%- if f.urlpath in clipboard %} checked="checked"{% endif -%}
+              >
+            </td>
             <td>{{ f.link.text }}</td>
             <td>{{ f.type or '' }}</td>
             <td>{{ f.modified or '' }}</td>
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index 357b8bc..ccfbaf1 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -106,7 +106,7 @@ def register_plugin(manager):
         type='stylesheet',
         endpoint='player.static',
         filename='css/browse.css'
-    )
+        )
 
     # register link actions
     manager.register_widget(
@@ -114,14 +114,14 @@ def register_plugin(manager):
         type='link',
         endpoint='player.audio',
         filter=PlayableFile.detect
-    )
+        )
     manager.register_widget(
         place='entry-link',
         icon='playlist',
         type='link',
         endpoint='player.playlist',
         filter=PlayListFile.detect
-    )
+        )
 
     # register action buttons
     manager.register_widget(
@@ -130,14 +130,14 @@ def register_plugin(manager):
         type='button',
         endpoint='player.audio',
         filter=PlayableFile.detect
-    )
+        )
     manager.register_widget(
         place='entry-actions',
         css='play',
         type='button',
         endpoint='player.playlist',
         filter=PlayListFile.detect
-    )
+        )
 
     # check argument (see `register_arguments`) before registering
     if manager.get_argument('player_directory_play'):
diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index f0a0f20..19ac67a 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -100,6 +100,7 @@ form.upload input {
 html.autosubmit-support form.autosubmit{
   border: 0;
   background: transparent;
+  margin-bottom: 0;
 }
 
 html.autosubmit-support form.autosubmit input{
@@ -118,6 +119,7 @@ table.browser {
   table-layout: fixed;
   border-collapse: collapse;
   overflow-x: auto;
+  margin: 1.5em 0;
 }
 
 table.browser tr:nth-child(2n) {
-- 
GitLab


From 3ab188f7804e408586948774426d044eb863ba9b Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 30 Sep 2017 04:41:41 +0200
Subject: [PATCH 003/171] redesign ui/ux, fixes

---
 browsepy/compat.py                            |  12 +-
 browsepy/file.py                              |   3 +
 browsepy/plugin/file_actions/__init__.py      |  72 +++++++---
 browsepy/plugin/file_actions/clipboard.py     |  31 ++---
 .../static/{clipboard.js => script.js}        |   9 +-
 .../static/{clipboard.css => style.css}       |  35 +++--
 .../templates/clipboard.file_actions.html     |  58 ++++++++
 .../file_actions/templates/clipboard.html     |  47 -------
 .../create_directory.file_actions.html        |  24 ++++
 .../templates/create_directory.html           |  12 --
 .../plugin/player/templates/audio.player.html |   7 +-
 browsepy/static/base.css                      | 130 ++++++++++++------
 browsepy/templates/400.html                   |   6 +-
 browsepy/templates/404.html                   |   8 +-
 browsepy/templates/base.html                  |  21 ++-
 browsepy/templates/browse.html                |  28 ++--
 browsepy/templates/remove.html                |  12 +-
 browsepy/tests/test_compat.py                 |   4 +-
 browsepy/tests/test_module.py                 |  75 +++++-----
 browsepy/tests/test_transform.py              |   1 +
 setup.py                                      |  14 +-
 21 files changed, 373 insertions(+), 236 deletions(-)
 rename browsepy/plugin/file_actions/static/{clipboard.js => script.js} (89%)
 rename browsepy/plugin/file_actions/static/{clipboard.css => style.css} (83%)
 create mode 100644 browsepy/plugin/file_actions/templates/clipboard.file_actions.html
 delete mode 100644 browsepy/plugin/file_actions/templates/clipboard.html
 create mode 100644 browsepy/plugin/file_actions/templates/create_directory.file_actions.html
 delete mode 100644 browsepy/plugin/file_actions/templates/create_directory.html

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 914b64b..ef86525 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -296,7 +296,9 @@ def which(name,
 
 def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
     '''
-    Escape all special regex characters in pattern.
+    Escape all special regex characters in pattern and converts non-ascii
+    characters into unicode escape sequences.
+
     Logic taken from regex module.
 
     :param pattern: regex pattern to escape
@@ -304,10 +306,12 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
     :returns: escaped pattern
     :rtype: str
     '''
-    escape = '\\{}'.format
+    chr_escape = '\\{}'.format
+    uni_escape = '\\u{:04d}'.format
     return ''.join(
-        escape(c) if c in chars or c.isspace() else
-        '\\000' if c == '\x00' else c
+        chr_escape(c) if c in chars or c.isspace() else
+        c if '\x19' < c < '\x80' else
+        uni_escape(ord(c))
         for c in pattern
         )
 
diff --git a/browsepy/file.py b/browsepy/file.py
index e981c2e..5c1f74e 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -32,6 +32,9 @@ standard_units = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
 common_path_separators = '\\/'
 restricted_chars = '/\0'
 nt_restricted_chars = '/\0\\<>:"|?*' + ''.join(map(chr, range(1, 32)))
+current_restricted_chars = (
+    nt_restricted_chars if os.name == 'nt' else restricted_chars
+    )
 restricted_names = ('.', '..', '::', '/', '\\')
 nt_device_names = (
     ('CON', 'PRN', 'AUX', 'NUL') +
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 4c6ff01..098ce6e 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -9,9 +9,10 @@ from flask import Blueprint, render_template, request, redirect, url_for
 from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
-from browsepy.file import Node
-from browsepy.compat import map
-from browsepy.exceptions import OutsideDirectoryBase
+from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
+                          current_restricted_chars, common_path_separators
+from browsepy.compat import map, re_escape
+from browsepy.exceptions import OutsideDirectoryBase, InvalidFilenameError
 
 from .clipboard import Clipboard
 
@@ -25,6 +26,9 @@ actions = Blueprint(
     template_folder=os.path.join(__basedir__, 'templates'),
     static_folder=os.path.join(__basedir__, 'static'),
     )
+re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
+    re_escape(current_restricted_chars + common_path_separators)
+    )
 
 
 @actions.route('/create/directory', methods=('GET', 'POST'),
@@ -40,11 +44,22 @@ def create_directory(path):
         return NotFound()
 
     if request.method == 'GET':
-        return render_template('create_directory.html', file=directory)
+        return render_template(
+            'create_directory.file_actions.html',
+            file=directory,
+            re_basename=re_basename,
+            )
+
+    basename = request.form['name']
+    if secure_filename(basename) != basename or not basename:
+        raise InvalidFilenameError(
+            path=directory.path,
+            filename=basename,
+            )
 
-    os.mkdir(os.path.join(directory.path, request.form['name']))
+    os.mkdir(os.path.join(directory.path, basename))
 
-    return redirect(url_for('browse', path=directory.urlpath))
+    return redirect(url_for('browse', file=directory))
 
 
 @actions.route('/clipboard', methods=('GET', 'POST'), defaults={'path': ''})
@@ -71,9 +86,10 @@ def clipboard(path):
     clipboard = Clipboard.from_request()
     clipboard.mode = 'select'  # disables exclusion
     return render_template(
-        'clipboard.html',
+        'clipboard.file_actions.html',
         file=directory,
         clipboard=clipboard,
+        cut_support=any(node.can_remove for node in directory.listdir()),
         sort_property=sort_property,
         sort_fnc=sort_fnc,
         sort_reverse=sort_reverse,
@@ -132,39 +148,61 @@ def register_plugin(manager):
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
     '''
+    def detect_selection(directory):
+        return (
+            directory.is_directory and
+            Clipboard.from_request().mode == 'select'
+            )
+
+    def detect_upload(directory):
+        return directory.is_directory and directory.can_upload
+
+    def detect_target(directory):
+        return detect_upload(directory) and detect_clipboard(directory)
+
+    def detect_clipboard(directory):
+        return directory.is_directory and Clipboard.from_request()
+
+    def excluded_clipboard(path):
+        clipboard = Clipboard.from_request(request)
+        if clipboard.mode == 'cut':
+            base = manager.app.config['directory_base']
+            return abspath_to_urlpath(path, base) in clipboard
+
     excluded = manager.app.config.get('exclude_fnc')
     manager.app.config['exclude_fnc'] = (
-        Clipboard.excluded
+        excluded_clipboard
         if not excluded else
-        lambda path: Clipboard.excluded(path) or excluded(path)
+        lambda path: excluded_clipboard(path) or excluded(path)
         )
     manager.register_blueprint(actions)
     manager.register_widget(
         place='styles',
         type='stylesheet',
         endpoint='file_actions.static',
-        filename='clipboard.css',
-        filter=Clipboard.detect_selection,
+        filename='style.css',
+        filter=detect_selection,
         )
     manager.register_widget(
         place='scripts',
         type='script',
         endpoint='file_actions.static',
-        filename='clipboard.js',
-        filter=Clipboard.detect_selection,
+        filename='script.js',
+        filter=detect_selection,
         )
     manager.register_widget(
         place='header',
         type='button',
         endpoint='file_actions.create_directory',
         text='Create directory',
-        filter=lambda file: file.can_upload,
+        filter=detect_upload,
         )
     manager.register_widget(
         place='header',
         type='button',
         endpoint='file_actions.clipboard',
-        text=lambda file: (
+        filter=lambda directory: directory.is_directory,
+        text=lambda directory: (
             'Selection ({})...'.format(Clipboard.count())
             if Clipboard.count() else
             'Selection...'
@@ -175,12 +213,12 @@ def register_plugin(manager):
         type='button',
         endpoint='file_actions.clipboard_paste',
         text='Paste here',
-        filter=Clipboard.detect_target,
+        filter=detect_target,
         )
     manager.register_widget(
         place='header',
         type='button',
         endpoint='file_actions.clipboard_clear',
         text='Clear',
-        filter=Clipboard.detect,
+        filter=detect_clipboard,
         )
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index e0a0cc7..ad198a3 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -7,9 +7,8 @@ import base64
 import logging
 import hashlib
 
-from flask import request, current_app
+from flask import request
 from browsepy.compat import range
-from browsepy.file import abspath_to_urlpath
 
 
 logger = logging.getLogger(__name__)
@@ -28,27 +27,17 @@ class Clipboard(set):
     def count(cls, request=request):
         return len(cls.from_request(request))
 
-    @classmethod
-    def detect(cls, node):
-        return bool(cls.count())
-
-    @classmethod
-    def detect_target(cls, node):
-        return node.can_upload and cls.detect(node)
-
-    @classmethod
-    def detect_selection(cls, node):
-        return cls.from_request(request).mode == 'select'
-
-    @classmethod
-    def excluded(cls, path, request=request, app=current_app):
-        if request and app:
-            urlpath = abspath_to_urlpath(path, app.config['directory_base'])
-            self = cls.from_request(request)
-            return self.mode == 'cut' and urlpath in self
-
     @classmethod
     def from_request(cls, request=request):
+        '''
+        Create clipboard object from request cookies.
+        Uses request itself for cache.
+
+        :param request: optional request, defaults to current flask request
+        :type request: werkzeug.Request
+        :returns: clipboard instance
+        :rtype: Clipboard
+        '''
         cached = getattr(request, cls.request_cache_field, None)
         if cached is not None:
             return cached
diff --git a/browsepy/plugin/file_actions/static/clipboard.js b/browsepy/plugin/file_actions/static/script.js
similarity index 89%
rename from browsepy/plugin/file_actions/static/clipboard.js
rename to browsepy/plugin/file_actions/static/script.js
index cd3739e..0015fe9 100644
--- a/browsepy/plugin/file_actions/static/clipboard.js
+++ b/browsepy/plugin/file_actions/static/script.js
@@ -27,12 +27,15 @@
         .querySelectorAll('td input[type=checkbox]')
         .forEach(function (target) {target.checked = checkbox.checked;});
     }
-    function checkRow (tr, event) {
+    function checkRow (checkbox, tr, event) {
       if (!event || !event.target || event.target.type !== 'checkbox') {
         var
           targets = tr.querySelectorAll('td input[type=checkbox]'),
           checked = every(targets, function (target) {return target.checked;});
-        targets.forEach(function (target) {target.checked = !checked;});
+        targets.forEach(function (target) {
+          target.checked = !checked;
+          check(checkbox, event);
+        });
       }
     }
     function check (checkbox) {
@@ -56,7 +59,7 @@
           .querySelectorAll('tbody tr')
           .forEach(function (tr) {
             tr.className += ' clickable';
-            event(tr, 'click', checkRow, tr);
+            event(tr, 'click', checkRow, checkbox, tr);
           });
       });
   }
diff --git a/browsepy/plugin/file_actions/static/clipboard.css b/browsepy/plugin/file_actions/static/style.css
similarity index 83%
rename from browsepy/plugin/file_actions/static/clipboard.css
rename to browsepy/plugin/file_actions/static/style.css
index 132ffa9..cb7ddfb 100644
--- a/browsepy/plugin/file_actions/static/clipboard.css
+++ b/browsepy/plugin/file_actions/static/style.css
@@ -1,14 +1,28 @@
 input[type=checkbox] {
-  cursor: pointer;
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
   outline: 0;
+  padding: 1px;
 }
+input[type=checkbox],
 input[type=checkbox]:after {
-  content: " ";
-  min-width: 1.5em;
-  min-height: 1.5em;
+  font-size: 1em;
+  display: inline-block;
+  line-height: 1.5em;
+  width: 1.5em;
+  height: 1.5em;
+  margin: 0;
+  vertical-align: middle;
+  cursor: pointer;
+  text-align: center;
+}
+input[type=checkbox]:after {
+  content: "";
+  border-radius: 0.25em;
+  border: 1px solid gray;
+  box-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black;
+  margin: -1px;
 
   font-family: 'icomoon';
   speak: none;
@@ -19,20 +33,11 @@ input[type=checkbox]:after {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 
-  font-size: 1em;
   color: white;
   background: #333;
-  display: inline-block;
-  vertical-align: middle;
-  line-height: 1.5em;
-  text-align: center;
-  border-radius: 0.25em;
-  border: 1px solid gray;
-  box-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black;
   text-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 0 0 black, -1px 0 0 black, 0 -1px 0 black, 0 1px 0 black;
 }
 input[type=checkbox]:hover:after {
-  color: white;
   background: black;
 }
 input[type=checkbox]:checked:after {
@@ -40,6 +45,10 @@ input[type=checkbox]:checked:after {
   background: black;
   border: 1px solid black;
 }
+input[type=text] {
+  padding: 0.25em 1px;
+  width: 22.5em;
+}
 tr.clickable:hover {
   cursor: pointer;
 }
diff --git a/browsepy/plugin/file_actions/templates/clipboard.file_actions.html b/browsepy/plugin/file_actions/templates/clipboard.file_actions.html
new file mode 100644
index 0000000..61ff153
--- /dev/null
+++ b/browsepy/plugin/file_actions/templates/clipboard.file_actions.html
@@ -0,0 +1,58 @@
+{% extends "browse.html" %}
+
+{% block styles %}
+  {{ super() }}
+  <link rel="stylesheet" type="text/css" href="{{ url_for('file_actions.static', filename='style.css') }}"/>
+{% endblock %}
+
+{% block scripts %}
+  <script src="{{ url_for('file_actions.static', filename='script.js') }}"></script>
+{% endblock %}
+
+{% block header %}
+  <h1>{{ breadcrumbs(file, circular=True) }}</h1>
+  <h2>Selection</h2>
+{% endblock %}
+
+{% block content %}
+  <form method="post">
+    <div class="group">
+      {% if cut_support %}
+        <input class="button text" type="submit" name="mode-cut" value="Cut selected">
+      {% endif %}
+      <input class="button text" type="submit" name="mode-copy" value="Copy selected">
+    </div>
+    {% if file.is_empty %}
+      <p>No files in directory</p>
+    {% else %}
+      <table class="browser">
+        <thead>
+          <tr>
+            <th class="select-all-container"></th>
+            {{ th('Name') }}
+            {{ th('Mimetype') }}
+            {{ th('Modified') }}
+            {{ th('Size') }}
+          </tr>
+        </thead>
+        <tbody>
+          {% for f in file.listdir(sortkey=sort_fnc, reverse=sort_reverse) %}
+            {% if f.link and f.link.text %}
+              <tr>
+                <td>
+                  <input type="checkbox" name="path" value="{{ f.urlpath }}"
+                  {%- if f.urlpath in clipboard %} checked="checked"{% endif -%}
+                  >
+                </td>
+                <td>{{ f.link.text }}</td>
+                <td>{{ f.type or '' }}</td>
+                <td>{{ f.modified or '' }}</td>
+                <td>{{ f.size or '' }}</td>
+              </tr>
+            {% endif %}
+          {% endfor %}
+        </tbody>
+      </table>
+    {% endif %}
+  </form>
+{% endblock %}
diff --git a/browsepy/plugin/file_actions/templates/clipboard.html b/browsepy/plugin/file_actions/templates/clipboard.html
deleted file mode 100644
index befd9ab..0000000
--- a/browsepy/plugin/file_actions/templates/clipboard.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "browse.html" %}
-
-{% block content_header %}
-  <form method="post">
-    <input class="button text" type="submit" name="mode-cut" value="Cut selected">
-    <input class="button text" type="submit" name="mode-copy" value="Copy selected">
-    <a class="button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
-{% endblock %}
-
-{% block content_table %}
-{% if file.is_empty %}
-  <p>No files in directory</p>
-{% else %}
-  <table class="browser">
-    <thead>
-      <tr>
-        <th class="select-all-container"></th>
-        {{ th('Name') }}
-        {{ th('Mimetype') }}
-        {{ th('Modified') }}
-        {{ th('Size') }}
-      </tr>
-    </thead>
-    <tbody>
-      {% for f in file.listdir(sortkey=sort_fnc, reverse=sort_reverse) %}
-        {% if f.link and f.link.text %}
-          <tr>
-            <td>
-              <input type="checkbox" name="path" value="{{ f.urlpath }}"
-              {%- if f.urlpath in clipboard %} checked="checked"{% endif -%}
-              >
-            </td>
-            <td>{{ f.link.text }}</td>
-            <td>{{ f.type or '' }}</td>
-            <td>{{ f.modified or '' }}</td>
-            <td>{{ f.size or '' }}</td>
-          </tr>
-        {% endif %}
-      {% endfor %}
-    </tbody>
-  </table>
-{% endif %}
-{% endblock %}
-
-{% block content_footer %}
-    </form>
-{% endblock %}
diff --git a/browsepy/plugin/file_actions/templates/create_directory.file_actions.html b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
new file mode 100644
index 0000000..93811cf
--- /dev/null
+++ b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+
+{% block styles %}
+  {{ super() }}
+  <link rel="stylesheet" type="text/css" href="{{ url_for('file_actions.static', filename='style.css') }}"/>
+{% endblock %}
+
+{% block scripts %}
+  <script src="{{ url_for('file_actions.static', filename='script.js') }}"></script>
+{% endblock %}
+
+{% block content %}
+  <h1>{{ breadcrumbs(file, circular=True) }}</h1>
+  <h2>Create directory</h2>
+  <form method="post" class="remove">
+    <input
+      class="entry" placeholder="Directory name" type="text" name="name"
+      pattern="{{ re_basename }}"/>
+    <div class="group">
+      <a class="button text long" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
+      <input class="button text long suggested" type="submit" value="Accept" />
+    </div>
+  </form>
+{% endblock %}
diff --git a/browsepy/plugin/file_actions/templates/create_directory.html b/browsepy/plugin/file_actions/templates/create_directory.html
deleted file mode 100644
index 8cf4831..0000000
--- a/browsepy/plugin/file_actions/templates/create_directory.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-  <h1>Create directory</h1>
-
-  <p></p>
-  <form method="post" class="remove">
-    <input type="text" name="name" />
-    <a class="button text long" title="Go back">Cancel</a>
-    <input class="button text long suggested" type="submit" value="Accept" />
-  </form>
-{% endblock %}
diff --git a/browsepy/plugin/player/templates/audio.player.html b/browsepy/plugin/player/templates/audio.player.html
index 63bfc8c..908ea6c 100644
--- a/browsepy/plugin/player/templates/audio.player.html
+++ b/browsepy/plugin/player/templates/audio.player.html
@@ -1,4 +1,4 @@
-{% extends "browse.html" %}
+{% extends "base.html" %}
 
 {% block styles %}
   {{ super() }}
@@ -6,6 +6,11 @@
   <link rel="stylesheet" type="text/css" href="{{ url_for('player.static', filename='css/base.css') }}"/>
 {% endblock %}
 
+{% block header %}
+  <h1>{{ breadcrumbs(file) }}</h1>
+  <h2>Play</h2>
+{% endblock %}
+
 {% block content %}
 <div
   class="jp-jplayer"
diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index 19ac67a..7be9c1f 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -33,10 +33,17 @@ body {
   min-height: 100%;
 }
 
+*, :after, :before {
+  box-sizing: content-box;
+}
+
 a,
 label,
 input[type=submit],
-input[type=file] {
+input[type=file],
+input[type=button],
+input[type=radio],
+input[type=checkbox] {
   cursor: pointer;
 }
 
@@ -132,11 +139,11 @@ table.browser td {
   text-align: center;
   vertical-align: middle;
   white-space: nowrap;
-  padding: 5px;
+  padding: 0.5em;
 }
 
 table.browser th {
-  padding-bottom: 10px;
+  padding-bottom: 0.75em;
   border-bottom: 1px solid black;
 }
 
@@ -149,22 +156,50 @@ table.browser td:nth-child(2) {
   width: 100%;
 }
 
+table.browser td:nth-child(2) a {
+  display: block;
+  line-height: 1.5em;
+  vertical-align: middle;
+  margin: -0.5em;
+  padding: 0.5em;
+}
+
 table.browser td:nth-child(3) {
   text-align: left;
 }
 
-h1 {
+h1, h2, h3, h4 {
   line-height: 1.15em;
-  font-size: 3em;
   white-space: normal;
   word-wrap: normal;
   margin: 0;
-  padding: 0 0 0.3em;
+  padding: 0;
   display: block;
-  color: black;
+  color: inherit;
+}
+
+h1 {
+  padding: 0 0 0.3em;
+  font-size: 3em;
   text-shadow: 1px 1px 0 white, -1px -1px 0 white, 1px -1px 0 white, -1px 1px 0 white, 1px 0 0 white, -1px 0 0 white, 0 -1px 0 white, 0 1px 0 white, 2px 2px 0 black, -2px -2px 0 black, 2px -2px 0 black, -2px 2px 0 black, 2px 0 0 black, -2px 0 0 black, 0 2px 0 black, 0 -2px 0 black, 2px 1px 0 black, -2px 1px 0 black, 1px 2px 0 black, 1px -2px 0 black, 2px -1px 0 black, -2px -1px 0 black, -1px 2px 0 black, -1px -2px 0 black;
 }
 
+h2, h3, h4 {
+  margin: 0 0 0.75em;
+}
+
+h2 {
+  font-size: 1.75em;
+}
+
+h3 {
+  font-size: 1.5em;
+}
+
+h4 {
+  font-size: 1.25em;
+}
+
 ol.path,
 ol.path li {
   display: inline;
@@ -296,37 +331,48 @@ a.sorting.numeric.desc.active:after {
   content: "\ea4b";
 }
 
-a.button, input.button,
+a.button,
+input.button,
+input.entry,
 html.autosubmit-support form.autosubmit label {
   font-size: 1em;
-  color: white;
-  background: #333;
   display: inline-block;
   vertical-align: middle;
   line-height: 1.5em;
-  text-align: center;
   border-radius: 0.25em;
   border: 1px solid gray;
   box-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black;
+}
+
+a.button,
+input.button,
+html.autosubmit-support form.autosubmit label {
+  color: white;
+  background: #333;
+  text-align: center;
   text-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 0 0 black, -1px 0 0 black, 0 -1px 0 black, 0 1px 0 black;
 }
 
-a.button:active, input.button:active,
-html.autosubmit-support form.autosubmit label:active{
+a.button:active,
+input.button:active,
+html.autosubmit-support form.autosubmit label:active {
   border: 1px solid black;
 }
 
-a.button:hover, input.button:hover,
+a.button:hover,
+input.button:hover,
 html.autosubmit-support form.autosubmit label:hover {
   color: white;
   background: black;
 }
 
-a.button.long, input.button.long {
+a.button.long,
+input.button.long {
   min-width: 10em;
 }
 
-a.button.destructive, input.button.destructive {
+a.button.destructive,
+input.button.destructive {
   background: #f31;
   border-color: #f88;
 }
@@ -354,9 +400,18 @@ a.button.suggested:active, input.button.suggested:active {
   border-color: #16e;
 }
 
-a.button, input.button,
+a.button,
+input.button,
+input.entry,
 html.autosubmit-support form.autosubmit{
-  margin-left: 3px;
+  margin-left: 0.5em;
+}
+
+a.button:first-child,
+input.button:first-child,
+input.entry,
+html.autosubmit-support form.autosubmit:first-child {
+  margin-left: 0;
 }
 
 a.button, input.button {
@@ -369,7 +424,9 @@ a.button.text, input.button.text{
   height: auto;
 }
 
-a.button.text, input.button.text,
+a.button.text,
+input.button.text,
+input.entry,
 html.autosubmit-support form.autosubmit label{
   padding: 0.25em 0.5em;
 }
@@ -382,31 +439,24 @@ a.button.remove:after {
   content: "\e902";
 }
 
-strong[data-prefix] {
-  display: inline-block;
-  cursor: help;
+input.entry {
+  position: relative;
+  min-width: 10em;
+  overflow: visible;
+  outline: 0;
 }
 
-strong[data-prefix]:after {
-  display: inline-block;
-  position: relative;
-  top: -0.5em;
-  margin: 0 0.25em;
-  width: 1.2em;
-  height: 1.2em;
-  font-size: 0.75em;
-  text-align: center;
-  line-height: 1.2em;
-  content: 'i';
-  border-radius: 0.5em;
-  color: white;
-  background-color: darkgray;
+input.entry:hover,
+input.entry:focus {
+  border-color: #8cF;
 }
 
-strong[data-prefix]:hover:after {
-  display: none;
+input.entry:invalid {
+  border-color: #f31;
 }
 
-strong[data-prefix]:hover:before {
-  content: attr(data-prefix);
+.group {
+  display: block;
+  padding: 0;
+  margin: 1em 0;
 }
diff --git a/browsepy/templates/400.html b/browsepy/templates/400.html
index 33f60ff..a9054c3 100644
--- a/browsepy/templates/400.html
+++ b/browsepy/templates/400.html
@@ -38,8 +38,12 @@
 {% endif %}
 
 {% block title %}400 Bad Request{% endblock %}
-{% block content %}
+
+{% block header %}
   <h1>Bad Request</h1>
+{% endblock %}
+
+{% block content %}
   {{ description }}
   {% if file %}
     <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
diff --git a/browsepy/templates/404.html b/browsepy/templates/404.html
index 99568a0..3165b63 100644
--- a/browsepy/templates/404.html
+++ b/browsepy/templates/404.html
@@ -1,8 +1,12 @@
 {% extends "base.html" %}
 
-{% block title %}Upload failed{% endblock %}
-{% block content %}
+{% block title %}404 Not Found{% endblock %}
+
+{% block header %}
   <h1>Not Found</h1>
+{% endblock %}
+
+{% block content %}
   <img src="{{ url_for('static', filename='giorgio.jpg') }}" alt=""/>
   <p>The resource you're looking for is not available.</p>
   <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
diff --git a/browsepy/templates/base.html b/browsepy/templates/base.html
index 5aefd81..6f581b9 100644
--- a/browsepy/templates/base.html
+++ b/browsepy/templates/base.html
@@ -1,9 +1,28 @@
+{% macro breadcrumb(file) -%}
+  <a href="{{ url_for('browse', path=file.urlpath) }}"
+     {% if file.is_root %}class="root"{% endif %}
+     >{{ file.name }}</a>
+{%- endmacro %}
+
+{% macro breadcrumbs(file, circular=False) -%}
+  <ol class="path">
+    {% for parent in file.ancestors[::-1] %}
+      <li>{{ breadcrumb(parent) }}</li>
+    {% endfor %}
+    {% if circular %}
+      <li>{{ breadcrumb(file) }}</li>
+    {% elif file.name %}
+      <li><span>{{ file.name }}</span></li>
+    {% endif %}
+  </ol>
+{%- endmacro %}
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <meta name="viewport" content="width=device-width, user-scalable=no"/>
-  <title>{% block title %}{{ config.get("title", "BrowsePy") }}{% endblock %}</title>
+  <title>{% block title %}{{ config.get('title', 'browsepy') }}{% endblock %}</title>
   {% block styles %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='base.css') }}"/>
   {% endblock %}
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index 508bf13..bb51540 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% macro draw_widget(f, widget) -%}
-  {%- if widget.type == 'button' -%}
+  {%- if widget.type == 'button' or widget.type == 'link'-%}
     <a
       href="{{ url_for(widget.endpoint, path=f.urlpath) }}"
       class="
@@ -9,10 +9,6 @@
         {%- if widget.text %} text{% endif -%}
         {%- if widget.css %} {{ widget.css }}{% endif -%}"
       >{{ widget.text or '' }}</a>
-  {%- elif widget.type == 'link' -%}
-    <a href="{{ url_for(widget.endpoint, path=f.urlpath) }}"
-       {% if widget.css %}class="{{ widget.css }}"{% endif %}
-       >{{ widget.text or '' }}</a>
   {%- elif widget.type == 'script' -%}
     <script
       src="{{ widget.src or url_for(widget.endpoint, filename=widget.filename) }}"
@@ -63,6 +59,11 @@
 </th>
 {%- endmacro %}
 
+{% block title -%}
+  {{ super() }}
+  {%- if file and file.urlpath %} - {{ file.urlpath }}{% endif -%}
+{%- endblock %}
+
 {% block styles %}
   {{ super() }}
   {{ draw_widgets(file, 'styles') }}
@@ -79,25 +80,12 @@
 {% endblock %}
 
 {% block header %}
-<h1>
-  <ol class="path">
-    {% for parent in file.ancestors[::-1] %}
-      <li>
-        <a href="{{ url_for('browse', path=parent.urlpath) }}"
-           {% if parent.is_root %}class="root"{% endif %}
-           >{{ parent.name }}</a>
-      </li>
-    {% endfor %}
-    {% if file.name %}
-      <li><span>{{ file.name }}</span></li>
-    {% endif %}
-  </ol>
-</h1>
+<h1>{{ breadcrumbs(file) }}</h1>
 {% endblock %}
 
 {% block content %}
 {% block content_header %}
-{{ draw_widgets(file, 'header') }}
+<div class="group">{{ draw_widgets(file, 'header') }}</div>
 {% endblock %}
 
 {% block content_table %}
diff --git a/browsepy/templates/remove.html b/browsepy/templates/remove.html
index 475f94e..ee81315 100644
--- a/browsepy/templates/remove.html
+++ b/browsepy/templates/remove.html
@@ -1,11 +1,13 @@
 {% extends "base.html" %}
 
+{% block header %}
+  <h1>{{ breadcrumbs(file, circular=file.is_directory) }}</h1>
+  <h2>Remove</h2>
+{% endblock %}
+
 {% block content %}
-  <h1>Remove</h1>
-  <p>Do you really want to remove <strong
-    {%- if file.parent.urlpath %} data-prefix="{{ file.parent.urlpath }}/"{%- endif -%}
-    >{{ file.name }}</strong>?</p>
-  <form method="post" class="remove">
+  <p>Do you really want to remove this file?</p>
+  <form method="post" class="group">
     <a class="long button text" href="{{ url_for('browse', path=file.parent.urlpath) }}" title="Go back">Cancel</a>
     <input class="long button destructive text" type="submit" value="Yes" />
   </form>
diff --git a/browsepy/tests/test_compat.py b/browsepy/tests/test_compat.py
index 31969ef..db2d701 100644
--- a/browsepy/tests/test_compat.py
+++ b/browsepy/tests/test_compat.py
@@ -44,7 +44,7 @@ class TestCompat(unittest.TestCase):
             warn['category'] == expected_warning and
             regex.match(warn['message'])
             for warn in warnings
-        ))
+            ))
 
     def test_which(self):
         self.assertTrue(self.module.which('python'))
@@ -68,7 +68,7 @@ class TestCompat(unittest.TestCase):
             path,
             fs_encoding='utf-8',
             errors='strict'
-        )
+            )
 
     def test_fsencode(self):
         path = b'/a/\xc3\xb1'
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index 409f22a..df87a0e 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -2,17 +2,16 @@
 # -*- coding: UTF-8 -*-
 
 import unittest
-import re
 import os
 import os.path
 import shutil
 import tempfile
 import tarfile
-import xml.etree.ElementTree as ET
 import io
 import mimetypes
 
 import flask
+import bs4
 
 from werkzeug.exceptions import NotFound
 
@@ -49,18 +48,12 @@ class Page(object):
         self.data = data
         self.response = response
 
-    @classmethod
-    def innerText(cls, element, sep=''):
-        return sep.join(cls.itertext(element))
-
     @classmethod
     def from_source(cls, source, response=None):
         return cls(source, response)
 
 
 class ListPage(Page):
-    path_strip_re = re.compile('\s+/\s+')
-
     def __init__(self, path, directories, files, removable, upload, tarfile,
                  source, response=None):
         self.path = path
@@ -74,58 +67,55 @@ class ListPage(Page):
 
     @classmethod
     def from_source(cls, source, response=None):
-        html = ET.fromstring(source)
+        html = bs4.BeautifulSoup(source, 'html.parser')
         rows = [
             (
-                row[0].attrib.get('class') == 'icon inode',
-                row[1].find('.//a').attrib['href'],
-                any(button.attrib.get('class') == 'button remove'
-                    for button in row[2].findall('.//a')),
-                any(button.attrib.get('class') == 'button download'
-                    for button in row[2].findall('.//a'))
-            )
-            for row in html.findall('.//table/tbody/tr')
-        ]
+                all(a in row.contents[0]['class'] for a in ('icon', 'inode')),
+                row.contents[1].find('a')['href'],
+                bool(row.contents[2].find('a', class_='button remove')),
+                bool(row.contents[2].find('a', class_='button download')),
+                )
+            for row in html.select('table > tbody > tr')
+            ]
         return cls(
-            cls.path_strip_re.sub(
-                '/',
-                cls.innerText(html.find('.//h1'), '/')
-                ).strip(),
+            '/'.join(
+                o.get_text()
+                for o in html.find('h1').find_all(['a', 'span'])
+                ),
             [url for isdir, url, removable, download in rows if isdir],
             [url for isdir, url, removable, download in rows if not isdir],
             all(removable
                 for isdir, url, removable, download in rows
                 ) if rows else False,
-            html.find('.//form//input[@type=\'file\']') is not None,
+            bool(html.select('form input[type=file]')),
             all(download
                 for isdir, url, removable, download in rows if isdir
                 ) if rows else False,
             source,
             response
-        )
+            )
 
 
 class ConfirmPage(Page):
-    def __init__(self, path, name, back, source, response=None):
+    def __init__(self, path, back, source, response=None):
         self.path = path
-        self.name = name
         self.back = back
         self.source = source
         self.response = response
 
     @classmethod
     def from_source(cls, source, response=None):
-        html = ET.fromstring(source)
-        name = cls.innerText(html.find('.//strong')).strip()
-        prefix = html.find('.//strong').attrib.get('data-prefix', '')
+        html = bs4.BeautifulSoup(source, 'html.parser')
 
         return cls(
-            prefix + name,
-            name,
-            html.find('.//form[@method=\'get\']').attrib['action'],
+            '/'.join(
+                o.get_text()
+                for o in html.find('h1').find_all(['a', 'span'])
+                ),
+            html.find('a', class_='button')['href'],
             source,
             response
-        )
+            )
 
 
 class PageException(Exception):
@@ -156,7 +146,7 @@ class TestApp(unittest.TestCase):
         400: Page400Exception,
         302: Page302Exception,
         None: PageException
-    }
+        }
 
     def setUp(self):
         self.app = self.module.app
@@ -270,7 +260,7 @@ class TestApp(unittest.TestCase):
         self.assertRaises(
             Page404Exception,
             self.get, 'index'
-        )
+            )
 
         self.app.config['directory_start'] = self.start
 
@@ -303,17 +293,17 @@ class TestApp(unittest.TestCase):
         self.assertRaises(
             Page404Exception,
             self.get, 'browse', path='..'
-        )
+            )
 
         self.assertRaises(
             Page404Exception,
             self.get, 'browse', path='start/testfile.txt'
-        )
+            )
 
         self.assertRaises(
             Page404Exception,
             self.get, 'browse', path='exclude'
-        )
+            )
 
         self.app.config['directory_downloadable'] = True
         page = self.get('browse')
@@ -333,16 +323,17 @@ class TestApp(unittest.TestCase):
         self.assertRaises(
             Page404Exception,
             self.get, 'open', path='../shall_not_pass.txt'
-        )
+            )
 
     def test_remove(self):
         open(os.path.join(self.remove, 'testfile2.txt'), 'w').close()
+
+        basename = os.path.basename(self.base)
+
         page = self.get('remove', path='remove/testfile2.txt')
-        self.assertEqual(page.name, 'testfile2.txt')
-        self.assertEqual(page.path, 'remove/testfile2.txt')
+        self.assertEqual(page.path, '%s/remove/testfile2.txt' % basename)
         self.assertEqual(page.back, self.url_for('browse', path='remove'))
 
-        basename = os.path.basename(self.base)
         page = self.post('remove', path='remove/testfile2.txt')
         self.assertEqual(page.path, '%s/remove' % basename)
         self.assertEqual(page.files, self.remove_files)
diff --git a/browsepy/tests/test_transform.py b/browsepy/tests/test_transform.py
index 92d95ff..32b06ea 100755
--- a/browsepy/tests/test_transform.py
+++ b/browsepy/tests/test_transform.py
@@ -44,6 +44,7 @@ class TestGlob(unittest.TestCase):
             ('/a[!b]', r'^/a[^b](/|$)'),
             ('/a[!/]', r'^/a[^/](/|$)'),
             ('/a[]]', r'^/a[\]](/|$)'),
+            ('/a\0', r'^/a\u0000(/|$)'),
             ('/a\\*', r'^/a\*(/|$)'),
             ('a{,.{txt,py[!od]}}', r'/a(|\.(txt|py[^od]))(/|$)'),
             ('a,a', r'/a,a(/|$)'),
diff --git a/setup.py b/setup.py
index 868e28c..2a9db73 100644
--- a/setup.py
+++ b/setup.py
@@ -95,14 +95,18 @@ setup(
             'templates/*',
             'static/fonts/*',
             'static/*.*',  # do not capture directories
-        ],
+            ],
         'browsepy.plugin.player': [
             'templates/*',
             'static/*/*',
-        ]},
-    install_requires=['flask', 'unicategories'] + extra_requires,
+            ],
+        },
+    install_requires=(
+        ['flask', 'unicategories'] + extra_requires
+        ),
+    tests_require=['beautifulsoup4'],
     test_suite='browsepy.tests',
     test_runner='browsepy.tests.runner:DebuggerTextTestRunner',
     zip_safe=False,
-    platforms='any'
-)
+    platforms='any',
+    )
-- 
GitLab


From 9fb465a85aa3a78865b531880a043ffc6b1737c4 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 6 Oct 2017 15:56:17 +0200
Subject: [PATCH 004/171] refactor clipboard widget

---
 .../plugin/file_actions/static/browse.css     | 28 +++++++++++++++++++
 .../widget.clipboard.file_actions.html        | 13 +++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 browsepy/plugin/file_actions/static/browse.css
 create mode 100644 browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html

diff --git a/browsepy/plugin/file_actions/static/browse.css b/browsepy/plugin/file_actions/static/browse.css
new file mode 100644
index 0000000..0ae44a2
--- /dev/null
+++ b/browsepy/plugin/file_actions/static/browse.css
@@ -0,0 +1,28 @@
+.clipboard {
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 0.5em;
+  line-height: 1.5em;
+  border-radius: 0.25em;
+  box-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black;
+  color: white;
+  background: #000;
+}
+.clipboard a.button {
+  margin: 0 -1px 0 0;
+  border-radius: 0;
+  box-shadow: none;
+  padding: 0.25em 1em;
+}
+.clipboard a.button:last-child {
+  border-top-right-radius: 0.25em;
+  border-bottom-right-radius: 0.25em;
+  margin-right: 0;
+}
+.clipboard h3 {
+  font-size: 1em;
+  font-weight: normal;
+  margin: 0 1px 0 0;
+  padding: 0 0.5em;
+  display: inline;
+}
\ No newline at end of file
diff --git a/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html b/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
new file mode 100644
index 0000000..a9d4b72
--- /dev/null
+++ b/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
@@ -0,0 +1,13 @@
+<div class="clipboard">
+  <h3>Clipboard ({{ clipboard|length }})</h3>
+  {% if file.can_upload %}
+    <a
+        class="button text"
+        href="{{ url_for('file_actions.clipboard_paste', file=file) }}"
+        >Paste</a>
+  {% endif %}
+  <a
+    class="button text"
+    href="{{ url_for('file_actions.clipboard_clear', file=file) }}"
+    >Clear</a>
+</div>
\ No newline at end of file
-- 
GitLab


From c900a6c7eac04ddd64e8f8eb1b7b5acdffdc7461 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 7 Oct 2017 20:35:26 +0200
Subject: [PATCH 005/171] refactor widget css, more tests

---
 .gitignore                                    |   1 +
 Makefile                                      |   8 +-
 browsepy/__init__.py                          |   1 +
 browsepy/file.py                              |   6 +-
 browsepy/manager.py                           |  10 +-
 browsepy/plugin/file_actions/__init__.py      |  47 ++---
 browsepy/plugin/file_actions/clipboard.py     |   6 +-
 .../plugin/file_actions/static/browse.css     |  16 +-
 browsepy/plugin/file_actions/static/script.js |  75 ++++----
 .../templates/clipboard.file_actions.html     |  12 +-
 .../widget.clipboard.file_actions.html        |  20 +-
 browsepy/plugin/file_actions/tests.py         | 175 ++++++++++++++++++
 browsepy/static/base.css                      | 139 +++++---------
 browsepy/templates/browse.html                |   8 +-
 browsepy/tests/test_module.py                 |  61 +++---
 browsepy/tests/test_plugins.py                |   1 +
 setup.cfg                                     |   8 +-
 setup.py                                      |   1 +
 18 files changed, 354 insertions(+), 241 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93ff4b4..c9eacdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .git/*
 .c9/*
 .idea/*
+.vscode/*
 .coverage
 htmlcov/*
 dist/*
diff --git a/Makefile b/Makefile
index 2b90dcf..21720b0 100644
--- a/Makefile
+++ b/Makefile
@@ -37,13 +37,11 @@ showdoc: doc
 	xdg-open file://${CURDIR}/doc/.build/html/index.html >> /dev/null
 
 pep8:
-	find browsepy -type f -name "*.py" -exec pep8 --ignore=E123,E126,E121 {} +
+	pep8 --show-source browsepy
+	pep8 --show-source setup.py
 
 eslint:
-	eslint \
-		--ignore-path .gitignore \
-		--ignore-pattern *.min.js \
-		${CURDIR}/browsepy
+	eslint ${CURDIR}/browsepy
 
 flake8:
 	flake8 browsepy/
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index d833c69..6c38673 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -320,4 +320,5 @@ def page_not_found_error(e):
 @app.errorhandler(500)
 def internal_server_error(e):  # pragma: no cover
     logger.exception(e)
+    print('aaaaaa')
     return getattr(e, 'message', 'Internal server error'), 500
diff --git a/browsepy/file.py b/browsepy/file.py
index 5c1f74e..681f4ba 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -15,6 +15,7 @@ from flask import current_app, send_from_directory
 from werkzeug.utils import cached_property
 
 from . import compat
+from . import manager
 from .compat import range
 from .stream import TarFileStream
 from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
@@ -85,7 +86,10 @@ class Node(object):
 
         :returns: plugin manager instance
         '''
-        return self.app.extensions['plugin_manager']
+        return (
+            self.app.extensions.get('plugin_manager') or
+            manager.PluginManager(self.app)
+            )
 
     @cached_property
     def widgets(self):
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 81e2074..1ab8caa 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -161,7 +161,7 @@ class RegistrablePluginManager(PluginManagerBase):
         return module
 
 
-class BlueprintPluginManager(RegistrablePluginManager):
+class BlueprintPluginManager(PluginManagerBase):
     '''
     Manager for blueprint registration via :meth:`register_plugin` calls.
 
@@ -187,7 +187,7 @@ class BlueprintPluginManager(RegistrablePluginManager):
             self._blueprint_known.add(blueprint)
 
 
-class WidgetPluginManager(RegistrablePluginManager):
+class WidgetPluginManager(PluginManagerBase):
     '''
     Plugin manager for widget registration.
 
@@ -208,7 +208,7 @@ class WidgetPluginManager(RegistrablePluginManager):
                 'type': 'link',
                 'text': lambda f: f.name,
                 'icon': lambda f: f.category
-            }),
+                }),
         'button': defaultsnamedtuple(
             'Button',
             ('place', 'type', 'css', 'text', 'endpoint', 'href'),
@@ -229,7 +229,7 @@ class WidgetPluginManager(RegistrablePluginManager):
             'Html',
             ('place', 'type', 'html'),
             {'type': 'html'}),
-    }
+        }
 
     def clear(self):
         '''
@@ -382,7 +382,7 @@ class MimetypePluginManager(RegistrablePluginManager):
         mimetype.by_python,
         mimetype.by_file,
         mimetype.by_default,
-    )
+        )
 
     def clear(self):
         '''
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 098ce6e..4bbbce8 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -59,7 +59,7 @@ def create_directory(path):
 
     os.mkdir(os.path.join(directory.path, basename))
 
-    return redirect(url_for('browse', file=directory))
+    return redirect(url_for('browse', path=directory.urlpath))
 
 
 @actions.route('/clipboard', methods=('GET', 'POST'), defaults={'path': ''})
@@ -113,6 +113,7 @@ def clipboard_paste(path):
 
     response = redirect(url_for('browse', path=directory.urlpath))
     clipboard = Clipboard.from_request()
+    print(clipboard)
     cut = clipboard.mode == 'cut'
     clipboard.mode = 'paste'  # disables exclusion
 
@@ -148,18 +149,9 @@ def register_plugin(manager):
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
     '''
-    def detect_selection(directory):
-        return (
-            directory.is_directory and
-            Clipboard.from_request().mode == 'select'
-            )
-
     def detect_upload(directory):
         return directory.is_directory and directory.can_upload
 
-    def detect_target(directory):
-        return detect_upload(directory) and detect_clipboard(directory)
-
     def detect_clipboard(directory):
         return directory.is_directory and Clipboard.from_request()
 
@@ -169,7 +161,7 @@ def register_plugin(manager):
             base = manager.app.config['directory_base']
             return abspath_to_urlpath(path, base) in clipboard
 
-    excluded = manager.app.config.get('exclude_fnc')
+    excluded = manager.app.config['exclude_fnc']
     manager.app.config['exclude_fnc'] = (
         excluded_clipboard
         if not excluded else
@@ -180,15 +172,8 @@ def register_plugin(manager):
         place='styles',
         type='stylesheet',
         endpoint='file_actions.static',
-        filename='style.css',
-        filter=detect_selection,
-        )
-    manager.register_widget(
-        place='scripts',
-        type='script',
-        endpoint='file_actions.static',
-        filename='script.js',
-        filter=detect_selection,
+        filename='browse.css',
+        filter=detect_clipboard,
         )
     manager.register_widget(
         place='header',
@@ -202,23 +187,15 @@ def register_plugin(manager):
         type='button',
         endpoint='file_actions.clipboard',
         filter=lambda directory: directory.is_directory,
-        text=lambda directory: (
-            'Selection ({})...'.format(Clipboard.count())
-            if Clipboard.count() else
-            'Selection...'
-            ),
+        text='Selection...',
         )
     manager.register_widget(
         place='header',
-        type='button',
-        endpoint='file_actions.clipboard_paste',
-        text='Paste here',
-        filter=detect_target,
-        )
-    manager.register_widget(
-        place='header',
-        type='button',
-        endpoint='file_actions.clipboard_clear',
-        text='Clear',
+        type='html',
+        html=lambda file: render_template(
+            'widget.clipboard.file_actions.html',
+            file=file,
+            clipboard=Clipboard.from_request()
+            ),
         filter=detect_clipboard,
         )
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index ad198a3..5cc123d 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -48,10 +48,10 @@ class Clipboard(set):
         mode = cls._cookietext(cls.cookie_mode_name, request)
         if cls._signature(data, mode) == signature:
             try:
-                self.mode = mode
                 self.update(json.loads(base64.b64decode(data).decode('utf-8')))
-            except BaseException as e:
-                logger.warn('Bad cookie')
+                self.mode = mode
+            except:
+                pass
         return self
 
     @classmethod
diff --git a/browsepy/plugin/file_actions/static/browse.css b/browsepy/plugin/file_actions/static/browse.css
index 0ae44a2..803c3e0 100644
--- a/browsepy/plugin/file_actions/static/browse.css
+++ b/browsepy/plugin/file_actions/static/browse.css
@@ -1,23 +1,31 @@
 .clipboard {
   display: inline-block;
   vertical-align: middle;
-  margin-left: 0.5em;
+  text-align: right;
+  margin: 0 0.5em 0.5em 0;
   line-height: 1.5em;
   border-radius: 0.25em;
   box-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black;
   color: white;
   background: #000;
 }
+.clipboard div {
+  display: inline-block;
+  white-space: nowrap;
+}
 .clipboard a.button {
-  margin: 0 -1px 0 0;
-  border-radius: 0;
+  margin: 0 0 0 1px;
   box-shadow: none;
+  border-radius: 0;
   padding: 0.25em 1em;
 }
+.clipboard a.button:first-of-type {
+  border-top-left-radius: 0.25em;
+  border-bottom-left-radius: 0.25em;
+}
 .clipboard a.button:last-child {
   border-top-right-radius: 0.25em;
   border-bottom-right-radius: 0.25em;
-  margin-right: 0;
 }
 .clipboard h3 {
   font-size: 1em;
diff --git a/browsepy/plugin/file_actions/static/script.js b/browsepy/plugin/file_actions/static/script.js
index 0015fe9..c26f09c 100644
--- a/browsepy/plugin/file_actions/static/script.js
+++ b/browsepy/plugin/file_actions/static/script.js
@@ -1,48 +1,41 @@
 (function() {
-  if (document.querySelectorAll && document.addEventListener) {
-    function every (arr, fnc) {
-      for (let i = 0, l=arr.length; i<l; i++) {
-        if (!fnc(arr[i], i, arr)) {
-          return false;
-        }
+  function every(arr, fnc) {
+    for (let i = 0, l = arr.length; i < l; i++) {
+      if (!fnc(arr[i], i, arr)) {
+        return false;
       }
-      return true;
     }
-    function event (element, event, callback) {
-      var args = Array.prototype.slice.call(arguments, 3);
-      element.addEventListener(event, function () {
-        var args2 = Array.prototype.slice.call(arguments);
-        callback.apply(this, args.concat(args2));
+    return true;
+  }
+  function event(element, event, callback) {
+    var args = Array.prototype.slice.call(arguments, 3);
+    element.addEventListener(event, function () {
+      var args2 = Array.prototype.slice.call(arguments);
+      callback.apply(this, args.concat(args2));
+    });
+  }
+  function checkAll(checkbox) {
+    checkbox.form
+      .querySelectorAll('td input[type=checkbox]')
+      .forEach(function (target) { target.checked = checkbox.checked; });
+  }
+  function checkRow(checkbox, tr, event) {
+    if (!event || !event.target || event.target.type !== 'checkbox') {
+      var
+        targets = tr.querySelectorAll('td input[type=checkbox]'),
+        checked = every(targets, function (target) { return target.checked; });
+      targets.forEach(function (target) {
+        target.checked = !checked;
+        check(checkbox, event);
       });
     }
-    function form (element) {
-      var parent = element.form || element;
-      while (parent && parent.tagName !== 'form') {
-        parent = parent.parentNode;
-      }
-      return parent;
-    }
-    function checkAll (checkbox) {
-      checkbox.form
-        .querySelectorAll('td input[type=checkbox]')
-        .forEach(function (target) {target.checked = checkbox.checked;});
-    }
-    function checkRow (checkbox, tr, event) {
-      if (!event || !event.target || event.target.type !== 'checkbox') {
-        var
-          targets = tr.querySelectorAll('td input[type=checkbox]'),
-          checked = every(targets, function (target) {return target.checked;});
-        targets.forEach(function (target) {
-          target.checked = !checked;
-          check(checkbox, event);
-        });
-      }
-    }
-    function check (checkbox) {
-      checkbox.checked = every(
-        checkbox.form.querySelectorAll('td input[type=checkbox]'),
-        function (checkbox) {return checkbox.checked;});
-    }
+  }
+  function check(checkbox) {
+    checkbox.checked = every(
+      checkbox.form.querySelectorAll('td input[type=checkbox]'),
+      function (checkbox) { return checkbox.checked; });
+  }
+  if (document.querySelectorAll && document.addEventListener) {
     document
       .querySelectorAll('form th.select-all-container')
       .forEach(function (container) {
@@ -60,7 +53,9 @@
           .forEach(function (tr) {
             tr.className += ' clickable';
             event(tr, 'click', checkRow, checkbox, tr);
+            event(tr, 'selectstart', e => e.preventDefault());
           });
+        check(checkbox);
       });
   }
 }());
diff --git a/browsepy/plugin/file_actions/templates/clipboard.file_actions.html b/browsepy/plugin/file_actions/templates/clipboard.file_actions.html
index 61ff153..8cb8033 100644
--- a/browsepy/plugin/file_actions/templates/clipboard.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/clipboard.file_actions.html
@@ -1,4 +1,4 @@
-{% extends "browse.html" %}
+{% extends "base.html" %}
 
 {% block styles %}
   {{ super() }}
@@ -6,6 +6,7 @@
 {% endblock %}
 
 {% block scripts %}
+  {{ super() }}
   <script src="{{ url_for('file_actions.static', filename='script.js') }}"></script>
 {% endblock %}
 
@@ -17,6 +18,7 @@
 {% block content %}
   <form method="post">
     <div class="group">
+      <a class="button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
       {% if cut_support %}
         <input class="button text" type="submit" name="mode-cut" value="Cut selected">
       {% endif %}
@@ -29,10 +31,10 @@
         <thead>
           <tr>
             <th class="select-all-container"></th>
-            {{ th('Name') }}
-            {{ th('Mimetype') }}
-            {{ th('Modified') }}
-            {{ th('Size') }}
+            <th>Name</th>
+            <th>Mimetype</th>
+            <th>Modified</th>
+            <th>Size</th>
           </tr>
         </thead>
         <tbody>
diff --git a/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html b/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
index a9d4b72..4d0a8a2 100644
--- a/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
@@ -1,13 +1,15 @@
 <div class="clipboard">
   <h3>Clipboard ({{ clipboard|length }})</h3>
-  {% if file.can_upload %}
+  <div>
+    {% if file.can_upload %}
+      <a
+          class="button text"
+          href="{{ url_for('file_actions.clipboard_paste', file=file) }}"
+          >Paste</a>
+    {% endif %}
     <a
-        class="button text"
-        href="{{ url_for('file_actions.clipboard_paste', file=file) }}"
-        >Paste</a>
-  {% endif %}
-  <a
-    class="button text"
-    href="{{ url_for('file_actions.clipboard_clear', file=file) }}"
-    >Clear</a>
+      class="button text"
+      href="{{ url_for('file_actions.clipboard_clear', file=file) }}"
+      >Clear</a>
+  </div>
 </div>
\ No newline at end of file
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index e69de29..c29525a 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -0,0 +1,175 @@
+import unittest
+import tempfile
+import shutil
+import os
+import os.path
+
+import bs4
+import flask
+
+from werkzeug.utils import cached_property
+
+import browsepy.plugin.file_actions as file_actions
+import browsepy.manager as browsepy_manager
+import browsepy
+
+
+class Page(object):
+    def __init__(self, source):
+        self.tree = bs4.BeautifulSoup(source, 'html.parser')
+
+    @cached_property
+    def urlpath(self):
+        return self.tree.h1.find('ol', class_='path').get_text().strip()
+
+    @cached_property
+    def action(self):
+        return self.tree.h2.get_text().strip()
+
+    @cached_property
+    def entries(self):
+        rows = self.tree.find('table', class_='browser').find_all('tr')
+        return {
+            r('td')[2].get_text(): r.input['value']
+            for r in rows
+            }
+
+
+class TestIntegration(unittest.TestCase):
+    actions_module = file_actions
+    browsepy_module = browsepy
+    manager_module = browsepy_manager
+
+    def setUp(self):
+        self.base = 'c:\\base' if os.name == 'nt' else '/base'
+        self.app = flask.Flask(self.__class__.__name__)
+        self.app.config.update(
+            directory_base=self.base,
+            exclude_fnc=None,
+            )
+
+    def test_register_plugin(self):
+        self.app.config.update(self.browsepy_module.app.config)
+        self.app.config['plugin_namespaces'] = ('browsepy.plugin',)
+        manager = self.manager_module.PluginManager(self.app)
+        manager.load_plugin('file-actions')
+        self.assertIn(
+            self.actions_module.actions,
+            self.app.blueprints.values()
+            )
+
+    def test_reload(self):
+        self.app.config.update(
+            plugin_modules=[],
+            plugin_namespaces=[]
+            )
+        manager = self.manager_module.PluginManager(self.app)
+        self.assertNotIn(
+            self.actions_module.actions,
+            self.app.blueprints.values()
+            )
+        self.app.config.update(
+            plugin_modules=['file-actions'],
+            plugin_namespaces=['browsepy.plugin']
+            )
+        manager.reload()
+        self.assertIn(
+            self.actions_module.actions,
+            self.app.blueprints.values()
+            )
+
+
+class TestAction(unittest.TestCase):
+    module = file_actions
+
+    def setUp(self):
+        self.base = tempfile.mkdtemp()
+        self.basename = os.path.basename(self.base)
+        self.app = flask.Flask('browsepy')
+        self.app.register_blueprint(self.module.actions)
+        self.app.config.update(
+            directory_base=self.base,
+            directory_upload=self.base,
+            directory_remove=self.base,
+            exclude_fnc=None,
+            use_binary_multiples=True,
+            )
+        self.app.add_url_rule(
+            '/browse/<path:path>',
+            endpoint='browse',
+            view_func=lambda path: None
+            )
+
+    def tearDown(self):
+        shutil.rmtree(self.base)
+
+    def mkdir(self, *path):
+        os.mkdir(os.path.join(self.base, *path))
+
+    def touch(self, *path):
+        open(os.path.join(self.base, *path), 'w').close()
+
+    def assertExist(self, *path):
+        abspath = os.path.join(self.base, *path)
+        self.assertTrue(
+            os.path.exists(abspath),
+            'File %s does not exist.' % abspath
+            )
+
+    def assertNotExist(self, *path):
+        abspath = os.path.join(self.base, *path)
+        self.assertFalse(
+            os.path.exists(abspath),
+            'File %s does exist.' % abspath
+            )
+
+    def test_create_directory(self):
+        with self.app.test_client() as client:
+            response = client.get('/file-actions/create/directory')
+            self.assertEqual(response.status_code, 200)
+            page = Page(response.data)
+            self.assertEqual(page.urlpath, self.basename)
+
+            response = client.post(
+                '/file-actions/create/directory',
+                data={
+                    'name': 'asdf'
+                    })
+            self.assertEqual(response.status_code, 302)
+            self.assertExist('asdf')
+
+    def test_selection(self):
+        self.touch('a')
+        self.touch('b')
+        with self.app.test_client() as client:
+            response = client.get('/file-actions/clipboard')
+            self.assertEqual(response.status_code, 200)
+            page = Page(response.data)
+            self.assertEqual(page.urlpath, self.basename)
+            self.assertIn('a', page.entries)
+            self.assertIn('b', page.entries)
+
+    def test_copy(self):
+        files = ['a', 'b']
+        for p in files:
+            self.touch(p)
+        with self.app.test_client() as client:
+            response = client.post(
+                '/file-actions/clipboard',
+                data={
+                    'path': files,
+                    'mode-cut': 'something',
+                    })
+            self.assertEqual(response.status_code, 302)
+
+            self.mkdir('c')
+            response = client.get(
+                '/file-actions/clipboard/paste/c'
+                )
+            self.assertEqual(response.status_code, 302)
+
+            for p in files:
+                self.assertNotExist(p)
+
+            for p in files:
+                self.assertExist('c', p)
diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index 7be9c1f..a335628 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -60,54 +60,41 @@ a:active {
   color: #666;
 }
 
-ul.main-menu {
-  padding: 0;
+form.autosubmit h3 {
+  font-size: 1em;
+  font-weight: normal;
   margin: 0;
-  list-style: none;
-  display: block;
+  display: none;
 }
-
-ul.main-menu > li {
-  font-size: 1.25em;
-}
-
-form.upload {
-  border: 1px solid #333;
+html.autosubmit-support form.autosubmit h3 {
   display: inline-block;
-  margin: 0 0 1em;
-  padding: 0;
 }
 
-form.upload:after {
-  content: '';
-  clear: both;
-}
-
-form.upload h2 {
-  display: inline-block;
-  padding: 1em 0;
-  margin: 0;
-}
-
-form.upload label {
+form.autosubmit label {
+  border-radius: 0.25em;
   display: inline-block;
-  background: #333;
-  color: white;
-  padding: 0 1.5em;
+  vertical-align: middle;
 }
 
-form.upload label input {
-  margin-right: 0;
+form.autosubmit input{
+  margin: 0;
 }
 
-form.upload input {
-  margin: 0.5em 1em;
+form.autosubmit label input[type=file] {
+  height: 2em;
+  line-height: 2em;
+  width: auto;
+  padding: 0;
+  margin: 0 1px 0 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-html.autosubmit-support form.autosubmit{
-  border: 0;
-  background: transparent;
-  margin-bottom: 0;
+form.autosubmit input[type=submit] {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  vertical-align: middle;
+  margin: 0;
 }
 
 html.autosubmit-support form.autosubmit input{
@@ -159,7 +146,6 @@ table.browser td:nth-child(2) {
 table.browser td:nth-child(2) a {
   display: block;
   line-height: 1.5em;
-  vertical-align: middle;
   margin: -0.5em;
   padding: 0.5em;
 }
@@ -221,46 +207,6 @@ ol.path li *.root:after {
   content: '';
 }
 
-ul.navbar,
-ul.footer {
-  position: absolute;
-  left: 0;
-  right: 0;
-  width: auto;
-  margin: 0;
-  padding: 0 1em;
-  display: block;
-  line-height: 2.5em;
-  background: #333;
-  color: white;
-}
-
-ul.navbar a,
-ul.footer a {
-  color: white;
-  font-weight: bold;
-}
-
-ul.navbar {
-  top: 0;
-}
-
-ul.footer {
-  bottom: 0;
-}
-
-ul.navbar a:hover {
-  color: gray;
-}
-
-ul.navbar > li,
-ul.footer > li {
-  list-style: none;
-  display: inline;
-  margin-right: 10px;
-  width: 100%;
-}
-
 .inode.icon:after,
 .dir.icon:after{
   content: "\e90a";
@@ -334,16 +280,39 @@ a.sorting.numeric.desc.active:after {
 a.button,
 input.button,
 input.entry,
-html.autosubmit-support form.autosubmit label {
+form.autosubmit{
+  margin-right: 0.5em;
   font-size: 1em;
   display: inline-block;
   vertical-align: middle;
   line-height: 1.5em;
   border-radius: 0.25em;
+}
+
+a.button,
+input.button,
+input.entry,
+html.autosubmit-support form.autosubmit label {
   border: 1px solid gray;
   box-shadow: 1px 1px 0 black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black;
 }
 
+header a.button,
+header input.button,
+header form.autosubmit,
+footer a.button,
+footer input.button,
+footer form.autosubmit {
+  margin: 0 0.5em 0.5em 0;
+}
+
+a.button:last-child,
+input.button:last-child,
+input.entry:last-child,
+form.autosubmit:last-child {
+  margin-right: 0;
+}
+
 a.button,
 input.button,
 html.autosubmit-support form.autosubmit label {
@@ -400,20 +369,6 @@ a.button.suggested:active, input.button.suggested:active {
   border-color: #16e;
 }
 
-a.button,
-input.button,
-input.entry,
-html.autosubmit-support form.autosubmit{
-  margin-left: 0.5em;
-}
-
-a.button:first-child,
-input.button:first-child,
-input.entry,
-html.autosubmit-support form.autosubmit:first-child {
-  margin-left: 0;
-}
-
 a.button, input.button {
   width: 1.5em;
   height: 1.5em;
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index bb51540..8c1b18a 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -24,10 +24,10 @@
           action="{{ widget.action or url_for(widget.endpoint, path=file.urlpath) }}"
           enctype="multipart/form-data">
       <label>
-        <h2>{{ widget.text or 'Upload' }}</h2>
+        <h3>{{ widget.text or 'Upload' }}</h3>
         <input class="button text suggested" type="file" name="file[]" multiple=""/>
       </label>
-      <input class="button text" type="submit"/>
+      <input class="button text" type="submit" value="{{ widget.text or 'Upload' }}"/>
     </form>
   {%- elif widget.type == 'html' -%}
     {{ widget.html|safe }}
@@ -85,7 +85,7 @@
 
 {% block content %}
 {% block content_header %}
-<div class="group">{{ draw_widgets(file, 'header') }}</div>
+<header>{{ draw_widgets(file, 'header') }}</header>
 {% endblock %}
 
 {% block content_table %}
@@ -123,6 +123,6 @@
 {% endblock %}
 
 {% block content_footer %}
-{{ draw_widgets(file, 'footer') }}
+<footer>{{ draw_widgets(file, 'footer') }}</footer>
 {% endblock %}
 {% endblock %}
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index df87a0e..b8b1c0a 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -31,19 +31,6 @@ class AppMock(object):
 
 
 class Page(object):
-    @classmethod
-    def itertext(cls, element):
-        '''
-        Compatible element.itertext()
-        '''
-        if element.text:
-            yield element.text
-        for child in element:
-            for text in cls.itertext(child):
-                yield text
-            if child.tail:
-                yield child.tail
-
     def __init__(self, data, response=None):
         self.data = data
         self.response = response
@@ -346,31 +333,31 @@ class TestApp(unittest.TestCase):
         self.assertRaises(
             Page404Exception,
             self.get, 'remove', path='start/testfile.txt'
-        )
+            )
 
         self.assertRaises(
             Page404Exception,
             self.post, 'remove', path='start/testfile.txt'
-        )
+            )
 
         self.app.config['directory_remove'] = None
 
         self.assertRaises(
             Page404Exception,
             self.get, 'remove', path='remove/testfile.txt'
-        )
+            )
 
         self.app.config['directory_remove'] = self.remove
 
         self.assertRaises(
             Page404Exception,
             self.get, 'remove', path='../shall_not_pass.txt'
-        )
+            )
 
         self.assertRaises(
             Page404Exception,
             self.get, 'remove', path='exclude/testfile.txt'
-        )
+            )
 
     def test_download_file(self):
         binfile = os.path.join(self.base, 'testfile.bin')
@@ -386,17 +373,17 @@ class TestApp(unittest.TestCase):
         self.assertRaises(
             Page404Exception,
             self.get, 'download_file', path='../shall_not_pass.txt'
-        )
+            )
 
         self.assertRaises(
             Page404Exception,
             self.get, 'download_file', path='start'
-        )
+            )
 
         self.assertRaises(
             Page404Exception,
             self.get, 'download_file', path='exclude/testfile.txt'
-        )
+            )
 
     def test_download_directory(self):
         binfile = os.path.join(self.start, 'testfile.bin')
@@ -425,26 +412,26 @@ class TestApp(unittest.TestCase):
         self.assertEqual(
             tarball_files('start'),
             ['testfile.%s' % x for x in ('bin', 'exc', 'txt')]
-        )
+            )
 
         self.app.config['exclude_fnc'] = lambda p: p.endswith('.exc')
 
         self.assertEqual(
             tarball_files('start'),
             ['testfile.%s' % x for x in ('bin', 'txt')]
-        )
+            )
 
         self.app.config['exclude_fnc'] = exclude
 
         self.assertRaises(
             Page404Exception,
             self.get, 'download_directory', path='../../shall_not_pass'
-        )
+            )
 
         self.assertRaises(
             Page404Exception,
             self.get, 'download_directory', path='exclude'
-        )
+            )
 
     def test_upload(self):
         def genbytesio(nbytes, encoding):
@@ -454,7 +441,7 @@ class TestApp(unittest.TestCase):
         files = {
             'testfile.txt': genbytesio(127, 'ascii'),
             'testfile.bin': genbytesio(255, 'utf-8'),
-        }
+            }
         output = self.post(
             'upload',
             path='upload',
@@ -483,7 +470,7 @@ class TestApp(unittest.TestCase):
         files = (
             ('testfile.txt', 'something'),
             ('testfile.txt', 'something_new'),
-        )
+            )
         output = self.post(
             'upload',
             path='upload',
@@ -549,13 +536,13 @@ class TestApp(unittest.TestCase):
         self.assertRaises(
             Page404Exception,
             self.get, 'sort', property='text', path='exclude'
-        )
+            )
 
         files = {
             'a.txt': 'aaa',
             'b.png': 'aa',
             'c.zip': 'a'
-        }
+            }
         by_name = [
             self.url_for('open', path=name)
             for name in sorted(files)
@@ -586,7 +573,7 @@ class TestApp(unittest.TestCase):
         self.assertRaises(
             Page302Exception,
             self.get, 'sort', property='text', client=client
-        )
+            )
 
         page = self.get('browse', client=client)
         self.assertListEqual(page.files, by_name)
@@ -640,34 +627,34 @@ class TestApp(unittest.TestCase):
             self.assertIsInstance(
                 self.module.sort(property='name', path='..'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.browse(path='..'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.open_file(path='../something'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.download_file(path='../something'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.download_directory(path='..'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.remove(path='../something'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.upload(path='..'),
                 NotFound
-            )
+                )
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 684020b..17ae866 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -7,6 +7,7 @@ import browsepy.manager
 import browsepy.tests.utils as test_utils
 
 from browsepy.plugin.player.tests import *  # noqa
+from browsepy.plugin.file_actions.tests import *  # noqa
 
 
 class FileMock(object):
diff --git a/setup.cfg b/setup.cfg
index 0de37e5..1305a14 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,4 +5,10 @@ description-file = README.rst
 universal = 1
 
 [egg_info]
-tag_build =
\ No newline at end of file
+tag_build =
+
+[pep8]
+ignore = E123,E126,E121
+
+[yapf]
+align_closing_bracket_with_visual_indent = true
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 2a9db73..c6f2a58 100644
--- a/setup.py
+++ b/setup.py
@@ -84,6 +84,7 @@ setup(
         'browsepy.transform',
         'browsepy.plugin',
         'browsepy.plugin.player',
+        'browsepy.plugin.file_actions',
         ],
     entry_points={
         'console_scripts': (
-- 
GitLab


From 18ea7930116d47e0fe1f1a1bd41c051e6271e565 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 26 Oct 2017 18:59:28 +0200
Subject: [PATCH 006/171] cleanup, tests an fixes

---
 browsepy/__init__.py                          |   3 +-
 browsepy/file.py                              |  47 ++-
 browsepy/manager.py                           |  54 ++-
 browsepy/plugin/file_actions/__init__.py      | 126 +++++--
 .../templates/clipboard.file_actions.html     |  60 ----
 .../widget.clipboard.file_actions.html        |   4 +-
 browsepy/plugin/file_actions/tests.py         | 319 +++++++++++++++++-
 browsepy/plugin/player/tests.py               |  22 +-
 browsepy/static/browse.directory.body.js      |   7 +-
 browsepy/templates/400.html                   |  15 +-
 browsepy/templates/browse.html                |   2 +-
 browsepy/tests/test_file.py                   |  11 +-
 12 files changed, 507 insertions(+), 163 deletions(-)
 delete mode 100644 browsepy/plugin/file_actions/templates/clipboard.file_actions.html

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 6c38673..7572e69 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -243,7 +243,7 @@ def remove(path):
     except OutsideDirectoryBase:
         return NotFound()
 
-    if not file.can_remove or file.is_excluded or not file.parent:
+    if not file.can_remove or file.is_excluded:
         return NotFound()
 
     if request.method == 'GET':
@@ -320,5 +320,4 @@ def page_not_found_error(e):
 @app.errorhandler(500)
 def internal_server_error(e):  # pragma: no cover
     logger.exception(e)
-    print('aaaaaa')
     return getattr(e, 'message', 'Internal server error'), 500
diff --git a/browsepy/file.py b/browsepy/file.py
index 681f4ba..1b3b14c 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -76,8 +76,7 @@ class Node(object):
 
         :returns: True if excluded, False otherwise
         '''
-        exclude = self.app and self.app.config['exclude_fnc']
-        return exclude and exclude(self.path)
+        return self.plugin_manager.check_excluded(self.path)
 
     @cached_property
     def plugin_manager(self):
@@ -268,6 +267,15 @@ class Node(object):
         self.app = current_app if app is None else app
         self.__dict__.update(defaults)  # only for attr and cached_property
 
+    def __repr__(self):
+        '''
+        Get str representation of instance.
+
+        :returns: instance representation
+        :rtype: str
+        '''
+        return '<{0.__class__.__name__}({0.path!r})>'.format(self)
+
     def remove(self):
         '''
         Does nothing except raising if can_remove property returns False.
@@ -628,11 +636,12 @@ class Directory(Node):
         :returns: Response object
         :rtype: flask.Response
         '''
+
         return self.app.response_class(
             TarFileStream(
                 self.path,
                 self.app.config['directory_tar_buffsize'],
-                self.app.config['exclude_fnc'],
+                self.plugin_manager.check_excluded,
                 ),
             mimetype="application/octet-stream"
             )
@@ -691,7 +700,12 @@ class Directory(Node):
         :yields: Directory or File instance for each entry in directory
         :ytype: Node
         '''
-        for entry in scandir(self.path, self.app):
+        directory_class = self.directory_class
+        file_class = self.file_class
+        exclude_fnc = self.plugin_manager.check_excluded
+        for entry in compat.scandir(self.path):
+            if exclude_fnc(entry.path):
+                continue
             kwargs = {
                 'path': entry.path,
                 'app': self.app,
@@ -702,9 +716,9 @@ class Directory(Node):
                 if precomputed_stats and not entry.is_symlink():
                     kwargs['stats'] = entry.stat()
                 if entry.is_dir(follow_symlinks=True):
-                    yield self.directory_class(**kwargs)
+                    yield directory_class(**kwargs)
                 else:
-                    yield self.file_class(**kwargs)
+                    yield file_class(**kwargs)
             except OSError as e:
                 logger.exception(e)
 
@@ -966,24 +980,3 @@ def alternative_filename(filename, attempt=None):
     else:
         extra = u' (%d)' % attempt
     return u'%s%s%s' % (name, extra, ext)
-
-
-def scandir(path, app=None):
-    '''
-    Config-aware scandir. Currently, only aware of ``exclude_fnc``.
-
-    :param path: absolute path
-    :type path: str
-    :param app: flask application
-    :type app: flask.Flask or None
-    :returns: filtered scandir entries
-    :rtype: iterator
-    '''
-    exclude = app and app.config.get('exclude_fnc')
-    if exclude:
-        return (
-            item
-            for item in compat.scandir(path)
-            if not exclude(item.path)
-            )
-    return compat.scandir(path)
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 1ab8caa..74c00c9 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -176,7 +176,7 @@ class BlueprintPluginManager(PluginManagerBase):
         '''
         Register given blueprint on curren app.
 
-        This method is provided for using inside plugin's module-level
+        This method is intended to be used on plugin's module-level
         :func:`register_plugin` functions.
 
         :param blueprint: blueprint object with plugin endpoints
@@ -187,6 +187,49 @@ class BlueprintPluginManager(PluginManagerBase):
             self._blueprint_known.add(blueprint)
 
 
+class ExcludePluginManager(PluginManagerBase):
+    '''
+    Manager for exclude-function registration via :meth:`register_exclude_fnc`
+    calls.
+    '''
+    def __init__(self, app=None):
+        self._exclude_functions = set()
+        super(ExcludePluginManager, self).__init__(app=app)
+
+    def register_exclude_function(self, exclude_fnc):
+        '''
+        Register given exclude-function on curren app.
+
+        This method is intended to be used on plugin's module-level
+        :func:`register_plugin` functions.
+
+        :param blueprint: blueprint object with plugin endpoints
+        :type blueprint: flask.Blueprint
+        '''
+        self._exclude_functions.add(exclude_fnc)
+
+    def check_excluded(self, path):
+        '''
+        Check if given path is excluded.
+        '''
+        exclude_fnc = self.app.config.get('exclude_fnc')
+        if exclude_fnc and exclude_fnc(path):
+            return True
+        for fnc in self._exclude_functions:
+            if fnc(path):
+                return True
+        return False
+
+    def clear(self):
+        '''
+        Clear plugin manager state.
+
+        Registered exclude functions will be disposed.
+        '''
+        self._exclude_functions.clear()
+        super(ExcludePluginManager, self).clear()
+
+
 class WidgetPluginManager(PluginManagerBase):
     '''
     Plugin manager for widget registration.
@@ -680,8 +723,11 @@ class MimetypeActionPluginManager(WidgetPluginManager, MimetypePluginManager):
 
 
 class PluginManager(MimetypeActionPluginManager,
-                    BlueprintPluginManager, WidgetPluginManager,
-                    MimetypePluginManager, ArgumentPluginManager):
+                    BlueprintPluginManager,
+                    ExcludePluginManager,
+                    WidgetPluginManager,
+                    MimetypePluginManager,
+                    ArgumentPluginManager):
     '''
     Main plugin manager
 
@@ -690,6 +736,8 @@ class PluginManager(MimetypeActionPluginManager,
         * Plugin registration via :func:`register_plugin` functions at plugin
           module level.
         * Plugin blueprint registration via :meth:`register_plugin` calls.
+        * Plugin app-level file exclusion via exclude-function registration
+          via :meth:`register_exclude_fnc`.
         * Widget registration via :meth:`register_widget` method.
         * Mimetype function registration via :meth:`register_mimetype_function`
           method.
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 4bbbce8..3ea6df3 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -5,16 +5,20 @@ import os
 import os.path
 import shutil
 
-from flask import Blueprint, render_template, request, redirect, url_for
+from flask import Blueprint, render_template, request, redirect, url_for, \
+                  make_response
 from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
                           current_restricted_chars, common_path_separators
-from browsepy.compat import map, re_escape
+from browsepy.compat import map, re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase, InvalidFilenameError
 
 from .clipboard import Clipboard
+from .exceptions import FileActionsException, ClipboardException, \
+                        InvalidClipboardModeError, InvalidClipboardItemError, \
+                        MissingClipboardItemError
 
 
 __basedir__ = os.path.dirname(os.path.abspath(__file__))
@@ -62,9 +66,9 @@ def create_directory(path):
     return redirect(url_for('browse', path=directory.urlpath))
 
 
-@actions.route('/clipboard', methods=('GET', 'POST'), defaults={'path': ''})
-@actions.route('/clipboard/<path:path>', methods=('GET', 'POST'))
-def clipboard(path):
+@actions.route('/selection', methods=('GET', 'POST'), defaults={'path': ''})
+@actions.route('/selection/<path:path>', methods=('GET', 'POST'))
+def selection(path):
     sort_property = get_cookie_browse_sorting(path, 'text')
     sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
 
@@ -77,16 +81,25 @@ def clipboard(path):
         return NotFound()
 
     if request.method == 'POST':
-        mode = 'cut' if request.form.get('mode-cut') else 'copy'
-        response = redirect(url_for('browse', path=directory.urlpath))
-        clipboard = Clipboard(request.form.getlist('path'), mode)
-        clipboard.to_response(response)
-        return response
+        action_fmt = 'action-{}'.format
+        mode = None
+        for action in ('cut', 'copy'):
+            if request.form.get(action_fmt(action)):
+                mode = action
+                break
+
+        if mode in ('cut', 'copy'):
+            response = redirect(url_for('browse', path=directory.urlpath))
+            clipboard = Clipboard(request.form.getlist('path'), mode)
+            clipboard.to_response(response)
+            return response
+
+        return redirect(request.path)
 
     clipboard = Clipboard.from_request()
     clipboard.mode = 'select'  # disables exclusion
     return render_template(
-        'clipboard.file_actions.html',
+        'selection.file_actions.html',
         file=directory,
         clipboard=clipboard,
         cut_support=any(node.can_remove for node in directory.listdir()),
@@ -99,6 +112,25 @@ def clipboard(path):
 @actions.route('/clipboard/paste', defaults={'path': ''})
 @actions.route('/clipboard/paste/<path:path>')
 def clipboard_paste(path):
+
+    def copy(target, node, join_fnc=os.path.join):
+        dest = join_fnc(
+            target.path,
+            target.choose_filename(node.name)
+            )
+        if node.is_directory:
+            shutil.copytree(node.path, dest)
+        else:
+            shutil.copy2(node.path, dest)
+
+    def cut(target, node, join_fnc=os.path.join):
+        if node.parent.path != target.path:
+            dest = join_fnc(
+                target.path,
+                target.choose_filename(node.name)
+                )
+            shutil.move(node.path, dest)
+
     try:
         directory = Node.from_urlpath(path)
     except OutsideDirectoryBase:
@@ -106,26 +138,45 @@ def clipboard_paste(path):
 
     if (
       not directory.is_directory or
-      directory.is_excluded or
-      not directory.can_upload
+      not directory.can_upload or
+      directory.is_excluded
       ):
         return NotFound()
 
     response = redirect(url_for('browse', path=directory.urlpath))
     clipboard = Clipboard.from_request()
-    print(clipboard)
-    cut = clipboard.mode == 'cut'
+    mode = clipboard.mode
     clipboard.mode = 'paste'  # disables exclusion
 
-    for node in map(Node.from_urlpath, clipboard):
-        if not node.is_excluded:
-            if not cut:
-                if node.is_directory:
-                    shutil.copytree(node.path, directory.path)
-                else:
-                    shutil.copy2(node.path, directory.path)
-            elif node.parent.can_remove:
-                shutil.move(node.path, directory.path)
+    nodes = [node for node in map(Node.from_urlpath, clipboard)]
+
+    if mode == 'cut':
+        paste_fnc = cut
+        for node in nodes:
+            if node.is_excluded or not node.can_remove:
+                raise InvalidClipboardItemError(
+                    path=directory.path,
+                    item=node.urlpath
+                    )
+    elif mode == 'copy':
+        paste_fnc = copy
+        for node in nodes:
+            if node.is_excluded:
+                raise InvalidClipboardItemError(
+                    path=directory.path,
+                    item=node.urlpath
+                    )
+    else:
+        raise InvalidClipboardModeError(path=directory.path, mode=mode)
+
+    for node in nodes:
+        try:
+            paste_fnc(directory, node)
+        except FileNotFoundError:
+            raise MissingClipboardItemError(
+                path=directory.path,
+                item=node.urlpath
+                )
 
     clipboard.clear()
     clipboard.to_response(response)
@@ -142,6 +193,24 @@ def clipboard_clear(path):
     return response
 
 
+@actions.errorhandler(FileActionsException)
+def clipboard_error(e):
+    file = Node(e.path) if hasattr(e, 'path') else None
+    item = Node.from_urlpath(e.item) if hasattr(e, 'item') else None
+    response = make_response((
+        render_template(
+            '400.file_actions.html',
+            error=e, file=file, item=item
+            ),
+        400
+        ))
+    if isinstance(e, ClipboardException):
+        clipboard = Clipboard.from_request()
+        clipboard.clear()
+        clipboard.to_response(response)
+    return response
+
+
 def register_plugin(manager):
     '''
     Register blueprints and actions using given plugin manager.
@@ -161,12 +230,7 @@ def register_plugin(manager):
             base = manager.app.config['directory_base']
             return abspath_to_urlpath(path, base) in clipboard
 
-    excluded = manager.app.config['exclude_fnc']
-    manager.app.config['exclude_fnc'] = (
-        excluded_clipboard
-        if not excluded else
-        lambda path: excluded_clipboard(path) or excluded(path)
-        )
+    manager.register_exclude_function(excluded_clipboard)
     manager.register_blueprint(actions)
     manager.register_widget(
         place='styles',
@@ -185,7 +249,7 @@ def register_plugin(manager):
     manager.register_widget(
         place='header',
         type='button',
-        endpoint='file_actions.clipboard',
+        endpoint='file_actions.selection',
         filter=lambda directory: directory.is_directory,
         text='Selection...',
         )
diff --git a/browsepy/plugin/file_actions/templates/clipboard.file_actions.html b/browsepy/plugin/file_actions/templates/clipboard.file_actions.html
deleted file mode 100644
index 8cb8033..0000000
--- a/browsepy/plugin/file_actions/templates/clipboard.file_actions.html
+++ /dev/null
@@ -1,60 +0,0 @@
-{% extends "base.html" %}
-
-{% block styles %}
-  {{ super() }}
-  <link rel="stylesheet" type="text/css" href="{{ url_for('file_actions.static', filename='style.css') }}"/>
-{% endblock %}
-
-{% block scripts %}
-  {{ super() }}
-  <script src="{{ url_for('file_actions.static', filename='script.js') }}"></script>
-{% endblock %}
-
-{% block header %}
-  <h1>{{ breadcrumbs(file, circular=True) }}</h1>
-  <h2>Selection</h2>
-{% endblock %}
-
-{% block content %}
-  <form method="post">
-    <div class="group">
-      <a class="button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
-      {% if cut_support %}
-        <input class="button text" type="submit" name="mode-cut" value="Cut selected">
-      {% endif %}
-      <input class="button text" type="submit" name="mode-copy" value="Copy selected">
-    </div>
-    {% if file.is_empty %}
-      <p>No files in directory</p>
-    {% else %}
-      <table class="browser">
-        <thead>
-          <tr>
-            <th class="select-all-container"></th>
-            <th>Name</th>
-            <th>Mimetype</th>
-            <th>Modified</th>
-            <th>Size</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for f in file.listdir(sortkey=sort_fnc, reverse=sort_reverse) %}
-            {% if f.link and f.link.text %}
-              <tr>
-                <td>
-                  <input type="checkbox" name="path" value="{{ f.urlpath }}"
-                  {%- if f.urlpath in clipboard %} checked="checked"{% endif -%}
-                  >
-                </td>
-                <td>{{ f.link.text }}</td>
-                <td>{{ f.type or '' }}</td>
-                <td>{{ f.modified or '' }}</td>
-                <td>{{ f.size or '' }}</td>
-              </tr>
-            {% endif %}
-          {% endfor %}
-        </tbody>
-      </table>
-    {% endif %}
-  </form>
-{% endblock %}
diff --git a/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html b/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
index 4d0a8a2..beef281 100644
--- a/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/widget.clipboard.file_actions.html
@@ -4,12 +4,12 @@
     {% if file.can_upload %}
       <a
           class="button text"
-          href="{{ url_for('file_actions.clipboard_paste', file=file) }}"
+          href="{{ url_for('file_actions.clipboard_paste', path=file.urlpath) }}"
           >Paste</a>
     {% endif %}
     <a
       class="button text"
-      href="{{ url_for('file_actions.clipboard_clear', file=file) }}"
+      href="{{ url_for('file_actions.clipboard_clear', path=file.urlpath) }}"
       >Clear</a>
   </div>
 </div>
\ No newline at end of file
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index c29525a..3c58e71 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -3,6 +3,7 @@ import tempfile
 import shutil
 import os
 import os.path
+import functools
 
 import bs4
 import flask
@@ -10,14 +11,45 @@ import flask
 from werkzeug.utils import cached_property
 
 import browsepy.plugin.file_actions as file_actions
+import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
 import browsepy.manager as browsepy_manager
+import browsepy.exceptions as browsepy_exceptions
 import browsepy
 
 
+class CookieProxy(object):
+    def __init__(self, client):
+        self._client = client
+
+    @property
+    def cookies(self):
+        return {
+            cookie.name: cookie.value for cookie in self._client.cookie_jar
+            }
+
+    def set_cookie(self, name, value, **kwargs):
+        return self._client.set_cookie(
+            self._client.environ_base['REMOTE_ADDR'], name, value, **kwargs)
+
+
 class Page(object):
     def __init__(self, source):
         self.tree = bs4.BeautifulSoup(source, 'html.parser')
 
+    @cached_property
+    def widgets(self):
+        header = self.tree.find('header')
+        return [
+            (r.name, r[attr])
+            for (source, attr) in (
+                (header.find_all('a'), 'href'),
+                (header.find_all('link', rel='stylesheet'), 'href'),
+                (header.find_all('script'), 'src'),
+                (header.find_all('form'), 'action'),
+                )
+            for r in source
+            ]
+
     @cached_property
     def urlpath(self):
         return self.tree.h1.find('ol', class_='path').get_text().strip()
@@ -28,17 +60,26 @@ class Page(object):
 
     @cached_property
     def entries(self):
-        rows = self.tree.find('table', class_='browser').find_all('tr')
-        return {
-            r('td')[2].get_text(): r.input['value']
-            for r in rows
+        table = self.tree.find('table', class_='browser')
+        return {} if not table else {
+            r('td')[1].get_text(): r.input['value'] if r.input else r.a['href']
+            for r in table.find('tbody').find_all('tr')
             }
 
+    @cached_property
+    def selected(self):
+        table = self.tree.find('table', class_='browser')
+        return {} if not table else {
+            r('td')[1].get_text(): i['value']
+            for r in table.find('tbody').find_all('tr')
+            for i in r.find_all('input', selected=True)
+            }
 
-class TestIntegration(unittest.TestCase):
+
+class TestRegistration(unittest.TestCase):
     actions_module = file_actions
-    browsepy_module = browsepy
     manager_module = browsepy_manager
+    browsepy_module = browsepy
 
     def setUp(self):
         self.base = 'c:\\base' if os.name == 'nt' else '/base'
@@ -79,8 +120,127 @@ class TestIntegration(unittest.TestCase):
             )
 
 
+class TestIntegration(unittest.TestCase):
+    actions_module = file_actions
+    manager_module = browsepy_manager
+    browsepy_module = browsepy
+    clipboard_module = file_actions_clipboard
+
+    def setUp(self):
+        self.base = tempfile.mkdtemp()
+        self.app = self.browsepy_module.app
+        self.app.config.update(
+            directory_base=self.base,
+            directory_start=self.base,
+            directory_upload=None,
+            exclude_fnc=None,
+            plugin_modules=['file-actions'],
+            plugin_namespaces=[
+                'browsepy.plugin'
+                ]
+            )
+        self.manager = self.app.extensions['plugin_manager']
+        self.manager.reload()
+
+    def tearDown(self):
+        shutil.rmtree(self.base)
+        self.app.config['plugin_modules'] = []
+        self.manager.clear()
+
+    def test_detection(self):
+        with self.app.test_client() as client:
+            response = client.get('/')
+            self.assertEqual(response.status_code, 200)
+
+            url = functools.partial(flask.url_for, path='')
+
+            page = Page(response.data)
+            with self.app.app_context():
+                self.assertIn(
+                    ('a', url('file_actions.selection')),
+                    page.widgets
+                    )
+
+                self.assertNotIn(
+                    ('a', url('file_actions.clipboard_paste')),
+                    page.widgets
+                    )
+
+            proxy = CookieProxy(client)
+            clipboard = self.clipboard_module.Clipboard.from_request(proxy)
+            clipboard.mode = 'copy'
+            clipboard.add('whatever')
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/')
+            self.assertEqual(response.status_code, 200)
+
+            page = Page(response.data)
+            with self.app.app_context():
+                self.assertIn(
+                    ('a', url('file_actions.selection')),
+                    page.widgets
+                    )
+                self.assertNotIn(
+                    ('a', url('file_actions.clipboard_paste')),
+                    page.widgets
+                    )
+                self.assertIn(
+                    ('a', url('file_actions.clipboard_clear')),
+                    page.widgets
+                    )
+
+            self.app.config['directory_upload'] = self.base
+            response = client.get('/')
+            self.assertEqual(response.status_code, 200)
+
+            page = Page(response.data)
+            with self.app.app_context():
+                self.assertIn(
+                    ('a', url('file_actions.selection')),
+                    page.widgets
+                    )
+                self.assertIn(
+                    ('a', url('file_actions.clipboard_paste')),
+                    page.widgets
+                    )
+                self.assertIn(
+                    ('a', url('file_actions.clipboard_clear')),
+                    page.widgets
+                    )
+
+    def test_exclude(self):
+        open(os.path.join(self.base, 'potato'), 'w').close()
+        with self.app.test_client() as client:
+            response = client.get('/')
+            self.assertEqual(response.status_code, 200)
+
+            page = Page(response.data)
+            self.assertIn('potato', page.entries)
+
+            proxy = CookieProxy(client)
+            clipboard = self.clipboard_module.Clipboard.from_request(proxy)
+            clipboard.mode = 'copy'
+            clipboard.add('potato')
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/')
+            self.assertEqual(response.status_code, 200)
+            page = Page(response.data)
+            self.assertIn('potato', page.entries)
+
+            clipboard.mode = 'cut'
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/')
+            self.assertEqual(response.status_code, 200)
+            page = Page(response.data)
+            self.assertNotIn('potato', page.entries)
+
+
 class TestAction(unittest.TestCase):
     module = file_actions
+    clipboard_module = file_actions_clipboard
 
     def setUp(self):
         self.base = tempfile.mkdtemp()
@@ -100,6 +260,10 @@ class TestAction(unittest.TestCase):
             view_func=lambda path: None
             )
 
+        @self.app.errorhandler(browsepy_exceptions.InvalidPathError)
+        def handler(e):
+            return '', 400
+
     def tearDown(self):
         shutil.rmtree(self.base)
 
@@ -138,38 +302,157 @@ class TestAction(unittest.TestCase):
             self.assertEqual(response.status_code, 302)
             self.assertExist('asdf')
 
+            response = client.post(
+                '/file-actions/create/directory/..',
+                data={
+                    'name': 'asdf',
+                    })
+            self.assertEqual(response.status_code, 404)
+
+            response = client.post(
+                '/file-actions/create/directory/nowhere',
+                data={
+                    'name': 'asdf',
+                    })
+            self.assertEqual(response.status_code, 404)
+            response = client.post(
+                '/file-actions/create/directory',
+                data={
+                    'name': '..',
+                    })
+            self.assertEqual(response.status_code, 400)
+
     def test_selection(self):
         self.touch('a')
         self.touch('b')
         with self.app.test_client() as client:
-            response = client.get('/file-actions/clipboard')
+            response = client.get('/file-actions/selection')
             self.assertEqual(response.status_code, 200)
             page = Page(response.data)
             self.assertEqual(page.urlpath, self.basename)
             self.assertIn('a', page.entries)
             self.assertIn('b', page.entries)
 
-    def test_copy(self):
-        files = ['a', 'b']
-        for p in files:
-            self.touch(p)
+            response = client.get('/file-actions/selection/..')
+            self.assertEqual(response.status_code, 404)
+
+            response = client.get('/file-actions/selection/nowhere')
+            self.assertEqual(response.status_code, 404)
+
+    def test_paste(self):
+        files = ['a', 'b', 'c']
+        self.touch('a')
+        self.touch('b')
+        self.mkdir('c')
+        self.mkdir('target')
+
         with self.app.test_client() as client:
             response = client.post(
-                '/file-actions/clipboard',
+                '/file-actions/selection',
                 data={
                     'path': files,
-                    'mode-cut': 'something',
+                    'action-copy': 'whatever',
                     })
             self.assertEqual(response.status_code, 302)
 
-            self.mkdir('c')
-            response = client.get(
-                '/file-actions/clipboard/paste/c'
-                )
+            response = client.get('/file-actions/clipboard/paste/target')
+            self.assertEqual(response.status_code, 302)
+
+            for p in files:
+                self.assertExist(p)
+
+            for p in files:
+                self.assertExist('target', p)
+
+        with self.app.test_client() as client:
+            response = client.post(
+                '/file-actions/selection',
+                data={
+                    'path': files,
+                    'action-cut': 'something',
+                    })
+            self.assertEqual(response.status_code, 302)
+
+            response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 302)
 
             for p in files:
                 self.assertNotExist(p)
 
             for p in files:
-                self.assertExist('c', p)
+                self.assertExist('target', p)
+
+        with self.app.test_client() as client:
+            response = client.get('/file-actions/clipboard/paste/..')
+            self.assertEqual(response.status_code, 404)
+            response = client.get('/file-actions/clipboard/paste/nowhere')
+            self.assertEqual(response.status_code, 404)
+
+        with self.app.test_client() as client:
+            proxy = CookieProxy(client)
+            clipboard = self.clipboard_module.Clipboard.from_request(proxy)
+            clipboard.mode = 'wrong-mode'
+            clipboard.add('whatever')
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/file-actions/clipboard/paste')
+            self.assertEqual(response.status_code, 400)
+
+            clipboard.mode = 'cut'
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/file-actions/clipboard/paste')
+            self.assertEqual(response.status_code, 302)  # same location
+
+            clipboard.mode = 'cut'
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/file-actions/clipboard/paste/target')
+            self.assertEqual(response.status_code, 400)
+
+            clipboard.mode = 'copy'
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/file-actions/clipboard/paste')
+            self.assertEqual(response.status_code, 400)
+
+            clipboard.mode = 'copy'
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/file-actions/clipboard/paste/target')
+            self.assertEqual(response.status_code, 400)
+
+            self.app.config['exclude_fnc'] = lambda n: n.endswith('whatever')
+
+            clipboard.mode = 'cut'
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/file-actions/clipboard/paste')
+            self.assertEqual(response.status_code, 400)
+
+            clipboard.mode = 'copy'
+            clipboard.to_response(proxy, proxy)
+
+            response = client.get('/file-actions/clipboard/paste')
+            self.assertEqual(response.status_code, 400)
+
+    def test_clear(self):
+        files = ['a', 'b']
+        for p in files:
+            self.touch(p)
+
+        with self.app.test_client() as client:
+            response = client.post(
+                '/file-actions/selection',
+                data={
+                    'path': files,
+                    })
+            self.assertEqual(response.status_code, 302)
+
+            response = client.get('/file-actions/clipboard/clear')
+            self.assertEqual(response.status_code, 302)
+
+            response = client.get('/file-actions/selection')
+            self.assertEqual(response.status_code, 200)
+            page = Page(response.data)
+            self.assertFalse(page.selected)
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 605f08f..fca8dc6 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -55,7 +55,7 @@ class TestPlayerBase(unittest.TestCase):
         return self.assertListEqual(
             list(map(os.path.normcase, a)),
             list(map(os.path.normcase, b))
-        )
+            )
 
     def setUp(self):
         self.base = 'c:\\base' if os.name == 'nt' else '/base'
@@ -134,7 +134,7 @@ class TestIntegration(TestIntegrationBase):
         self.app.config.update(
             plugin_modules=['player'],
             plugin_namespaces=['browsepy.plugin']
-        )
+            )
         manager = self.manager_module.PluginManager(self.app)
         manager.load_arguments(self.non_directory_args)
         manager.reload()
@@ -149,7 +149,7 @@ class TestPlayable(TestIntegrationBase):
 
     def setUp(self):
         super(TestPlayable, self).setUp()
-        self.manager = self.manager_module.MimetypePluginManager(
+        self.manager = self.manager_module.PluginManager(
             self.app
             )
         self.manager.register_mimetype_function(
@@ -184,10 +184,10 @@ class TestPlayable(TestIntegrationBase):
 
     def test_playablefile(self):
         exts = {
-         'mp3': 'mp3',
-         'wav': 'wav',
-         'ogg': 'ogg'
-        }
+            'mp3': 'mp3',
+            'wav': 'wav',
+            'ogg': 'ogg'
+            }
         for ext, media_format in exts.items():
             pf = self.module.PlayableFile(path='asdf.%s' % ext, app=self.app)
             self.assertEqual(pf.media_format, media_format)
@@ -291,7 +291,7 @@ class TestBlueprint(TestPlayerBase):
         self.app.config.update(
             directory_base=tempfile.mkdtemp(),
             SERVER_NAME='test'
-        )
+            )
         self.app.register_blueprint(self.module.player)
 
     def tearDown(self):
@@ -351,17 +351,17 @@ class TestBlueprint(TestPlayerBase):
             self.assertIsInstance(
                 self.module.audio(path='..'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.playlist(path='..'),
                 NotFound
-            )
+                )
 
             self.assertIsInstance(
                 self.module.directory(path='..'),
                 NotFound
-            )
+                )
 
 
 def p(*args):
diff --git a/browsepy/static/browse.directory.body.js b/browsepy/static/browse.directory.body.js
index 15e6800..74ad9c5 100644
--- a/browsepy/static/browse.directory.body.js
+++ b/browsepy/static/browse.directory.body.js
@@ -4,12 +4,15 @@
       forms = document.querySelectorAll('html.autosubmit-support form.autosubmit'),
       i = forms.length;
     while (i--) {
-      var files = forms[i].querySelectorAll('input[type=file]');
-      files[0].addEventListener('change', (function(form) {
+      var
+        input = forms[i].querySelectorAll('input[type=file]')[0],
+        label = forms[i].querySelectorAll('label')[0];
+      input.addEventListener('change', (function(form) {
         return function() {
           form.submit();
         };
       }(forms[i])));
+      label.tabIndex = 0;
     }
   }
 }());
diff --git a/browsepy/templates/400.html b/browsepy/templates/400.html
index a9054c3..52119a1 100644
--- a/browsepy/templates/400.html
+++ b/browsepy/templates/400.html
@@ -4,6 +4,15 @@
   <p>The server cannot or will not process the request due to an apparent client error (e.g., malformed request syntax, size too large, invalid request message framing, or deceptive request routing).</p>
   <p>Please try other parameters or contact server administrator.</p>
 {% endset %}
+
+{% set buttons %}
+  {% if file %}
+    <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
+  {% else %}
+    <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
+  {% endif %}
+{% endset %}
+
 {% if error and error.code %}
   {% if error.code == 'invalid-filename-length' or  error.code == 'invalid-path-length'%}
     {% set workaround %}
@@ -45,9 +54,5 @@
 
 {% block content %}
   {{ description }}
-  {% if file %}
-    <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
-  {% else %}
-    <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
-  {% endif %}
+  {{ buttons }}
 {% endblock %}
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index 8c1b18a..4710d6b 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -103,7 +103,7 @@
         </thead>
         <tbody>
             {% for f in file.listdir(sortkey=sort_fnc, reverse=sort_reverse) %}
-                <tr>
+                <tr{% if f.name %} name="row-{{ f.name }}"{% endif %}>
                     {% if f.link %}
                       <td class="icon {{ f.link.icon }}"></td>
                       <td>{{ draw_widget(f, f.link) }}</td>
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index 1032082..368169c 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -39,8 +39,17 @@ class TestFile(unittest.TestCase):
             f.write(text)
         return tmp_txt
 
+    def test_repr(self):
+        self.assertIsInstance(
+            repr(self.module.Node('a')),
+            browsepy.compat.basestring
+            )
+
     def test_iter_listdir(self):
-        directory = self.module.Directory(path=self.workbench)
+        directory = self.module.Directory(
+            path=self.workbench,
+            app=self.app
+            )
 
         tmp_txt = self.textfile('somefile.txt', 'a')
 
-- 
GitLab


From 6cd94b5b1a808eb7feb927ded783f1f8e03c8be6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 28 Oct 2017 14:01:16 +0200
Subject: [PATCH 007/171] raise coverage, update setup

---
 MANIFEST.in                                   |  2 +
 browsepy/plugin/file_actions/__init__.py      |  8 +-
 browsepy/plugin/file_actions/clipboard.py     | 95 +++++++++++--------
 browsepy/plugin/file_actions/exceptions.py    | 90 ++++++++++++++++++
 .../templates/400.file_actions.html           | 65 +++++++++++++
 .../templates/selection.file_actions.html     | 60 ++++++++++++
 browsepy/plugin/file_actions/tests.py         | 68 ++++++++++++-
 setup.py                                      |  4 +
 8 files changed, 346 insertions(+), 46 deletions(-)
 create mode 100644 browsepy/plugin/file_actions/exceptions.py
 create mode 100644 browsepy/plugin/file_actions/templates/400.file_actions.html
 create mode 100644 browsepy/plugin/file_actions/templates/selection.file_actions.html

diff --git a/MANIFEST.in b/MANIFEST.in
index b32f958..0545255 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,3 +3,5 @@ graft browsepy/templates
 graft browsepy/static
 graft browsepy/plugin/player/templates
 graft browsepy/plugin/player/static
+graft browsepy/plugin/file_actions/templates
+graft browsepy/plugin/file_actions/static
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 3ea6df3..4b7bcc7 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -13,12 +13,12 @@ from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
                           current_restricted_chars, common_path_separators
 from browsepy.compat import map, re_escape, FileNotFoundError
-from browsepy.exceptions import OutsideDirectoryBase, InvalidFilenameError
+from browsepy.exceptions import OutsideDirectoryBase
 
 from .clipboard import Clipboard
 from .exceptions import FileActionsException, ClipboardException, \
                         InvalidClipboardModeError, InvalidClipboardItemError, \
-                        MissingClipboardItemError
+                        MissingClipboardItemError, InvalidDirnameError
 
 
 __basedir__ = os.path.dirname(os.path.abspath(__file__))
@@ -56,9 +56,9 @@ def create_directory(path):
 
     basename = request.form['name']
     if secure_filename(basename) != basename or not basename:
-        raise InvalidFilenameError(
+        raise InvalidDirnameError(
             path=directory.path,
-            filename=basename,
+            name=basename,
             )
 
     os.mkdir(os.path.join(directory.path, basename))
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index 5cc123d..4da670c 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -6,25 +6,37 @@ import json
 import base64
 import logging
 import hashlib
+import zlib
 
 from flask import request
 from browsepy.compat import range
 
+from .exceptions import InvalidClipboardSizeError
 
 logger = logging.getLogger(__name__)
 
 
 class Clipboard(set):
+    '''
+    Clipboard (set) with convenience methods to pick its state from request
+    cookies and save it to response cookies.
+    '''
     cookie_secret = os.urandom(256)
-    cookie_sign_name = 'clipboard-signature'
-    cookie_mode_name = 'clipboard-mode'
-    cookie_list_name = 'clipboard-{:x}'
+    cookie_name = 'clipboard-{:x}'
     cookie_path = '/'
     request_cache_field = '_browsepy_file_actions_clipboard_cache'
-    max_pages = 0xffffffff
+    max_pages = 0xffffffff  # 2 ** 32 - 1
 
     @classmethod
     def count(cls, request=request):
+        '''
+        Get how many clipboard items are stores on request cookies.
+
+        :param request: optional request, defaults to current flask request
+        :type request: werkzeug.Request
+        :return: number of clipboard items on request's cookies
+        :rtype: int
+        '''
         return len(cls.from_request(request))
 
     @classmethod
@@ -43,45 +55,35 @@ class Clipboard(set):
             return cached
         self = cls()
         setattr(request, cls.request_cache_field, self)
-        signature = cls._cookiebytes(cls.cookie_sign_name, request)
-        data = cls._read_paginated_cookie(request)
-        mode = cls._cookietext(cls.cookie_mode_name, request)
-        if cls._signature(data, mode) == signature:
-            try:
-                self.update(json.loads(base64.b64decode(data).decode('utf-8')))
-                self.mode = mode
-            except:
-                pass
+        try:
+            self.__setstate__(cls._read_paginated_cookie(request))
+        except:
+            pass
         return self
 
-    @classmethod
-    def _cookiebytes(cls, name, request=request):
-        return request.cookies.get(name, '').encode('ascii')
-
-    @classmethod
-    def _cookietext(cls, name, request=request):
-        return request.cookies.get(name, '')
-
     @classmethod
     def _paginated_cookie_length(cls, page=0):
-        name_fnc = cls.cookie_list_name.format
+        name_fnc = cls.cookie_name.format
         return 3990 - len(name_fnc(page) + cls.cookie_path)
 
     @classmethod
     def _read_paginated_cookie(cls, request=request):
         chunks = []
         if request:
-            name_fnc = cls.cookie_list_name.format
+            name_fnc = cls.cookie_name.format
             for i in range(cls.max_pages):  # 2 ** 32 - 1
                 cookie = request.cookies.get(name_fnc(i), '').encode('ascii')
                 chunks.append(cookie)
                 if len(cookie) < cls._paginated_cookie_length(i):
                     break
-        return b''.join(chunks)
+        serialized = zlib.decompress(base64.b64decode(b''.join(chunks)))
+        return json.loads(serialized.decode('utf-8'))
 
     @classmethod
     def _write_paginated_cookie(cls, data, response):
-        name_fnc = cls.cookie_list_name.format
+        serialized = zlib.compress(json.dumps(data).encode('utf-8'))
+        data = base64.b64encode(serialized)
+        name_fnc = cls.cookie_name.format
         start = 0
         size = len(data)
         for i in range(cls.max_pages):
@@ -90,11 +92,11 @@ class Clipboard(set):
             start = end
             if start > size:  # we need an empty page after start == size
                 return i
-        return 0
+        raise InvalidClipboardSizeError(max_cookies=cls.max_pages)
 
     @classmethod
     def _delete_paginated_cookie(cls, response, start=0, request=request):
-        name_fnc = cls.cookie_list_name.format
+        name_fnc = cls.cookie_name.format
         for i in range(start, cls.max_pages):
             name = name_fnc(i)
             if name not in request.cookies:
@@ -102,23 +104,40 @@ class Clipboard(set):
             response.set_cookie(name, '', expires=0)
 
     @classmethod
-    def _signature(cls, data, method):
-        data = cls.cookie_secret + method.encode('utf-8') + data
-        return base64.b64encode(hashlib.sha512(data).digest())
+    def _signature(cls, items, method):
+        serialized = json.dumps(items).encode('utf-8')
+        data = cls.cookie_secret + method.encode('utf-8') + serialized
+        return base64.b64encode(hashlib.sha512(data).digest()).decode('ascii')
 
     def __init__(self, iterable=(), mode='copy'):
         self.mode = mode
         super(Clipboard, self).__init__(iterable)
 
+    def __getstate__(self):
+        items = list(self)
+        return {
+            'mode': self.mode,
+            'items': items,
+            'signature': self._signature(items, self.mode),
+            }
+
+    def __setstate__(self, data):
+        if data['signature'] == self._signature(data['items'], data['mode']):
+            self.update(data['items'])
+            self.mode = data['mode']
+
     def to_response(self, response, request=request):
+        '''
+        Save clipboard state to response taking care of disposing old clipboard
+        cookies from request.
+
+        :param response: response object to write cookies on
+        :type response: werkzeug.Response
+        :param request: optional request, defaults to current flask request
+        :type request: werkzeug.Request
+        '''
+        start = 0
         if self:
-            data = base64.b64encode(json.dumps(list(self)).encode('utf-8'))
-            signature = self._signature(data, self.mode)
+            data = self.__getstate__()
             start = self._write_paginated_cookie(data, response) + 1
-            response.set_cookie(self.cookie_mode_name, self.mode)
-            response.set_cookie(self.cookie_sign_name, signature)
-        else:
-            start = 0
-            response.set_cookie(self.cookie_mode_name, '', expires=0)
-            response.set_cookie(self.cookie_sign_name, '', expires=0)
         self._delete_paginated_cookie(response, start, request)
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
new file mode 100644
index 0000000..9de3653
--- /dev/null
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -0,0 +1,90 @@
+
+
+class FileActionsException(Exception):
+    '''
+    Base class for file-actions exceptions
+    '''
+    code = None
+    template = 'Unhandled error.'
+
+    def __init__(self, message=None, path=None):
+        self.path = path
+        message = self.template.format(self) if message is None else message
+        super(FileActionsException, self).__init__(message)
+
+
+class InvalidDirnameError(FileActionsException):
+    '''
+    Exception raised when a clipboard item is not valid.
+
+    :property name: name which raised this Exception
+    '''
+    code = 'invalid-dirname'
+    template = 'Clipboard item {0.name!r} is not valid.'
+
+    def __init__(self, message=None, path=None, name=None):
+        self.name = name
+        super(InvalidDirnameError, self).__init__(message, path)
+
+
+class ClipboardException(FileActionsException):
+    '''
+    Base class for clipboard exceptions.
+    '''
+    pass
+
+
+class InvalidClipboardItemError(ClipboardException):
+    '''
+    Exception raised when a clipboard item is not valid.
+
+    :property path: item path which raised this Exception
+    '''
+    code = 'invalid-clipboard-item'
+    template = 'Clipboard item {0.item!r} is not valid.'
+
+    def __init__(self, message=None, path=None, item=None):
+        self.item = item
+        super(InvalidClipboardItemError, self).__init__(message, path)
+
+
+class MissingClipboardItemError(InvalidClipboardItemError):
+    '''
+    Exception raised when a clipboard item is not valid.
+
+    :property path: item path which raised this Exception
+    '''
+    code = 'missing-clipboard-item'
+    template = 'Clipboard item {0.item!r} not found.'
+
+    def __init__(self, message=None, path=None, item=None):
+        self.item = item
+        super(InvalidClipboardItemError, self).__init__(message, path)
+
+
+class InvalidClipboardModeError(ClipboardException):
+    '''
+    Exception raised when a clipboard mode is not valid.
+
+    :property mode: mode which raised this Exception
+    '''
+    code = 'invalid-clipboard-mode'
+    template = 'Clipboard mode {0.path!r} is not valid.'
+
+    def __init__(self, message=None, path=None, mode=None):
+        self.mode = mode
+        super(InvalidClipboardModeError, self).__init__(message, path)
+
+
+class InvalidClipboardSizeError(ClipboardException):
+    '''
+    Exception raised when a clipboard size exceeds cookie limit.
+
+    :property max_cookies: maximum allowed size
+    '''
+    code = 'invalid-clipboard-size'
+    template = 'Clipboard has too many items.'
+
+    def __init__(self, message=None, path=None, max_cookies=0):
+        self.max_cookies = max_cookies
+        super(InvalidClipboardSizeError, self).__init__(message, path)
diff --git a/browsepy/plugin/file_actions/templates/400.file_actions.html b/browsepy/plugin/file_actions/templates/400.file_actions.html
new file mode 100644
index 0000000..70816fc
--- /dev/null
+++ b/browsepy/plugin/file_actions/templates/400.file_actions.html
@@ -0,0 +1,65 @@
+{% extends "base.html" %}
+
+{% set description %}
+  <p>The server cannot or will not process the request due to an apparent client error (e.g., malformed request syntax, size too large, invalid request message framing, or deceptive request routing).</p>
+  <p>Please try other parameters or contact server administrator.</p>
+{% endset %}
+
+{% set buttons %}
+  {% if file %}
+    <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
+  {% else %}
+    <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
+  {% endif %}
+{% endset %}
+
+{% if error and error.code %}
+  {% if error.code.startswith('invalid-clipboard-') %}
+    {% set workaround %}
+      {% if item %}<p>Clipboard item: <span class="path">{{ item.urlpath }}</span></p>{% endif %}
+      <p>Please try again, if this problem persists contact server administrator.</p>
+    {% endset %}
+    {% if error.code == 'invalid-clipboard-item' %}
+      {% set description -%}
+        <h2>A clipboard item is not valid.</h2>
+        <p>File or directory is no longer available for given action.</p>
+        {{ workaround }}
+      {%- endset %}
+    {% elif error.code == 'invalid-clipboard-size' %}
+      {% set description -%}
+        <h2>Clipboard is too big.</h2>
+        <p>Clipboard became too big to be effectively stored in your browser cookies.</p>
+        <p>Please try again with fewer items.</p>
+      {%- endset %}
+    {% elif error.code == 'missing-clipboard-item' %}
+      {% set description -%}
+        <h2>A clipboard item is not found</h2>
+        <p>File or directory has been deleted, renamed or moved other to location.</p>
+        {{ workaround }}
+      {%- endset %}
+    {% else %}
+      {% set description %}
+        <h2>Clipboard state is corrupted.</h2>
+        <p>Saved clipboard state is no longer valid.</p>
+        {{ workaround }}
+      {% endset %}
+    {% endif %}
+  {% elif error.code == 'invalid-dirname' %}
+    {% set description %}
+      <h2>Directory name is not valid.</h2>
+      <p>Given directory name is not valid: incompatible name encoding or reserved name on filesystem.</p>
+      <p>Please try again with other directory name or contact server administrator.</p>
+    {%- endset %}
+  {% endif %}
+{% endif %}
+
+{% block title %}400 Bad Request{% endblock %}
+
+{% block header %}
+  <h1>Bad Request</h1>
+{% endblock %}
+
+{% block content %}
+  {{ description }}
+  {{ buttons }}
+{% endblock %}
diff --git a/browsepy/plugin/file_actions/templates/selection.file_actions.html b/browsepy/plugin/file_actions/templates/selection.file_actions.html
new file mode 100644
index 0000000..646cb7a
--- /dev/null
+++ b/browsepy/plugin/file_actions/templates/selection.file_actions.html
@@ -0,0 +1,60 @@
+{% extends "base.html" %}
+
+{% block styles %}
+  {{ super() }}
+  <link rel="stylesheet" type="text/css" href="{{ url_for('file_actions.static', filename='style.css') }}"/>
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  <script src="{{ url_for('file_actions.static', filename='script.js') }}"></script>
+{% endblock %}
+
+{% block header %}
+  <h1>{{ breadcrumbs(file, circular=True) }}</h1>
+  <h2>Selection</h2>
+{% endblock %}
+
+{% block content %}
+  <form method="post">
+    <div class="group">
+      <a class="button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
+      {% if cut_support %}
+        <input class="button text" type="submit" name="action-cut" value="Cut selected">
+      {% endif %}
+      <input class="button text" type="submit" name="action-copy" value="Copy selected">
+    </div>
+    {% if file.is_empty %}
+      <p>No files in directory</p>
+    {% else %}
+      <table class="browser">
+        <thead>
+          <tr>
+            <th class="select-all-container"></th>
+            <th>Name</th>
+            <th>Mimetype</th>
+            <th>Modified</th>
+            <th>Size</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for f in file.listdir(sortkey=sort_fnc, reverse=sort_reverse) %}
+            {% if f.link and f.link.text %}
+              <tr>
+                <td>
+                  <input type="checkbox" name="path" value="{{ f.urlpath }}"
+                  {%- if f.urlpath in clipboard %} checked="checked"{% endif -%}
+                  >
+                </td>
+                <td>{{ f.link.text }}</td>
+                <td>{{ f.type or '' }}</td>
+                <td>{{ f.modified or '' }}</td>
+                <td>{{ f.size or '' }}</td>
+              </tr>
+            {% endif %}
+          {% endfor %}
+        </tbody>
+      </table>
+    {% endif %}
+  </form>
+{% endblock %}
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 3c58e71..6ed2345 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -3,6 +3,7 @@ import tempfile
 import shutil
 import os
 import os.path
+import sys
 import functools
 
 import bs4
@@ -12,8 +13,10 @@ from werkzeug.utils import cached_property
 
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
+import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
 import browsepy.manager as browsepy_manager
 import browsepy.exceptions as browsepy_exceptions
+import browsepy.compat as compat
 import browsepy
 
 
@@ -32,6 +35,21 @@ class CookieProxy(object):
             self._client.environ_base['REMOTE_ADDR'], name, value, **kwargs)
 
 
+class RequestMock(object):
+    def __init__(self):
+        self.cookies = {}
+
+    def set_cookie(self, name, value, expires=sys.maxsize, **kwargs):
+        if isinstance(value, compat.bytes):
+            value = value.decode('utf-8')
+        if expires:
+            self.cookies[name] = value
+        elif name in self.cookies:
+            del self.cookies[name]
+        field = file_actions_clipboard.Clipboard.request_cache_field
+        setattr(self, field, None)
+
+
 class Page(object):
     def __init__(self, source):
         self.tree = bs4.BeautifulSoup(source, 'html.parser')
@@ -54,10 +72,6 @@ class Page(object):
     def urlpath(self):
         return self.tree.h1.find('ol', class_='path').get_text().strip()
 
-    @cached_property
-    def action(self):
-        return self.tree.h2.get_text().strip()
-
     @cached_property
     def entries(self):
         table = self.tree.find('table', class_='browser')
@@ -456,3 +470,49 @@ class TestAction(unittest.TestCase):
             self.assertEqual(response.status_code, 200)
             page = Page(response.data)
             self.assertFalse(page.selected)
+
+
+class TestClipboard(unittest.TestCase):
+    module = file_actions_clipboard
+
+    def test_count(self):
+        request = RequestMock()
+        self.assertEqual(self.module.Clipboard.count(request), 0)
+
+        clipboard = self.module.Clipboard()
+        clipboard.mode = 'test'
+        clipboard.add('item')
+        clipboard.to_response(request, request)
+
+        self.assertEqual(self.module.Clipboard.count(request), 1)
+
+    def test_oveflow(self):
+        class TinyClipboard(self.module.Clipboard):
+            max_pages = 2
+
+        request = RequestMock()
+        clipboard = TinyClipboard()
+        clipboard.mode = 'test'
+        clipboard.update('item-%04d' % i for i in range(4000))
+
+        self.assertRaises(
+            file_actions_exceptions.InvalidClipboardSizeError,
+            clipboard.to_response,
+            request,
+            request
+            )
+
+    def test_unreadable(self):
+        name = self.module.Clipboard.cookie_name.format(0)
+        request = RequestMock()
+        request.set_cookie(name, 'a')
+        clipboard = self.module.Clipboard.from_request(request)
+        self.assertFalse(clipboard)
+
+    def test_cookie_cleanup(self):
+        name = self.module.Clipboard.cookie_name.format(0)
+        request = RequestMock()
+        request.set_cookie(name, 'value')
+        clipboard = self.module.Clipboard()
+        clipboard.to_response(request, request)
+        self.assertNotIn(name, request.cookies)
diff --git a/setup.py b/setup.py
index c6f2a58..9c7882a 100644
--- a/setup.py
+++ b/setup.py
@@ -101,6 +101,10 @@ setup(
             'templates/*',
             'static/*/*',
             ],
+        'browsepy.plugin.file_actions': [
+            'templates/*',
+            'static/*',
+            ],
         },
     install_requires=(
         ['flask', 'unicategories'] + extra_requires
-- 
GitLab


From ff0f8a548645843bfa74983ad9b3c9d2d8dc828c Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 28 Oct 2017 16:57:24 +0200
Subject: [PATCH 008/171] use lzma for clipboard cookies if available

---
 browsepy/plugin/file_actions/clipboard.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index 4da670c..8051908 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -6,7 +6,22 @@ import json
 import base64
 import logging
 import hashlib
-import zlib
+import functools
+
+try:
+    import lzma
+    LZMA_OPTIONS = {
+        'format': lzma.FORMAT_RAW,
+        'filters': [
+            {'id': lzma.FILTER_DELTA, 'dist': 5},
+            {'id': lzma.FILTER_LZMA2, 'preset': lzma.PRESET_DEFAULT},
+            ]
+        }
+    compress = functools.partial(lzma.compress, **LZMA_OPTIONS)
+    decompress = functools.partial(lzma.decompress, **LZMA_OPTIONS)
+except ImportError:
+    from zlib import compress, decompress
+
 
 from flask import request
 from browsepy.compat import range
@@ -25,7 +40,7 @@ class Clipboard(set):
     cookie_name = 'clipboard-{:x}'
     cookie_path = '/'
     request_cache_field = '_browsepy_file_actions_clipboard_cache'
-    max_pages = 0xffffffff  # 2 ** 32 - 1
+    max_pages = 20
 
     @classmethod
     def count(cls, request=request):
@@ -76,12 +91,12 @@ class Clipboard(set):
                 chunks.append(cookie)
                 if len(cookie) < cls._paginated_cookie_length(i):
                     break
-        serialized = zlib.decompress(base64.b64decode(b''.join(chunks)))
+        serialized = decompress(base64.b64decode(b''.join(chunks)))
         return json.loads(serialized.decode('utf-8'))
 
     @classmethod
     def _write_paginated_cookie(cls, data, response):
-        serialized = zlib.compress(json.dumps(data).encode('utf-8'))
+        serialized = compress(json.dumps(data).encode('utf-8'))
         data = base64.b64encode(serialized)
         name_fnc = cls.cookie_name.format
         start = 0
-- 
GitLab


From be2f57a05c8a026c6b31a66e98437ef40510b7d7 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 28 Oct 2017 21:25:21 +0200
Subject: [PATCH 009/171] harden plugin import attemps, improve compat
 FileNotFoundError

---
 browsepy/compat.py             |  9 ++++++++-
 browsepy/manager.py            | 28 +++++++++++++++++++++++++++-
 browsepy/tests/test_plugins.py |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index ef86525..5ee9f88 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -4,6 +4,7 @@
 import os
 import os.path
 import sys
+import abc
 import itertools
 
 import warnings
@@ -317,7 +318,13 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
 
 
 if PY_LEGACY:
-    FileNotFoundError = OSError  # noqa
+
+    class FileNotFoundError(BaseException):
+        __metaclass__ = abc.ABCMeta
+
+    FileNotFoundError.register(OSError)
+    FileNotFoundError.register(IOError)
+
     range = xrange  # noqa
     filter = itertools.ifilter
     map = itertools.imap
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 74c00c9..fc9ce13 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -96,6 +96,32 @@ class PluginManagerBase(object):
         '''
         pass
 
+    def _expected_import_error(self, error, name):
+        '''
+        Check if error could be expected when importing given module by name.
+
+        :param error: exception
+        :type error: BaseException
+        :param name: module name
+        :type name: str
+        :returns: True if error corresponds to module name, False otherwise
+        :rtype: bool
+        '''
+        if error.args:
+            message = error.args[0]
+            components = (
+                name.split('.')
+                if isinstance(error, ImportError) else
+                (name,)
+                )
+            for finish in range(1, len(components) + 1):
+                for start in range(0, finish):
+                    part = '.'.join(components[start:finish])
+                    for fmt in (' \'%s\'', ' "%s"', ' %s'):
+                        if message.endswith(fmt % part):
+                            return True
+        return False
+
     def import_plugin(self, plugin):
         '''
         Import plugin by given name, looking at :attr:`namespaces`.
@@ -121,7 +147,7 @@ class PluginManagerBase(object):
                 __import__(name)
                 return sys.modules[name]
             except (ImportError, KeyError) as e:
-                if not (e.args and e.args[0].endswith('\'{}\''.format(name))):
+                if not self._expected_import_error(e, name):
                     raise e
 
         raise PluginNotFoundError(
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 17ae866..8f2f3e1 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -85,7 +85,7 @@ class TestPlugins(unittest.TestCase):
         self.assertRaises(
             self.manager_module.InvalidArgumentError,
             self.manager.register_widget
-        )
+            )
 
     def test_namespace_prefix(self):
         self.assertTrue(self.manager.import_plugin(self.plugin_name))
-- 
GitLab


From 6acf28a3a414a90a71310f9c63fe6f5e3af537ff Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 29 Oct 2017 01:09:32 +0200
Subject: [PATCH 010/171] migrate from pep8 to pycodestyle

---
 .travis.yml                               | 2 +-
 Makefile                                  | 4 ++--
 browsepy/plugin/file_actions/clipboard.py | 2 +-
 requirements.txt                          | 2 +-
 setup.cfg                                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d7e50e..126e337 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
 
 install:
   - pip install --upgrade pip
-  - pip install travis-sphinx flake8 pep8 codecov coveralls .
+  - pip install travis-sphinx flake8 pycodestyle codecov coveralls .
   - |
     if [ "$eslint" = "yes" ]; then
       nvm install stable
diff --git a/Makefile b/Makefile
index 21720b0..32ceedb 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@ showdoc: doc
 	xdg-open file://${CURDIR}/doc/.build/html/index.html >> /dev/null
 
 pep8:
-	pep8 --show-source browsepy
-	pep8 --show-source setup.py
+	pycodestyle --show-source browsepy
+	pycodestyle --show-source setup.py
 
 eslint:
 	eslint ${CURDIR}/browsepy
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index 8051908..753174e 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -72,7 +72,7 @@ class Clipboard(set):
         setattr(request, cls.request_cache_field, self)
         try:
             self.__setstate__(cls._read_paginated_cookie(request))
-        except:
+        except BaseException:
             pass
         return self
 
diff --git a/requirements.txt b/requirements.txt
index bbb34a0..5e7f6f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ setuptools
 wheel
 
 # for Makefile tasks (testing, coverage, docs)
-pep8
+pycodestyle
 flake8
 coverage
 pyaml
diff --git a/setup.cfg b/setup.cfg
index 1305a14..58f0ab4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@ universal = 1
 [egg_info]
 tag_build =
 
-[pep8]
+[pycodestyle]
 ignore = E123,E126,E121
 
 [yapf]
-- 
GitLab


From 68b947bbbcafc1e40f84d3832248fa7329e48f89 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 21 Feb 2018 20:16:30 +0100
Subject: [PATCH 011/171] refactor file-actions error handling

---
 browsepy/plugin/file_actions/__init__.py      | 71 ++++++++++---------
 browsepy/plugin/file_actions/clipboard.py     |  9 +++
 browsepy/plugin/file_actions/exceptions.py    | 61 ++++++++++------
 .../templates/400.file_actions.html           | 64 +++++++++--------
 browsepy/plugin/file_actions/tests.py         |  4 ++
 5 files changed, 127 insertions(+), 82 deletions(-)

diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 4b7bcc7..c732ce3 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -4,6 +4,7 @@
 import os
 import os.path
 import shutil
+import logging
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
                   make_response
@@ -16,13 +17,16 @@ from browsepy.compat import map, re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
 
 from .clipboard import Clipboard
-from .exceptions import FileActionsException, ClipboardException, \
-                        InvalidClipboardModeError, InvalidClipboardItemError, \
-                        MissingClipboardItemError, InvalidDirnameError
+from .exceptions import FileActionsException, \
+                        InvalidClipboardModeError, \
+                        InvalidClipboardItemsError, \
+                        InvalidDirnameError
 
 
 __basedir__ = os.path.dirname(os.path.abspath(__file__))
 
+logger = logging.getLogger(__name__)
+
 actions = Blueprint(
     'file_actions',
     __name__,
@@ -30,6 +34,7 @@ actions = Blueprint(
     template_folder=os.path.join(__basedir__, 'templates'),
     static_folder=os.path.join(__basedir__, 'static'),
     )
+
 re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
     re_escape(current_restricted_chars + common_path_separators)
     )
@@ -114,6 +119,8 @@ def selection(path):
 def clipboard_paste(path):
 
     def copy(target, node, join_fnc=os.path.join):
+        if node.is_excluded:
+            raise Exception()
         dest = join_fnc(
             target.path,
             target.choose_filename(node.name)
@@ -124,6 +131,8 @@ def clipboard_paste(path):
             shutil.copy2(node.path, dest)
 
     def cut(target, node, join_fnc=os.path.join):
+        if node.is_excluded or not node.can_remove:
+            raise Exception()
         if node.parent.path != target.path:
             dest = join_fnc(
                 target.path,
@@ -143,42 +152,37 @@ def clipboard_paste(path):
       ):
         return NotFound()
 
-    response = redirect(url_for('browse', path=directory.urlpath))
     clipboard = Clipboard.from_request()
     mode = clipboard.mode
-    clipboard.mode = 'paste'  # disables exclusion
-
-    nodes = [node for node in map(Node.from_urlpath, clipboard)]
 
     if mode == 'cut':
         paste_fnc = cut
-        for node in nodes:
-            if node.is_excluded or not node.can_remove:
-                raise InvalidClipboardItemError(
-                    path=directory.path,
-                    item=node.urlpath
-                    )
     elif mode == 'copy':
         paste_fnc = copy
-        for node in nodes:
-            if node.is_excluded:
-                raise InvalidClipboardItemError(
-                    path=directory.path,
-                    item=node.urlpath
-                    )
     else:
-        raise InvalidClipboardModeError(path=directory.path, mode=mode)
+        raise InvalidClipboardModeError(
+            path=directory.path,
+            clipboard=clipboard,
+            mode=mode
+            )
 
-    for node in nodes:
+    issues = []
+    clipboard.mode = 'paste'  # disables exclusion
+    for node in map(Node.from_urlpath, clipboard):
         try:
             paste_fnc(directory, node)
-        except FileNotFoundError:
-            raise MissingClipboardItemError(
-                path=directory.path,
-                item=node.urlpath
-                )
+        except BaseException as e:
+            issues.append((node, e))
 
-    clipboard.clear()
+    clipboard.mode = mode
+    if issues:
+        raise InvalidClipboardItemsError(
+            path=directory.path,
+            clipboard=clipboard,
+            issues=issues
+            )
+    else:
+        response = redirect(url_for('browse', path=directory.urlpath))
     clipboard.to_response(response)
     return response
 
@@ -196,17 +200,20 @@ def clipboard_clear(path):
 @actions.errorhandler(FileActionsException)
 def clipboard_error(e):
     file = Node(e.path) if hasattr(e, 'path') else None
-    item = Node.from_urlpath(e.item) if hasattr(e, 'item') else None
+    clipboard = getattr(e, 'clipboard', None)
+    issues = getattr(e, 'issues', ())
+
     response = make_response((
         render_template(
             '400.file_actions.html',
-            error=e, file=file, item=item
+            error=e, file=file, clipboard=clipboard, issues=issues,
             ),
         400
         ))
-    if isinstance(e, ClipboardException):
-        clipboard = Clipboard.from_request()
-        clipboard.clear()
+    if clipboard:
+        for issue in issues:
+            if isinstance(issue.error, FileNotFoundError):
+                clipboard.remove(issue.item.urlpath)
         clipboard.to_response(response)
     return response
 
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index 753174e..77d1295 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -156,3 +156,12 @@ class Clipboard(set):
             data = self.__getstate__()
             start = self._write_paginated_cookie(data, response) + 1
         self._delete_paginated_cookie(response, start, request)
+
+    def copy(self):
+        '''
+        Create another instance of this class with same items and mode.
+
+        :returns: clipboard instance
+        :rtype: Clipboard
+        '''
+        return self.___class__(self, mode=self.mode)
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index 9de3653..6f81489 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -15,7 +15,7 @@ class FileActionsException(Exception):
 
 class InvalidDirnameError(FileActionsException):
     '''
-    Exception raised when a clipboard item is not valid.
+    Exception raised when a new directory name is invalid.
 
     :property name: name which raised this Exception
     '''
@@ -30,36 +30,53 @@ class InvalidDirnameError(FileActionsException):
 class ClipboardException(FileActionsException):
     '''
     Base class for clipboard exceptions.
+
+    :property path: item path which raised this Exception
+    :property clipboard: :class Clipboard: instance
     '''
-    pass
+    code = 'invalid-clipboard'
+    template = 'Clipboard is invalid.'
 
+    def __init__(self, message=None, path=None, clipboard=None):
+        self.clipboard = clipboard
+        super(ClipboardException, self).__init__(message, path)
 
-class InvalidClipboardItemError(ClipboardException):
-    '''
-    Exception raised when a clipboard item is not valid.
 
-    :property path: item path which raised this Exception
+class ItemIssue(tuple):
+    '''
+    Item/error issue
     '''
-    code = 'invalid-clipboard-item'
-    template = 'Clipboard item {0.item!r} is not valid.'
+    @property
+    def item(self):
+        return self[0]
 
-    def __init__(self, message=None, path=None, item=None):
-        self.item = item
-        super(InvalidClipboardItemError, self).__init__(message, path)
+    @property
+    def error(self):
+        return self[1]
 
+    @property
+    def code(self):
+        if isinstance(self.error, OSError):
+            return 'oserror-%d' % self.error.errno
 
-class MissingClipboardItemError(InvalidClipboardItemError):
+
+class InvalidClipboardItemsError(ClipboardException):
     '''
     Exception raised when a clipboard item is not valid.
 
     :property path: item path which raised this Exception
     '''
-    code = 'missing-clipboard-item'
-    template = 'Clipboard item {0.item!r} not found.'
+    pair_class = ItemIssue
+    code = 'invalid-clipboard-items'
+    template = 'Clipboard has invalid items.'
+
+    def __init__(self, message=None, path=None, clipboard=None, issues=()):
+        self.issues = list(map(self.pair_class, issues))
+        supa = super(InvalidClipboardItemsError, self)
+        supa.__init__(message, path, clipboard)
 
-    def __init__(self, message=None, path=None, item=None):
-        self.item = item
-        super(InvalidClipboardItemError, self).__init__(message, path)
+    def append(self, item, error):
+        self.issues.append(self.pair_class(item, error))
 
 
 class InvalidClipboardModeError(ClipboardException):
@@ -71,9 +88,10 @@ class InvalidClipboardModeError(ClipboardException):
     code = 'invalid-clipboard-mode'
     template = 'Clipboard mode {0.path!r} is not valid.'
 
-    def __init__(self, message=None, path=None, mode=None):
+    def __init__(self, message=None, path=None, clipboard=None, mode=None):
         self.mode = mode
-        super(InvalidClipboardModeError, self).__init__(message, path)
+        supa = super(InvalidClipboardModeError, self)
+        supa.__init__(message, path, clipboard)
 
 
 class InvalidClipboardSizeError(ClipboardException):
@@ -85,6 +103,7 @@ class InvalidClipboardSizeError(ClipboardException):
     code = 'invalid-clipboard-size'
     template = 'Clipboard has too many items.'
 
-    def __init__(self, message=None, path=None, max_cookies=0):
+    def __init__(self, message=None, path=None, clipboard=None, max_cookies=0):
         self.max_cookies = max_cookies
-        super(InvalidClipboardSizeError, self).__init__(message, path)
+        supa = super(InvalidClipboardSizeError, self)
+        supa.__init__(message, path, clipboard)
diff --git a/browsepy/plugin/file_actions/templates/400.file_actions.html b/browsepy/plugin/file_actions/templates/400.file_actions.html
index 70816fc..1e185c1 100644
--- a/browsepy/plugin/file_actions/templates/400.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/400.file_actions.html
@@ -13,43 +13,49 @@
   {% endif %}
 {% endset %}
 
-{% if error and error.code %}
-  {% if error.code.startswith('invalid-clipboard-') %}
-    {% set workaround %}
-      {% if item %}<p>Clipboard item: <span class="path">{{ item.urlpath }}</span></p>{% endif %}
-      <p>Please try again, if this problem persists contact server administrator.</p>
-    {% endset %}
-    {% if error.code == 'invalid-clipboard-item' %}
-      {% set description -%}
-        <h2>A clipboard item is not valid.</h2>
-        <p>File or directory is no longer available for given action.</p>
-        {{ workaround }}
-      {%- endset %}
-    {% elif error.code == 'invalid-clipboard-size' %}
-      {% set description -%}
-        <h2>Clipboard is too big.</h2>
-        <p>Clipboard became too big to be effectively stored in your browser cookies.</p>
-        <p>Please try again with fewer items.</p>
-      {%- endset %}
-    {% elif error.code == 'missing-clipboard-item' %}
-      {% set description -%}
-        <h2>A clipboard item is not found</h2>
-        <p>File or directory has been deleted, renamed or moved other to location.</p>
-        {{ workaround }}
-      {%- endset %}
+{% set messages %}
+  {% for issue in issues %}
+    {% if issue.error.code == 'oserror-2' %}
+      <p>{{ issue.item.name }} is no longer on source directory.</p>
     {% else %}
-      {% set description %}
-        <h2>Clipboard state is corrupted.</h2>
-        <p>Saved clipboard state is no longer valid.</p>
-        {{ workaround }}
-      {% endset %}
+      <p>{{ issue.item.name }} {{ issue.error }}</p>
     {% endif %}
+  {% endfor %}
+{% endset %}
+
+{% if error and error.code %}
+  {% set workaround %}
+    {% if item %}<p>Clipboard item: <span class="path">{{ item.urlpath }}</span></p>{% endif %}
+    <p>Please try again, if this problem persists contact server administrator.</p>
+  {% endset %}
+  {% if error.code == 'invalid-clipboard-items' %}
+    {% set description -%}
+      {% if issues.length == 1 -%}
+        <h2>A clipboard item is not valid.</h2>
+      {%- else -%}
+        <h2>Some clipboard items are invalid.</h2>
+      {%- endif %}
+      {{ messages }}
+      {{ workaround }}
+    {%- endset %}
+  {% elif error.code == 'invalid-clipboard-size' %}
+    {% set description -%}
+      <h2>Clipboard is too big.</h2>
+      <p>Clipboard became too big to be effectively stored in your browser cookies.</p>
+      <p>Please try again with fewer items.</p>
+    {%- endset %}
   {% elif error.code == 'invalid-dirname' %}
     {% set description %}
       <h2>Directory name is not valid.</h2>
       <p>Given directory name is not valid: incompatible name encoding or reserved name on filesystem.</p>
       <p>Please try again with other directory name or contact server administrator.</p>
     {%- endset %}
+  {% else %}
+    {% set description %}
+      <h2>Clipboard state is corrupted.</h2>
+      <p>Saved clipboard state is no longer valid.</p>
+      {{ workaround }}
+    {% endset %}
   {% endif %}
 {% endif %}
 
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 6ed2345..2bb7743 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -31,6 +31,10 @@ class CookieProxy(object):
             }
 
     def set_cookie(self, name, value, **kwargs):
+        for cookie in self._client.cookie_jar:
+            if cookie.name == name:
+                self._client.cookie_jar.clear(
+                    cookie.domain, cookie.path, cookie.name)
         return self._client.set_cookie(
             self._client.environ_base['REMOTE_ADDR'], name, value, **kwargs)
 
-- 
GitLab


From 67012eb60b1df963a17da0e64e52fd81f8cd13f4 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 21 Feb 2018 20:49:22 +0100
Subject: [PATCH 012/171] update travis-sphinx call (due breaking change)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 32ceedb..3c5b529 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ showcoverage: coverage
 travis-script: pep8 flake8 coverage
 
 travis-script-sphinx:
-	travis-sphinx --nowarn --source=doc build
+	travis-sphinx build --nowarn --source doc
 
 travis-success:
 	codecov
-- 
GitLab


From 3d652153da30b1ec06bb8d7b9d09304e60fe18a9 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 22 Feb 2018 19:12:03 +0100
Subject: [PATCH 013/171] simplify OSError handling on paste

---
 browsepy/plugin/file_actions/__init__.py      |  5 ++-
 browsepy/plugin/file_actions/clipboard.py     |  9 -----
 browsepy/plugin/file_actions/exceptions.py    | 19 ++++++++---
 browsepy/plugin/file_actions/static/style.css |  4 +++
 .../templates/400.file_actions.html           |  6 +---
 browsepy/plugin/file_actions/tests.py         | 34 +++++++++++++++++++
 6 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index c732ce3..fd8f9b2 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -66,7 +66,10 @@ def create_directory(path):
             name=basename,
             )
 
-    os.mkdir(os.path.join(directory.path, basename))
+    try:
+        os.mkdir(os.path.join(directory.path, basename))
+    except OSError:
+        raise FileActionsException(path=directory.path)
 
     return redirect(url_for('browse', path=directory.urlpath))
 
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index 77d1295..753174e 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -156,12 +156,3 @@ class Clipboard(set):
             data = self.__getstate__()
             start = self._write_paginated_cookie(data, response) + 1
         self._delete_paginated_cookie(response, start, request)
-
-    def copy(self):
-        '''
-        Create another instance of this class with same items and mode.
-
-        :returns: clipboard instance
-        :rtype: Clipboard
-        '''
-        return self.___class__(self, mode=self.mode)
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index 6f81489..9166298 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -1,3 +1,5 @@
+import os
+import errno
 
 
 class FileActionsException(Exception):
@@ -55,9 +57,18 @@ class ItemIssue(tuple):
         return self[1]
 
     @property
-    def code(self):
-        if isinstance(self.error, OSError):
-            return 'oserror-%d' % self.error.errno
+    def message(self):
+        if isinstance(self.error, OSError) and \
+          self.error.errno in errno.errorcode:
+            return '%s (%s)' % (
+                os.strerror(self.error.errno),
+                errno.errorcode[self.error.errno]
+                )
+
+        # ensure full path is never returned
+        text = str(self.error)
+        text = text.replace(self.item.path, self.item.name)
+        return text
 
 
 class InvalidClipboardItemsError(ClipboardException):
@@ -76,7 +87,7 @@ class InvalidClipboardItemsError(ClipboardException):
         supa.__init__(message, path, clipboard)
 
     def append(self, item, error):
-        self.issues.append(self.pair_class(item, error))
+        self.issues.append(self.pair_class((item, error)))
 
 
 class InvalidClipboardModeError(ClipboardException):
diff --git a/browsepy/plugin/file_actions/static/style.css b/browsepy/plugin/file_actions/static/style.css
index cb7ddfb..6260294 100644
--- a/browsepy/plugin/file_actions/static/style.css
+++ b/browsepy/plugin/file_actions/static/style.css
@@ -55,3 +55,7 @@ tr.clickable:hover {
 tr.clickable:hover > td{
   background-color: #ddd;
 }
+.issue-name {
+  font-weight: bold;
+  font-family: monospace;
+}
\ No newline at end of file
diff --git a/browsepy/plugin/file_actions/templates/400.file_actions.html b/browsepy/plugin/file_actions/templates/400.file_actions.html
index 1e185c1..9401533 100644
--- a/browsepy/plugin/file_actions/templates/400.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/400.file_actions.html
@@ -15,11 +15,7 @@
 
 {% set messages %}
   {% for issue in issues %}
-    {% if issue.error.code == 'oserror-2' %}
-      <p>{{ issue.item.name }} is no longer on source directory.</p>
-    {% else %}
-      <p>{{ issue.item.name }} {{ issue.error }}</p>
-    {% endif %}
+     <p><span class="issue-name">{{ issue.item.name }}</span>: {{ issue.message }}</p>
   {% endfor %}
 {% endset %}
 
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 2bb7743..82eb014 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -14,6 +14,7 @@ from werkzeug.utils import cached_property
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
 import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
+import browsepy.file as browsepy_file
 import browsepy.manager as browsepy_manager
 import browsepy.exceptions as browsepy_exceptions
 import browsepy.compat as compat
@@ -320,6 +321,13 @@ class TestAction(unittest.TestCase):
             self.assertEqual(response.status_code, 302)
             self.assertExist('asdf')
 
+            response = client.post(
+                '/file-actions/create/directory',
+                data={
+                    'name': 'asdf'
+                    })
+            self.assertEqual(response.status_code, 400)  # already exists
+
             response = client.post(
                 '/file-actions/create/directory/..',
                 data={
@@ -520,3 +528,29 @@ class TestClipboard(unittest.TestCase):
         clipboard = self.module.Clipboard()
         clipboard.to_response(request, request)
         self.assertNotIn(name, request.cookies)
+
+
+class TestException(unittest.TestCase):
+    module = file_actions_exceptions
+    clipboard_class = file_actions_clipboard.Clipboard
+    node_class = browsepy_file.Node
+
+    def test_invalid_clipboard_items_error(self):
+        clipboard = self.clipboard_class((
+            'asdf',
+            ))
+        pair = (
+            self.node_class('/base/asdf'),
+            Exception('Uncaught exception /base/asdf'),
+            )
+        e = self.module.InvalidClipboardItemsError(
+            path='/',
+            clipboard=clipboard,
+            issues=[pair]
+            )
+        e.append(
+            self.node_class('/base/other'),
+            OSError(2, 'Not found with random message'),
+            )
+        self.assertIn('Uncaught exception asdf', e.issues[0].message)
+        self.assertIn('No such file or directory', e.issues[1].message)
-- 
GitLab


From c6a1d5002507eb01c55c295390a937e37faf428b Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 23 Feb 2018 14:14:33 +0100
Subject: [PATCH 014/171] refactor file-actions exception handling, clear after
 cut paste

---
 browsepy/plugin/file_actions/__init__.py      | 18 ++--
 browsepy/plugin/file_actions/exceptions.py    | 41 +++++++--
 .../templates/400.file_actions.html           | 83 +++++++++++--------
 3 files changed, 95 insertions(+), 47 deletions(-)

diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index fd8f9b2..9d283da 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -20,7 +20,8 @@ from .clipboard import Clipboard
 from .exceptions import FileActionsException, \
                         InvalidClipboardModeError, \
                         InvalidClipboardItemsError, \
-                        InvalidDirnameError
+                        InvalidDirnameError, \
+                        DirectoryCreationError
 
 
 __basedir__ = os.path.dirname(os.path.abspath(__file__))
@@ -68,8 +69,12 @@ def create_directory(path):
 
     try:
         os.mkdir(os.path.join(directory.path, basename))
-    except OSError:
-        raise FileActionsException(path=directory.path)
+    except OSError as e:
+        raise DirectoryCreationError.from_exception(
+            e,
+            path=directory.path,
+            name=basename
+            )
 
     return redirect(url_for('browse', path=directory.urlpath))
 
@@ -184,8 +189,11 @@ def clipboard_paste(path):
             clipboard=clipboard,
             issues=issues
             )
-    else:
-        response = redirect(url_for('browse', path=directory.urlpath))
+
+    if mode == 'cut':
+        clipboard.clear()
+
+    response = redirect(url_for('browse', path=directory.urlpath))
     clipboard.to_response(response)
     return response
 
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index 9166298..35dd68e 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -21,7 +21,7 @@ class InvalidDirnameError(FileActionsException):
 
     :property name: name which raised this Exception
     '''
-    code = 'invalid-dirname'
+    code = 'directory-invalid-name'
     template = 'Clipboard item {0.name!r} is not valid.'
 
     def __init__(self, message=None, path=None, name=None):
@@ -29,6 +29,34 @@ class InvalidDirnameError(FileActionsException):
         super(InvalidDirnameError, self).__init__(message, path)
 
 
+class DirectoryCreationError(FileActionsException):
+    '''
+    Exception raised when a new directory creation fails.
+
+    :property name: name which raised this Exception
+    '''
+    code = 'directory-mkdir-error'
+    template = 'Clipboard item {0.name!r} is not valid.'
+
+    def __init__(self, message=None, path=None, name=None):
+        self.name = name
+        super(DirectoryCreationError, self).__init__(message, path)
+
+    @property
+    def message(self):
+        return self.args[0]
+
+    @classmethod
+    def from_exception(cls, exception, *args, **kwargs):
+        message = None
+        if isinstance(exception, OSError):
+            message = '%s (%s)' % (
+                os.strerror(exception.errno),
+                errno.errorcode[exception.errno]
+                )
+        return cls(message, *args, **kwargs)
+
+
 class ClipboardException(FileActionsException):
     '''
     Base class for clipboard exceptions.
@@ -36,7 +64,7 @@ class ClipboardException(FileActionsException):
     :property path: item path which raised this Exception
     :property clipboard: :class Clipboard: instance
     '''
-    code = 'invalid-clipboard'
+    code = 'clipboard-invalid'
     template = 'Clipboard is invalid.'
 
     def __init__(self, message=None, path=None, clipboard=None):
@@ -58,8 +86,7 @@ class ItemIssue(tuple):
 
     @property
     def message(self):
-        if isinstance(self.error, OSError) and \
-          self.error.errno in errno.errorcode:
+        if isinstance(self.error, OSError):
             return '%s (%s)' % (
                 os.strerror(self.error.errno),
                 errno.errorcode[self.error.errno]
@@ -78,7 +105,7 @@ class InvalidClipboardItemsError(ClipboardException):
     :property path: item path which raised this Exception
     '''
     pair_class = ItemIssue
-    code = 'invalid-clipboard-items'
+    code = 'clipboard-invalid-items'
     template = 'Clipboard has invalid items.'
 
     def __init__(self, message=None, path=None, clipboard=None, issues=()):
@@ -96,7 +123,7 @@ class InvalidClipboardModeError(ClipboardException):
 
     :property mode: mode which raised this Exception
     '''
-    code = 'invalid-clipboard-mode'
+    code = 'clipboard-invalid-mode'
     template = 'Clipboard mode {0.path!r} is not valid.'
 
     def __init__(self, message=None, path=None, clipboard=None, mode=None):
@@ -111,7 +138,7 @@ class InvalidClipboardSizeError(ClipboardException):
 
     :property max_cookies: maximum allowed size
     '''
-    code = 'invalid-clipboard-size'
+    code = 'clipboard-invalid-size'
     template = 'Clipboard has too many items.'
 
     def __init__(self, message=None, path=None, clipboard=None, max_cookies=0):
diff --git a/browsepy/plugin/file_actions/templates/400.file_actions.html b/browsepy/plugin/file_actions/templates/400.file_actions.html
index 9401533..9ac9b30 100644
--- a/browsepy/plugin/file_actions/templates/400.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/400.file_actions.html
@@ -1,10 +1,5 @@
 {% extends "base.html" %}
 
-{% set description %}
-  <p>The server cannot or will not process the request due to an apparent client error (e.g., malformed request syntax, size too large, invalid request message framing, or deceptive request routing).</p>
-  <p>Please try other parameters or contact server administrator.</p>
-{% endset %}
-
 {% set buttons %}
   {% if file %}
     <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
@@ -20,39 +15,57 @@
 {% endset %}
 
 {% if error and error.code %}
-  {% set workaround %}
-    {% if item %}<p>Clipboard item: <span class="path">{{ item.urlpath }}</span></p>{% endif %}
-    <p>Please try again, if this problem persists contact server administrator.</p>
-  {% endset %}
-  {% if error.code == 'invalid-clipboard-items' %}
-    {% set description -%}
-      {% if issues.length == 1 -%}
-        <h2>A clipboard item is not valid.</h2>
-      {%- else -%}
-        <h2>Some clipboard items are invalid.</h2>
-      {%- endif %}
-      {{ messages }}
-      {{ workaround }}
-    {%- endset %}
-  {% elif error.code == 'invalid-clipboard-size' %}
-    {% set description -%}
-      <h2>Clipboard is too big.</h2>
-      <p>Clipboard became too big to be effectively stored in your browser cookies.</p>
-      <p>Please try again with fewer items.</p>
-    {%- endset %}
-  {% elif error.code == 'invalid-dirname' %}
-    {% set description %}
-      <h2>Directory name is not valid.</h2>
-      <p>Given directory name is not valid: incompatible name encoding or reserved name on filesystem.</p>
+  {% if error.code.startswith('directory-') %}
+    {% set workaround %}
       <p>Please try again with other directory name or contact server administrator.</p>
-    {%- endset %}
-  {% else %}
-    {% set description %}
-      <h2>Clipboard state is corrupted.</h2>
-      <p>Saved clipboard state is no longer valid.</p>
-      {{ workaround }}
     {% endset %}
+    {% if error.code == 'directory-invalid-name' %}
+      {% set description %}
+        <h2>Directory name is not valid</h2>
+        <p>Given directory name is not valid: incompatible name encoding or reserved name on filesystem.</p>
+        {{ workaround }}
+      {%- endset %}
+    {% elif error.code == 'directory-mkdir-error' %}
+      {% set description %}
+        <h2>Directory creation failed</h2>
+        <p>{{ error.message }}.</p>
+        {{ workaround }}
+      {%- endset %}
+    {% endif %}
+  {% elif error.code.startswith('clipboard-') %}
+    {% set workaround %}
+      <p>Please try again, if this problem persists contact server administrator.</p>
+    {% endset %}
+    {% if error.code == 'clipboard-invalid-items' %}
+      {% set description -%}
+        {% if issues.length == 1 -%}
+          <h2>A clipboard item is not valid</h2>
+        {%- else -%}
+          <h2>Some clipboard items are not valid</h2>
+        {%- endif %}
+        {{ messages }}
+        {{ workaround }}
+      {%- endset %}
+    {% elif error.code == 'clipboard-invalid-size' %}
+      {% set description -%}
+        <h2>Clipboard size limit exceeded</h2>
+        <p>Clipboard became too big to be effectively stored in your browser cookies.</p>
+        <p>Please try again with fewer items.</p>
+      {%- endset %}
+    {% else %}
+      {% set description %}
+        <h2>Clipboard state is corrupted</h2>
+        <p>Saved clipboard state is no longer valid.</p>
+        {{ workaround }}
+      {% endset %}
+    {% endif %}
   {% endif %}
+{% else %}
+  {% set description %}
+    <h2>Unexpected error</h2>
+    <p>Operation failed due an unexpected error.</p>
+    <p>Please contact server administrator.</p>
+  {% endset %}
 {% endif %}
 
 {% block title %}400 Bad Request{% endblock %}
-- 
GitLab


From 3503b9e0f070faa5c781b3f1123f3bb6d1b70fd9 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 23 Feb 2018 14:35:05 +0100
Subject: [PATCH 015/171] make paste to raise artificial OSError exceptions

---
 browsepy/plugin/file_actions/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 9d283da..f318869 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -128,7 +128,7 @@ def clipboard_paste(path):
 
     def copy(target, node, join_fnc=os.path.join):
         if node.is_excluded:
-            raise Exception()
+            raise OSError(2, os.strerror(2))
         dest = join_fnc(
             target.path,
             target.choose_filename(node.name)
@@ -140,7 +140,8 @@ def clipboard_paste(path):
 
     def cut(target, node, join_fnc=os.path.join):
         if node.is_excluded or not node.can_remove:
-            raise Exception()
+            code = 2 if node.is_excluded else 1
+            raise OSError(code, os.strerror(code))
         if node.parent.path != target.path:
             dest = join_fnc(
                 target.path,
-- 
GitLab


From 925240a82d1db790a117ff746eb08b9c604c0dfa Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 13 Mar 2018 16:21:54 +0100
Subject: [PATCH 016/171] drop travis-sphinx

---
 .travis.yml                  | 17 +++++++++--------
 Makefile                     | 13 +------------
 requirements.txt             | 21 ++-------------------
 requirements/base.txt        |  2 ++
 requirements/compat.txt      |  5 +++++
 requirements/development.txt | 12 ++++++++++++
 6 files changed, 31 insertions(+), 39 deletions(-)
 create mode 100644 requirements/base.txt
 create mode 100644 requirements/compat.txt
 create mode 100644 requirements/development.txt

diff --git a/.travis.yml b/.travis.yml
index 2d7e50e..766c851 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,7 @@ matrix:
   include:
   - python: "2.7"
   - python: "pypy"
-  # pypy3 disabled until fixed
-  #- python: "pypy3"
+  - python: "pypy3"
   - python: "3.3"
   - python: "3.4"
   - python: "3.5"
@@ -20,7 +19,7 @@ matrix:
 
 install:
   - pip install --upgrade pip
-  - pip install travis-sphinx flake8 pep8 codecov coveralls .
+  - pip install ghp-import sphinx flake8 pep8 codecov coveralls .
   - |
     if [ "$eslint" = "yes" ]; then
       nvm install stable
@@ -30,21 +29,23 @@ install:
     fi
 
 script:
-  - make travis-script
+  - make pep8 flake8 coverage
   - |
     if [ "$eslint" = "yes" ]; then
       make eslint
     fi
   - |
     if [ "$sphinx" = "yes" ]; then
-      make travis-script-sphinx
+      make doc
     fi
 
 after_success:
-  - make travis-success
+  - codecov
+  - coveralls
   - |
-    if [ "$sphinx" = "yes" ]; then
-      make travis-success-sphinx
+    if [ "$sphinx" = "yes" ] && [ "$TRAVIS_BRANCH" = "master" ] && 
+[ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+      ghp-import --push --force --no-jekyll --branch=gh-pages --remote="https://${GH_TOKEN}@github.com${TRAVIS_REPO_SLUG}.git doc/.build/html"
     fi
 
 notifications:
diff --git a/Makefile b/Makefile
index 2b90dcf..9994329 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: doc clean pep8 coverage travis
 
 test: pep8 flake8 eslint
-	python -c 'import yaml;yaml.load(open(".travis.yml").read())'
+	python -c 'import yaml, glob;[yaml.load(open(p)) for p in glob.glob(".*.yml")]'
 ifdef debug
 	python setup.py test --debug=$(debug)
 else
@@ -55,14 +55,3 @@ showcoverage: coverage
 	coverage html
 	xdg-open file://${CURDIR}/htmlcov/index.html >> /dev/null
 
-travis-script: pep8 flake8 coverage
-
-travis-script-sphinx:
-	travis-sphinx --nowarn --source=doc build
-
-travis-success:
-	codecov
-	coveralls
-
-travis-success-sphinx:
-	travis-sphinx deploy
diff --git a/requirements.txt b/requirements.txt
index bbb34a0..79239b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,2 @@
-flask
-unicategories
-
-# for python < 3.6
-scandir
-
-# for python < 3.3
-backports.shutil_get_terminal_size
-
-# for building
-setuptools
-wheel
-
-# for Makefile tasks (testing, coverage, docs)
-pep8
-flake8
-coverage
-pyaml
-sphinx
+-r requirements/compat.txt
+-r requirements/development.txt
diff --git a/requirements/base.txt b/requirements/base.txt
new file mode 100644
index 0000000..af7a758
--- /dev/null
+++ b/requirements/base.txt
@@ -0,0 +1,2 @@
+flask
+unicategories
diff --git a/requirements/compat.txt b/requirements/compat.txt
new file mode 100644
index 0000000..e070c36
--- /dev/null
+++ b/requirements/compat.txt
@@ -0,0 +1,5 @@
+# for python < 3.6
+scandir
+
+# for python < 3.3
+backports.shutil_get_terminal_size
diff --git a/requirements/development.txt b/requirements/development.txt
new file mode 100644
index 0000000..fb9f680
--- /dev/null
+++ b/requirements/development.txt
@@ -0,0 +1,12 @@
+-r base.txt
+
+# for building
+setuptools
+wheel
+
+# for Makefile tasks (testing, coverage, docs)
+pep8
+flake8
+coverage
+pyaml
+sphinx
-- 
GitLab


From 8952f748198fac11a6ac5e8afd44bf96f8c91cfc Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 5 Apr 2018 23:55:13 +0200
Subject: [PATCH 017/171] simplify tarfilestream usin queue

---
 .gitignore         |  45 ++++-----
 browsepy/compat.py |  55 +++++++++++
 browsepy/stream.py | 233 +++++++++++++++++++++++++++------------------
 3 files changed, 219 insertions(+), 114 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9eacdc..bf44bca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,25 @@
-.git/*
-.c9/*
-.idea/*
-.vscode/*
+.git
+.c9
+.idea
+.vscode
 .coverage
-htmlcov/*
-dist/*
-build/*
-doc/.build/*
-env/*
-env2/*
-env3/*
-wenv2/*
-wenv3/*
-node_modules/*
-.eggs/*
-browsepy.build/*
-browsepy.egg-info/*
-**/__pycache__/*
-**.egg/*
-**.eggs/*
-**.egg-info/*
+htmlcov
+dist
+build
+doc/.build
+env
+env2
+env3
+wenv2
+wenv3
+penv2
+penv3
+.eggs
+browsepy.build
+browsepy.egg-info
+**/__pycache__
+**.egg
+**.eggs
+**.egg-info
 **.pyc
-**/node_modules/*
+**/node_modules
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 5ee9f88..6bd7720 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -27,6 +27,61 @@ try:
 except ImportError:
     from backports.shutil_get_terminal_size import get_terminal_size  # noqa
 
+try:
+    from queue import Queue, Empty, Full
+except ImportError:
+    from Queue import Queue, Empty, Full  # noqa
+
+try:
+    from threading import Barrier, BrokenBarrierError
+except ImportError:
+    from threading import Lock  # noqa
+
+    class BrokenBarrierError(RuntimeError):
+        pass
+
+    class Barrier(object):
+        def __init__(self, parties, action=None, timeout=0):
+            self.parties = parties
+            self.n_waiting = 0
+            self.broken = False
+            self._queue = Queue(maxsize=1)
+            self._lock = Lock()
+
+        def _uncork(self, broken=False):
+            # allow every exit
+            while self.n_waiting > 1:
+                self._queue.put(broken)
+                self.n_waiting -= 1
+            self.n_waiting = 0
+
+        def reset(self):
+            with self._lock:
+                self._uncork(True)
+
+        def abort(self):
+            with self._lock:
+                self.broken = True
+                self._uncork(True)
+
+        def wait(self):
+            with self._lock:
+                if self.broken:
+                    raise BrokenBarrierError()
+
+                self.n_waiting += 1
+
+                if self.n_waiting == self.parties:
+                    self._uncork()
+
+                    if self.action:
+                        self.action()
+
+                    return
+
+            if self._queue.get():
+                raise BrokenBarrierError()
+
 
 def isexec(path):
     '''
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 5fb0189..fe58b55 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -2,56 +2,136 @@
 import os
 import os.path
 import tarfile
-import functools
 import threading
 
+import browsepy.compat as compat
+
+
+class WriteAbort(RuntimeError):
+    def __init__(self):
+        print('abort')
+        super(WriteAbort, self).__init__()
+
+
+class WritableQueue(object):
+    '''
+    Minimal threading blocking pipe threading with only `write`, `get` and
+    `close` methods.
+
+    This class includes :class:`queue.Queue` specific logic, which itself
+    depends on :module:`threading` so any alternate
+
+    Method `write` is exposed instead of `put` for :class:`tarfile.TarFile`
+    `fileobj` compatibility.
+    '''
+    abort_exception = WriteAbort
+
+    def __init__(self):
+        self._queue = compat.Queue(maxsize=1)
+        self.closed = False
+
+    def write(self, data):
+        '''
+        Put chunk of data onto pipe.
+        This method blocks if pipe is already full.
+
+        :param data: bytes to write to pipe
+        :type data: bytes
+        :returns: number of bytes written
+        :rtype: int
+        :raises WriteAbort: if already closed or closed while blocking
+        '''
+        if self.closed:
+            raise self.abort_exception()
+
+        self._queue.put(data)
+
+        if self.closed:
+            raise self.abort_exception()
+
+        return len(data)
+
+    def retrieve(self):
+        '''
+        Get chunk of data from pipe.
+        This method blocks if pipe is empty.
+
+        :returns: data chunk
+        :rtype: bytes
+        :raises WriteAbort: if already closed or closed while blocking
+        '''
+        if self.closed:
+            raise self.abort_exception()
+
+        data = self._queue.get()
+
+        if self.closed and data is None:
+            raise self.abort_exception()
+
+        return data
+
+    def close(self):
+        '''
+        Closes, so any blocked and future writes or retrieves will raise
+        :attr:`abort_exception` instances.
+        '''
+        self.closed = True
+
 
 class TarFileStream(object):
     '''
     Tarfile which compresses while reading for streaming.
 
-    Buffsize can be provided, it must be 512 multiple (the tar block size) for
-    compression.
+    Buffsize can be provided, it should be 512 multiple (the tar block size)
+    for and will be used as tarfile block size.
 
     Note on corroutines: this class uses threading by default, but
     corroutine-based applications can change this behavior overriding the
     :attr:`event_class` and :attr:`thread_class` values.
     '''
-    event_class = threading.Event
+
+    writable_class = WritableQueue
     thread_class = threading.Thread
     tarfile_class = tarfile.open
 
-    def __init__(self, path, buffsize=10240, exclude=None):
+    extensions = {
+        'gz': 'tgz',
+        'bz2': 'tar.bz2',
+        'xz': 'tar.xz',
+        }
+
+    @property
+    def name(self):
+        return '%s.%s' % (
+            os.path.basename(self.path),
+            self.extensions.get(self._compress, 'tar')
+            )
+
+    def __init__(self, path, buffsize=10240, exclude=None, compress='gz'):
         '''
-        Internal tarfile object will be created, and compression will start
-        on a thread until buffer became full with writes becoming locked until
-        a read occurs.
+        Compression will start a thread, and will be pausing until consumed.
+
+        Note that compress parameter will be ignored if buffsize is below 16.
 
         :param path: local path of directory whose content will be compressed.
         :type path: str
-        :param buffsize: size of internal buffer on bytes, defaults to 10KiB
+        :param buffsize: byte size of tarfile blocks, defaults to 10KiB
         :type buffsize: int
-        :param exclude: path filter function, defaults to None
+        :param exclude: absolute path filtering function, defaults to None
         :type exclude: callable
+        :param compress: compression method ('gz', 'bz2', 'xz' or None)
+        :type compress: str or None
         '''
         self.path = path
-        self.name = os.path.basename(path) + ".tgz"
         self.exclude = exclude
 
-        self._finished = 0
-        self._want = 0
-        self._data = bytes()
-        self._add = self.event_class()
-        self._result = self.event_class()
-        self._tarfile = self.tarfile_class(  # stream write
-            fileobj=self,
-            mode="w|gz",
-            bufsize=buffsize
-            )
-        self._th = self.thread_class(target=self.fill)
-        self._th.start()
+        self._started = False
+        self._buffsize = buffsize
+        self._compress = compress if compress and buffsize > 15 else ''
+        self._writable = self.writable_class()
+        self._th = self.thread_class(target=self._fill)
 
-    def fill(self):
+    def _fill(self):
         '''
         Writes data on internal tarfile instance, which writes to current
         object, using :meth:`write`.
@@ -61,88 +141,57 @@ class TarFileStream(object):
         This method is called automatically, on a thread, on initialization,
         so there is little need to call it manually.
         '''
-        if self.exclude:
-            exclude = self.exclude
-            ap = functools.partial(os.path.join, self.path)
-            self._tarfile.add(
-                self.path, "",
-                filter=lambda info: None if exclude(ap(info.name)) else info
-                )
-        else:
-            self._tarfile.add(self.path, "")
-        self._tarfile.close()  # force stream flush
-        self._finished += 1
-        if not self._result.is_set():
-            self._result.set()
+        exclude = self.exclude
+        path_join = os.path.join
+        path = self.path
 
-    def write(self, data):
-        '''
-        Write method used by internal tarfile instance to output data.
-        This method blocks tarfile execution once internal buffer is full.
+        def infofilter(info):
+            return None if exclude(path_join(path, info.name)) else info
 
-        As this method is blocking, it is used inside the same thread of
-        :meth:`fill`.
+        tarfile = self.tarfile_class(  # stream write
+            fileobj=self._writable,
+            mode='w|{}'.format(self._compress),
+            bufsize=self._buffsize
+            )
 
-        :param data: bytes to write to internal buffer
-        :type data: bytes
-        :returns: number of bytes written
-        :rtype: int
-        '''
-        self._add.wait()
-        self._data += data
-        if len(self._data) > self._want:
-            self._add.clear()
-            self._result.set()
-        return len(data)
+        try:
+            tarfile.add(self.path, "", filter=infofilter if exclude else None)
+            tarfile.close()  # force stream flush
+        except self._writable.abort_exception:
+            pass
+        else:
+            self._writable.close()
 
-    def read(self, want=0):
+    def __next__(self):
         '''
-        Read method, gets data from internal buffer while releasing
-        :meth:`write` locks when needed.
-
-        The lock usage means it must ran on a different thread than
-        :meth:`fill`, ie. the main thread, otherwise will deadlock.
-
-        The combination of both write and this method running on different
-        threads makes tarfile being streamed on-the-fly, with data chunks being
-        processed and retrieved on demand.
+        Pulls chunk from tarfile (which is processed on its own thread).
 
         :param want: number bytes to read, defaults to 0 (all available)
         :type want: int
         :returns: tarfile data as bytes
         :rtype: bytes
         '''
-        if self._finished:
-            if self._finished == 1:
-                self._finished += 1
-                return ""
-            return EOFError("EOF reached")
-
-        # Thread communication
-        self._want = want
-        self._add.set()
-        self._result.wait()
-        self._result.clear()
-
-        if want:
-            data = self._data[:want]
-            self._data = self._data[want:]
-        else:
-            data = self._data
-            self._data = bytes()
-        return data
+        if not self._started:
+            self._started = True
+            self._th.start()
+
+        try:
+            return self._writable.retrieve()
+        except self._writable.abort_exception:
+            raise StopIteration()
 
     def __iter__(self):
         '''
-        Iterate through tarfile result chunks.
+        This class itself implements iterable protocol, so iter() returns
+        this instance itself.
 
-        Similarly to :meth:`read`, this methos must ran on a different thread
-        than :meth:`write` calls.
+        :returns: instance itself
+        :rtype: TarFileStream
+        '''
+        return self
 
-        :yields: data chunks as taken from :meth:`read`.
-        :ytype: bytes
+    def close(self):
+        '''
+        Finish processing aborting any pending write.
         '''
-        data = self.read()
-        while data:
-            yield data
-            data = self.read()
+        self._writable.close()
-- 
GitLab


From 9b9199117df453438f1ffb5ae080c17fc66746b0 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Apr 2018 09:42:20 +0200
Subject: [PATCH 018/171] harden tarfile stream implementation

---
 browsepy/stream.py            | 96 +++++++++++++++++++++--------------
 browsepy/tests/test_stream.py | 43 ++++++++++++++++
 2 files changed, 102 insertions(+), 37 deletions(-)
 create mode 100644 browsepy/tests/test_stream.py

diff --git a/browsepy/stream.py b/browsepy/stream.py
index fe58b55..0d33891 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -3,31 +3,41 @@ import os
 import os.path
 import tarfile
 import threading
+import functools
 
 import browsepy.compat as compat
 
 
-class WriteAbort(RuntimeError):
-    def __init__(self):
-        print('abort')
-        super(WriteAbort, self).__init__()
-
+class BlockingPipeAbort(RuntimeError):
+    '''
+    Exception used internally be default's :class:`BlockingPipe`
+    implementation.
+    '''
+    pass
 
-class WritableQueue(object):
+class BlockingPipe(object):
     '''
-    Minimal threading blocking pipe threading with only `write`, `get` and
-    `close` methods.
+    Minimal pipe class with `write`, `retrieve` and `close` blocking methods.
 
-    This class includes :class:`queue.Queue` specific logic, which itself
-    depends on :module:`threading` so any alternate
+    This class implementation assumes that :attr:`pipe_class` (set as
+    class:`queue.Queue` in current implementation) instances has both `put`
+    and `get blocking methods.
 
-    Method `write` is exposed instead of `put` for :class:`tarfile.TarFile`
+    Due its blocking implementation, this class is only compatible with
+    python's threading module, any other approach (like coroutines) will
+    require to adapt this class (via inheritance or implementation).
+
+    This class exposes :method:`write` for :class:`tarfile.TarFile`
     `fileobj` compatibility.
-    '''
-    abort_exception = WriteAbort
+    '''''
+    lock_class = threading.Lock
+    pipe_class = functools.partial(compat.Queue, maxsize=1)
+    abort_exception = BlockingPipeAbort
 
     def __init__(self):
-        self._queue = compat.Queue(maxsize=1)
+        self._pipe = self.pipe_class()
+        self._wlock = self.lock_class()
+        self._rlock = self.lock_class()
         self.closed = False
 
     def write(self, data):
@@ -41,15 +51,12 @@ class WritableQueue(object):
         :rtype: int
         :raises WriteAbort: if already closed or closed while blocking
         '''
-        if self.closed:
-            raise self.abort_exception()
-
-        self._queue.put(data)
 
-        if self.closed:
-            raise self.abort_exception()
-
-        return len(data)
+        with self._wlock:
+            if self.closed:
+                raise self.abort_exception()
+            self._pipe.put(data)
+            return len(data)
 
     def retrieve(self):
         '''
@@ -60,15 +67,14 @@ class WritableQueue(object):
         :rtype: bytes
         :raises WriteAbort: if already closed or closed while blocking
         '''
-        if self.closed:
-            raise self.abort_exception()
-
-        data = self._queue.get()
-
-        if self.closed and data is None:
-            raise self.abort_exception()
 
-        return data
+        with self._rlock:
+            if self.closed:
+                raise self.abort_exception()
+            data = self._pipe.get()
+            if data is None:
+                raise self.abort_exception()
+            return data
 
     def close(self):
         '''
@@ -77,6 +83,20 @@ class WritableQueue(object):
         '''
         self.closed = True
 
+        # release locks
+        reading = not self._rlock.acquire(blocking=False)
+        writing = not self._wlock.acquire(blocking=False)
+
+        if not reading:
+            if writing:
+                self._pipe.get()
+            self._rlock.release()
+
+        if not writing:
+            if reading:
+                self._pipe.put(None)
+            self._wlock.release()
+
 
 class TarFileStream(object):
     '''
@@ -90,7 +110,8 @@ class TarFileStream(object):
     :attr:`event_class` and :attr:`thread_class` values.
     '''
 
-    writable_class = WritableQueue
+    pipe_class = BlockingPipe
+    abort_exception = BlockingPipe.abort_exception
     thread_class = threading.Thread
     tarfile_class = tarfile.open
 
@@ -128,7 +149,7 @@ class TarFileStream(object):
         self._started = False
         self._buffsize = buffsize
         self._compress = compress if compress and buffsize > 15 else ''
-        self._writable = self.writable_class()
+        self._writable = self.pipe_class()
         self._th = self.thread_class(target=self._fill)
 
     def _fill(self):
@@ -148,7 +169,7 @@ class TarFileStream(object):
         def infofilter(info):
             return None if exclude(path_join(path, info.name)) else info
 
-        tarfile = self.tarfile_class(  # stream write
+        tarfile = self.tarfile_class(
             fileobj=self._writable,
             mode='w|{}'.format(self._compress),
             bufsize=self._buffsize
@@ -157,10 +178,11 @@ class TarFileStream(object):
         try:
             tarfile.add(self.path, "", filter=infofilter if exclude else None)
             tarfile.close()  # force stream flush
-        except self._writable.abort_exception:
-            pass
+        except self.abort_exception:
+            # expected exception when pipe is closed prematurely
+            tarfile.close()  # free fd
         else:
-            self._writable.close()
+            self.close()
 
     def __next__(self):
         '''
@@ -177,7 +199,7 @@ class TarFileStream(object):
 
         try:
             return self._writable.retrieve()
-        except self._writable.abort_exception:
+        except self.abort_exception:
             raise StopIteration()
 
     def __iter__(self):
diff --git a/browsepy/tests/test_stream.py b/browsepy/tests/test_stream.py
new file mode 100644
index 0000000..ee9bac2
--- /dev/null
+++ b/browsepy/tests/test_stream.py
@@ -0,0 +1,43 @@
+
+import os
+import os.path
+import codecs
+import unittest
+import tempfile
+import shutil
+import threading
+
+import browsepy.stream
+
+
+class StreamTest(unittest.TestCase):
+    module = browsepy.stream
+
+    def setUp(self):
+        self.base = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.base)
+
+    def randfile(self, size=1024):
+        name = codecs.encode(os.urandom(5), 'hex').decode()
+        with open(os.path.join(self.base, name), 'wb') as f:
+            f.write(os.urandom(size))
+
+    def test_chunks(self):
+        self.randfile()
+        self.randfile()
+        stream = self.module.TarFileStream(self.base, buffsize=5)
+        self.assertTrue(next(stream))
+
+        with self.assertRaises(StopIteration):
+            while True:
+                next(stream)
+
+    def test_close(self):
+        self.randfile()
+        stream = self.module.TarFileStream(self.base, buffsize=16)
+        self.assertTrue(next(stream))
+        stream.close()
+        with self.assertRaises(StopIteration):
+            next(stream)
-- 
GitLab


From 28a13411337e7b04fde303bbe6bf9e2c72ade660 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Apr 2018 13:38:57 +0200
Subject: [PATCH 019/171] implement TarFileStream as a full Generator

---
 .python-version                  |  2 +-
 browsepy/compat.py               | 55 ++----------------
 browsepy/mimetype.py             |  2 +-
 browsepy/stream.py               | 95 ++++++++++++++++++--------------
 browsepy/tests/test_stream.py    |  1 -
 browsepy/tests/test_transform.py |  2 +-
 requirements.txt                 |  3 +-
 setup.py                         | 19 +++++--
 8 files changed, 78 insertions(+), 101 deletions(-)

diff --git a/.python-version b/.python-version
index 87ce492..0f44168 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.5.2
+3.6.4
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 6bd7720..2cc3a5e 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -18,69 +18,24 @@ PY_LEGACY = sys.version_info < (3, )
 TRUE_VALUES = frozenset(('true', 'yes', '1', 'enable', 'enabled', True, 1))
 
 try:
-    from os import scandir, walk
+    from os import scandir, walk  # python 3.5+
 except ImportError:
     from scandir import scandir, walk  # noqa
 
 try:
-    from shutil import get_terminal_size
+    from shutil import get_terminal_size  # python 3.3+
 except ImportError:
     from backports.shutil_get_terminal_size import get_terminal_size  # noqa
 
 try:
-    from queue import Queue, Empty, Full
+    from queue import Queue, Empty, Full  # python 3
 except ImportError:
     from Queue import Queue, Empty, Full  # noqa
 
 try:
-    from threading import Barrier, BrokenBarrierError
+    from collections.abc import Generator  # python 3.3+
 except ImportError:
-    from threading import Lock  # noqa
-
-    class BrokenBarrierError(RuntimeError):
-        pass
-
-    class Barrier(object):
-        def __init__(self, parties, action=None, timeout=0):
-            self.parties = parties
-            self.n_waiting = 0
-            self.broken = False
-            self._queue = Queue(maxsize=1)
-            self._lock = Lock()
-
-        def _uncork(self, broken=False):
-            # allow every exit
-            while self.n_waiting > 1:
-                self._queue.put(broken)
-                self.n_waiting -= 1
-            self.n_waiting = 0
-
-        def reset(self):
-            with self._lock:
-                self._uncork(True)
-
-        def abort(self):
-            with self._lock:
-                self.broken = True
-                self._uncork(True)
-
-        def wait(self):
-            with self._lock:
-                if self.broken:
-                    raise BrokenBarrierError()
-
-                self.n_waiting += 1
-
-                if self.n_waiting == self.parties:
-                    self._uncork()
-
-                    if self.action:
-                        self.action()
-
-                    return
-
-            if self._queue.get():
-                raise BrokenBarrierError()
+    from backports_abc import Generator  # noqa
 
 
 def isexec(path):
diff --git a/browsepy/mimetype.py b/browsepy/mimetype.py
index 3fe83e0..b908dd2 100644
--- a/browsepy/mimetype.py
+++ b/browsepy/mimetype.py
@@ -8,7 +8,7 @@ import mimetypes
 from .compat import FileNotFoundError, which  # noqa
 
 generic_mimetypes = frozenset(('application/octet-stream', None))
-re_mime_validate = re.compile('\w+/\w+(; \w+=[^;]+)*')
+re_mime_validate = re.compile(r'\w+/\w+(; \w+=[^;]+)*')
 
 
 def by_python(path):
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 0d33891..1a9ea00 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -10,11 +10,12 @@ import browsepy.compat as compat
 
 class BlockingPipeAbort(RuntimeError):
     '''
-    Exception used internally be default's :class:`BlockingPipe`
+    Exception used internally by :class:`BlockingPipe`'s default
     implementation.
     '''
     pass
 
+
 class BlockingPipe(object):
     '''
     Minimal pipe class with `write`, `retrieve` and `close` blocking methods.
@@ -23,9 +24,7 @@ class BlockingPipe(object):
     class:`queue.Queue` in current implementation) instances has both `put`
     and `get blocking methods.
 
-    Due its blocking implementation, this class is only compatible with
-    python's threading module, any other approach (like coroutines) will
-    require to adapt this class (via inheritance or implementation).
+    Due its blocking implementation, this class uses :module:`threading`.
 
     This class exposes :method:`write` for :class:`tarfile.TarFile`
     `fileobj` compatibility.
@@ -76,38 +75,48 @@ class BlockingPipe(object):
                 raise self.abort_exception()
             return data
 
+    def __del__(self):
+        '''
+        Call :method:`BlockingPipe.close`.
+        '''
+        self.close()
+
     def close(self):
         '''
         Closes, so any blocked and future writes or retrieves will raise
         :attr:`abort_exception` instances.
         '''
-        self.closed = True
+        if not self.closed:
+            self.closed = True
 
-        # release locks
-        reading = not self._rlock.acquire(blocking=False)
-        writing = not self._wlock.acquire(blocking=False)
+            # release locks
+            reading = not self._rlock.acquire(blocking=False)
+            writing = not self._wlock.acquire(blocking=False)
 
-        if not reading:
-            if writing:
-                self._pipe.get()
-            self._rlock.release()
+            if not reading:
+                if writing:
+                    self._pipe.get()
+                self._rlock.release()
 
-        if not writing:
-            if reading:
-                self._pipe.put(None)
-            self._wlock.release()
+            if not writing:
+                if reading:
+                    self._pipe.put(None)
+                self._wlock.release()
 
 
-class TarFileStream(object):
+class TarFileStream(compat.Generator):
     '''
-    Tarfile which compresses while reading for streaming.
+    Iterable/generator class which yields tarfile chunks for streaming.
+
+    This class implements :class:`collections.abc.Generator` interface
+    (`PEP 325 <https://www.python.org/dev/peps/pep-0342/>`_),
+    so it can be appropriately handled by wsgi servers
+    (`PEP 333<https://www.python.org/dev/peps/pep-0333>`_).
 
     Buffsize can be provided, it should be 512 multiple (the tar block size)
     for and will be used as tarfile block size.
 
-    Note on corroutines: this class uses threading by default, but
-    corroutine-based applications can change this behavior overriding the
-    :attr:`event_class` and :attr:`thread_class` values.
+    This class uses :module:`threading` for offloading.
     '''
 
     pipe_class = BlockingPipe
@@ -130,8 +139,7 @@ class TarFileStream(object):
 
     def __init__(self, path, buffsize=10240, exclude=None, compress='gz'):
         '''
-        Compression will start a thread, and will be pausing until consumed.
-
+        Initialize thread and class (thread is not started until interated.)
         Note that compress parameter will be ignored if buffsize is below 16.
 
         :param path: local path of directory whose content will be compressed.
@@ -149,7 +157,7 @@ class TarFileStream(object):
         self._started = False
         self._buffsize = buffsize
         self._compress = compress if compress and buffsize > 15 else ''
-        self._writable = self.pipe_class()
+        self._pipe = self.pipe_class()
         self._th = self.thread_class(target=self._fill)
 
     def _fill(self):
@@ -170,7 +178,7 @@ class TarFileStream(object):
             return None if exclude(path_join(path, info.name)) else info
 
         tarfile = self.tarfile_class(
-            fileobj=self._writable,
+            fileobj=self._pipe,
             mode='w|{}'.format(self._compress),
             bufsize=self._buffsize
             )
@@ -184,7 +192,7 @@ class TarFileStream(object):
         else:
             self.close()
 
-    def __next__(self):
+    def send(self, value):
         '''
         Pulls chunk from tarfile (which is processed on its own thread).
 
@@ -198,22 +206,29 @@ class TarFileStream(object):
             self._th.start()
 
         try:
-            return self._writable.retrieve()
+            return self._pipe.retrieve()
         except self.abort_exception:
             raise StopIteration()
 
-    def __iter__(self):
+    def throw(self, typ, val=None, tb=None):
         '''
-        This class itself implements iterable protocol, so iter() returns
-        this instance itself.
-
-        :returns: instance itself
-        :rtype: TarFileStream
-        '''
-        return self
-
-    def close(self):
-        '''
-        Finish processing aborting any pending write.
+        Raise an exception in the coroutine.
+        Return next yielded value or raise StopIteration.
         '''
-        self._writable.close()
+        try:
+            if val is None:
+                if tb is None:
+                    raise typ
+                val = typ()
+            if tb is not None:
+                val = val.with_traceback(tb)
+            raise val
+        except GeneratorExit:
+            self._pipe.close()
+            raise
+
+    def __del__(self):
+        '''
+        Call :method:`TarFileStream.close`,
+        '''
+        self.close()
diff --git a/browsepy/tests/test_stream.py b/browsepy/tests/test_stream.py
index ee9bac2..144ab8f 100644
--- a/browsepy/tests/test_stream.py
+++ b/browsepy/tests/test_stream.py
@@ -5,7 +5,6 @@ import codecs
 import unittest
 import tempfile
 import shutil
-import threading
 
 import browsepy.stream
 
diff --git a/browsepy/tests/test_transform.py b/browsepy/tests/test_transform.py
index 32b06ea..ac3a16b 100755
--- a/browsepy/tests/test_transform.py
+++ b/browsepy/tests/test_transform.py
@@ -100,7 +100,7 @@ class TestGlob(unittest.TestCase):
         translations = [
             ('[[.a-acute.]]a', '/.a(/|$)'),
             ('/[[=a=]]a', '^/.a(/|$)'),
-            ('/[[=a=]\d]a', '^/.a(/|$)'),
+            ('/[[=a=]\\d]a', '^/.a(/|$)'),
             ('[[:non-existent-class:]]a', '/.a(/|$)'),
             ]
         for source, result in translations:
diff --git a/requirements.txt b/requirements.txt
index 5e7f6f4..d072e40 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,13 +6,14 @@ scandir
 
 # for python < 3.3
 backports.shutil_get_terminal_size
+backports_abc
 
 # for building
 setuptools
 wheel
 
 # for Makefile tasks (testing, coverage, docs)
-pycodestyle
+pycodestyle<2.4.0
 flake8
 coverage
 pyaml
diff --git a/setup.py b/setup.py
index 9c7882a..af30c56 100644
--- a/setup.py
+++ b/setup.py
@@ -35,10 +35,13 @@ try:
 except ImportError:
     from distutils.core import setup
 
-sys_path = sys.path[:]
-sys.path[:] = (os.path.abspath('browsepy'),)
-__import__('__meta__')
-meta = sys.modules['__meta__']
+try:
+    import collections.abc as collections_abc
+except ImportError:
+    collections_abc = None
+
+sys.path[:], sys_path = [os.path.abspath('browsepy')], sys.path[:]
+import __meta__ as meta  # noqa
 sys.path[:] = sys_path
 
 with open('README.rst') as f:
@@ -46,12 +49,16 @@ with open('README.rst') as f:
 
 extra_requires = []
 bdist = 'bdist' in sys.argv or any(a.startswith('bdist_') for a in sys.argv)
-if bdist or not hasattr(os, 'scandir'):
+
+if bdist or not hasattr(os, 'scandir'):  # python 3.5+
     extra_requires.append('scandir')
 
-if bdist or not hasattr(shutil, 'get_terminal_size'):
+if bdist or not hasattr(shutil, 'get_terminal_size'):  # python 3.3+
     extra_requires.append('backports.shutil_get_terminal_size')
 
+if bdist or not hasattr(collections_abc, 'Generator'):  # python 3.3+
+    extra_requires.append('backports_abc')
+
 for debugger in ('ipdb', 'pudb', 'pdb'):
     opt = '--debug=%s' % debugger
     if opt in sys.argv:
-- 
GitLab


From b5704241351b0fe422ada0e75a1fc88d1dd9db59 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Apr 2018 14:30:11 +0200
Subject: [PATCH 020/171] fix yaml, add ci requirements txt

---
 .travis.yml                  | 16 ++++++++++++----
 requirements/ci.txt          |  6 ++++++
 requirements/development.txt |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 requirements/ci.txt

diff --git a/.travis.yml b/.travis.yml
index 766c851..7e7d543 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,8 @@ matrix:
 
 install:
   - pip install --upgrade pip
-  - pip install ghp-import sphinx flake8 pep8 codecov coveralls .
+  - pip install -r requirements/ci.txt
+  - pip install .
   - |
     if [ "$eslint" = "yes" ]; then
       nvm install stable
@@ -43,9 +44,16 @@ after_success:
   - codecov
   - coveralls
   - |
-    if [ "$sphinx" = "yes" ] && [ "$TRAVIS_BRANCH" = "master" ] && 
-[ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-      ghp-import --push --force --no-jekyll --branch=gh-pages --remote="https://${GH_TOKEN}@github.com${TRAVIS_REPO_SLUG}.git doc/.build/html"
+    if [ "$sphinx" = "yes" ] && \
+       [ "$TRAVIS_BRANCH" = "master" ] && \
+       [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+      ghp-import \
+        --push \
+        --force \
+        --no-jekyll \
+        --branch=gh-pages \
+        --remote="https://${GH_TOKEN}@github.com${TRAVIS_REPO_SLUG}.git" \
+        doc/.build/html
     fi
 
 notifications:
diff --git a/requirements/ci.txt b/requirements/ci.txt
new file mode 100644
index 0000000..1a30a39
--- /dev/null
+++ b/requirements/ci.txt
@@ -0,0 +1,6 @@
+-r development.txt
+
+# for continuous integration tasks
+ghp-import
+codecov
+coveralls
diff --git a/requirements/development.txt b/requirements/development.txt
index fb9f680..5f03a12 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -5,7 +5,7 @@ setuptools
 wheel
 
 # for Makefile tasks (testing, coverage, docs)
-pep8
+pycodestyle<2.4.0
 flake8
 coverage
 pyaml
-- 
GitLab


From 751e151b788ecfa4707fbef27aa52923a555968c Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Apr 2018 16:56:11 +0200
Subject: [PATCH 021/171] improve/update requirements, fix travis yml

---
 .gitignore                   |  1 +
 .travis.yml                  |  2 +-
 Makefile                     | 45 +++++++++++++++++++-----------------
 requirements.txt             | 26 +++++++++++++++++++++
 requirements/base.txt        | 18 +++++++++++++++
 requirements/ci.txt          | 23 +++++++++++++++++-
 requirements/compat.txt      | 26 +++++++++++++++++++--
 requirements/development.txt | 24 ++++++++++++++++---
 setup.cfg                    | 12 +++++++++-
 9 files changed, 148 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93ff4b4..5061893 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .git/*
 .c9/*
 .idea/*
+.vscode
 .coverage
 htmlcov/*
 dist/*
diff --git a/.travis.yml b/.travis.yml
index 7e7d543..3ec22de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ install:
     fi
 
 script:
-  - make pep8 flake8 coverage
+  - make flake8 coverage
   - |
     if [ "$eslint" = "yes" ]; then
       make eslint
diff --git a/Makefile b/Makefile
index 9994329..1355301 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-.PHONY: doc clean pep8 coverage travis
+.PHONY: test clean upload doc showdoc eslint pep8 pycodestyle flake8 coverage showcoverage
 
-test: pep8 flake8 eslint
+test: flake8 eslint
 	python -c 'import yaml, glob;[yaml.load(open(p)) for p in glob.glob(".*.yml")]'
 ifdef debug
 	python setup.py test --debug=$(debug)
@@ -9,25 +9,27 @@ else
 endif
 
 clean:
-	rm -rf build dist browsepy.egg-info htmlcov MANIFEST \
-	       .eggs *.egg .coverage
+	rm -rf \
+		build \
+		dist \
+		browsepy.egg-info
 	find browsepy -type f -name "*.py[co]" -delete
 	find browsepy -type d -name "__pycache__" -delete
 	$(MAKE) -C doc clean
 
-build-env:
+build/env:
 	mkdir -p build
-	python3 -m venv build/env3
-	build/env3/bin/pip install pip --upgrade
-	build/env3/bin/pip install wheel
+	python3 -m venv build/env
+	build/env/bin/pip install pip --upgrade
+	build/env/bin/pip install wheel
 
-build: clean build-env
-	build/env3/bin/python setup.py bdist_wheel
-	build/env3/bin/python setup.py sdist
+build: clean build/env
+	build/env/bin/python setup.py bdist_wheel
+	build/env/bin/python setup.py sdist
 
-upload: clean build-env
-	build/env3/bin/python setup.py bdist_wheel upload
-	build/env3/bin/python setup.py sdist upload
+upload: clean build/env
+	build/env/bin/python setup.py bdist_wheel upload
+	build/env/bin/python setup.py sdist upload
 
 doc:
 	$(MAKE) -C doc html 2>&1 | grep -v \
@@ -36,17 +38,18 @@ doc:
 showdoc: doc
 	xdg-open file://${CURDIR}/doc/.build/html/index.html >> /dev/null
 
+eslint:
+	eslint ${CURDIR}/browsepy
+
 pep8:
-	find browsepy -type f -name "*.py" -exec pep8 --ignore=E123,E126,E121 {} +
+	pycodestyle --show-source browsepy
+	pycodestyle --show-source setup.py
 
-eslint:
-	eslint \
-		--ignore-path .gitignore \
-		--ignore-pattern *.min.js \
-		${CURDIR}/browsepy
+pycodestyle: pep8
 
 flake8:
-	flake8 browsepy/
+	flake8 --show-source browsepy
+	flake8 --show-source setup.py
 
 coverage:
 	coverage run --source=browsepy setup.py test
diff --git a/requirements.txt b/requirements.txt
index 79239b1..663f429 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,28 @@
+#
+# Default requirements file
+# =========================
+#
+# This file includes all development dependencies, including compatibility
+# modules.
+#
+# If you do not want compatibility dependencies, install
+# `requirements/development.txt` instead.
+#
+# Requirement file inheritance tree
+# ---------------------------------
+#
+# - requirements.txt
+#   - requirements/compat.txt
+#   - requirements/development.txt
+#     - requirements/base.txt
+#
+# See also
+# --------
+#
+# - requirements/ci.txt
+# - requirements/compat.txt
+# - requirements/development.txt
+#
+
 -r requirements/compat.txt
 -r requirements/development.txt
diff --git a/requirements/base.txt b/requirements/base.txt
index af7a758..65fe872 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,2 +1,20 @@
+#
+# Base requirements
+# =================
+#
+# This module lists the strict minimal subset of dependencies required to
+# run this application.
+#
+# Depending on your python environment, optional modules could be also
+# required. They're defined on `requirements/compat.txt`.
+#
+# See also
+# --------
+#
+# - requirements.txt
+# - requirements/compat.txt
+# - requirements/development.txt
+#
+
 flask
 unicategories
diff --git a/requirements/ci.txt b/requirements/ci.txt
index 1a30a39..a7d54ba 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -1,6 +1,27 @@
+#
+# Continuous-integration requirements file
+# ========================================
+#
+# This module includes all requirements for continuous-integration tasks
+# (see .travis.yml).
+#
+# Requirement file inheritance tree
+# ---------------------------------
+#
+# - requirements/ci.txt
+#   - requirements/development.txt
+#     - requirements/base.txt
+#
+# See also
+# --------
+#
+# - requirements.txt
+# - requirements/compat.txt
+# - requirements/development.txt
+#
+
 -r development.txt
 
-# for continuous integration tasks
 ghp-import
 codecov
 coveralls
diff --git a/requirements/compat.txt b/requirements/compat.txt
index e070c36..a593b7a 100644
--- a/requirements/compat.txt
+++ b/requirements/compat.txt
@@ -1,5 +1,27 @@
-# for python < 3.6
+#
+# Compatibility requirements file
+# ===============================
+#
+# This module includes optional dependencies which could be required (or not)
+# based on your python version.
+#
+# They should be forward-compatible so you can install them all if you are not
+# sure.
+#
+# This requirements are conditional dependencies on 'source' distributable
+# packages, but regular dependencies of 'binary' distributable packages
+# (see `setup.py`).
+#
+# See also
+# --------
+#
+# - requirements.txt
+# - requirements/ci.txt
+# - requirements/development.txt
+#
+
+# python < 3.6
 scandir
 
-# for python < 3.3
+# python < 3.3
 backports.shutil_get_terminal_size
diff --git a/requirements/development.txt b/requirements/development.txt
index 5f03a12..a40880a 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -1,10 +1,28 @@
+#
+# Development requirements file
+# =============================
+#
+# This module includes only development dependencies for Makefile tasks such as
+# code analysis and building (see Makefile).
+#
+# Requirement file inheritance tree
+# ---------------------------------
+#
+# - requirements/development.txt
+#   - requirements/base.txt
+#
+# See also
+# --------
+#
+# - requirements.txt
+# - requirements/ci.txt
+# - requirements/compat.txt
+#
+
 -r base.txt
 
-# for building
 setuptools
 wheel
-
-# for Makefile tasks (testing, coverage, docs)
 pycodestyle<2.4.0
 flake8
 coverage
diff --git a/setup.cfg b/setup.cfg
index 0de37e5..cd1dd2d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,4 +5,14 @@ description-file = README.rst
 universal = 1
 
 [egg_info]
-tag_build =
\ No newline at end of file
+tag_build =
+
+[pycodestyle]
+ignore = E123,E126,E121,W504
+
+[flake8]
+ignore = E123,E126,E121,W504
+max-complexity = 9
+
+[yapf]
+align_closing_bracket_with_visual_indent = true
-- 
GitLab


From 842b6e6191286fa1ad04fe9b2882fc4062f7e806 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Apr 2018 18:19:02 +0200
Subject: [PATCH 022/171] prevent doc requirements to crash compatibility CI
 builds

---
 .travis.yml                  |  4 ++++
 requirements/development.txt |  3 ++-
 requirements/doc.txt         | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 requirements/doc.txt

diff --git a/.travis.yml b/.travis.yml
index 3ec22de..465bcef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,10 @@ install:
       npm install eslint
       export PATH="$PWD/node_modules/.bin:$PATH"
     fi
+  - |
+    if [ "$sphinx" = "yes" ]; then
+      pip install -r requirements/doc.txt
+    fi
 
 script:
   - make flake8 coverage
diff --git a/requirements/development.txt b/requirements/development.txt
index a40880a..ce54672 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -5,6 +5,8 @@
 # This module includes only development dependencies for Makefile tasks such as
 # code analysis and building (see Makefile).
 #
+# Documentation requirements are on its own file `requirements/doc.txt`.
+#
 # Requirement file inheritance tree
 # ---------------------------------
 #
@@ -27,4 +29,3 @@ pycodestyle<2.4.0
 flake8
 coverage
 pyaml
-sphinx
diff --git a/requirements/doc.txt b/requirements/doc.txt
new file mode 100644
index 0000000..2c2e5f6
--- /dev/null
+++ b/requirements/doc.txt
@@ -0,0 +1,26 @@
+#
+# Documentation requirements file
+# ===============================
+#
+# This module includes only dependencies required to build the documentation.
+#
+# These requirements are kept separated from both development and integration
+# requirement files as they tend to be picky about python versions.
+#
+# Requirement file inheritance tree
+# ---------------------------------
+#
+# - requirements/doc.txt
+#   - requirements/base.txt
+#
+# See also
+# --------
+#
+# - requirements.txt
+# - requirements/ci.txt
+# - requirements/compat.txt
+#
+
+-r base.txt
+
+sphinx
-- 
GitLab


From b2ad981d8edeceebd63dbbbd6d620e44d012b365 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Apr 2018 23:06:56 +0200
Subject: [PATCH 023/171] drop backports_abc and base TarFileStream on Iterator

---
 browsepy/compat.py | 17 ++++++++++++-----
 browsepy/stream.py | 34 +++++++++++-----------------------
 requirements.txt   |  1 -
 setup.py           |  8 --------
 4 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 2cc3a5e..44f7000 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -6,10 +6,8 @@ import os.path
 import sys
 import abc
 import itertools
-
-import warnings
 import functools
-
+import warnings
 import posixpath
 import ntpath
 
@@ -33,9 +31,9 @@ except ImportError:
     from Queue import Queue, Empty, Full  # noqa
 
 try:
-    from collections.abc import Generator  # python 3.3+
+    from collections.abc import Iterator as BaseIterator  # python 3.3+
 except ImportError:
-    from backports_abc import Generator  # noqa
+    from collections import Iterator as BaseIterator
 
 
 def isexec(path):
@@ -328,6 +326,14 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
 
 
 if PY_LEGACY:
+    class Iterator(BaseIterator):
+        def next(self):
+            '''
+            Call :method:`__next__` for compatibility.
+
+            :returns: see :method:`__next__`
+            '''
+            return self.__next__()
 
     class FileNotFoundError(BaseException):
         __metaclass__ = abc.ABCMeta
@@ -343,6 +349,7 @@ if PY_LEGACY:
     chr = unichr  # noqa
     bytes = str  # noqa
 else:
+    Iterator = BaseIterator
     FileNotFoundError = FileNotFoundError
     range = range
     filter = filter
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 1a9ea00..50ea279 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -90,8 +90,8 @@ class BlockingPipe(object):
             self.closed = True
 
             # release locks
-            reading = not self._rlock.acquire(blocking=False)
-            writing = not self._wlock.acquire(blocking=False)
+            reading = not self._rlock.acquire(False)
+            writing = not self._wlock.acquire(False)
 
             if not reading:
                 if writing:
@@ -104,13 +104,12 @@ class BlockingPipe(object):
                 self._wlock.release()
 
 
-class TarFileStream(compat.Generator):
+class TarFileStream(compat.Iterator):
     '''
-    Iterable/generator class which yields tarfile chunks for streaming.
+    Iterator class which yields tarfile chunks for streaming.
 
-    This class implements :class:`collections.abc.Generator` interface
-    (`PEP 325 <https://www.python.org/dev/peps/pep-0342/>`_),
-    so it can be appropriately handled by wsgi servers
+    This class implements :class:`collections.abc.Iterator` interface
+    with :method:`close`, so it can be appropriately handled by wsgi servers
     (`PEP 333<https://www.python.org/dev/peps/pep-0333>`_).
 
     Buffsize can be provided, it should be 512 multiple (the tar block size)
@@ -192,7 +191,7 @@ class TarFileStream(compat.Generator):
         else:
             self.close()
 
-    def send(self, value):
+    def __next__(self):
         '''
         Pulls chunk from tarfile (which is processed on its own thread).
 
@@ -210,25 +209,14 @@ class TarFileStream(compat.Generator):
         except self.abort_exception:
             raise StopIteration()
 
-    def throw(self, typ, val=None, tb=None):
+    def close(self):
         '''
-        Raise an exception in the coroutine.
-        Return next yielded value or raise StopIteration.
+        Closes tarfile pipe and stops further processing.
         '''
-        try:
-            if val is None:
-                if tb is None:
-                    raise typ
-                val = typ()
-            if tb is not None:
-                val = val.with_traceback(tb)
-            raise val
-        except GeneratorExit:
-            self._pipe.close()
-            raise
+        self._pipe.close()
 
     def __del__(self):
         '''
-        Call :method:`TarFileStream.close`,
+        Call :method:`TarFileStream.close`.
         '''
         self.close()
diff --git a/requirements.txt b/requirements.txt
index d072e40..9b6095b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ scandir
 
 # for python < 3.3
 backports.shutil_get_terminal_size
-backports_abc
 
 # for building
 setuptools
diff --git a/setup.py b/setup.py
index af30c56..b2d0ef7 100644
--- a/setup.py
+++ b/setup.py
@@ -35,11 +35,6 @@ try:
 except ImportError:
     from distutils.core import setup
 
-try:
-    import collections.abc as collections_abc
-except ImportError:
-    collections_abc = None
-
 sys.path[:], sys_path = [os.path.abspath('browsepy')], sys.path[:]
 import __meta__ as meta  # noqa
 sys.path[:] = sys_path
@@ -56,9 +51,6 @@ if bdist or not hasattr(os, 'scandir'):  # python 3.5+
 if bdist or not hasattr(shutil, 'get_terminal_size'):  # python 3.3+
     extra_requires.append('backports.shutil_get_terminal_size')
 
-if bdist or not hasattr(collections_abc, 'Generator'):  # python 3.3+
-    extra_requires.append('backports_abc')
-
 for debugger in ('ipdb', 'pudb', 'pdb'):
     opt = '--debug=%s' % debugger
     if opt in sys.argv:
-- 
GitLab


From ca060378caaa261eb27f2c046988368faf117eef Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 13 Apr 2018 00:02:40 +0200
Subject: [PATCH 024/171] refactor file-actions paste code to reduce complexity

---
 browsepy/plugin/file_actions/__init__.py | 54 ++-----------------
 browsepy/plugin/file_actions/paste.py    | 69 ++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 50 deletions(-)
 create mode 100644 browsepy/plugin/file_actions/paste.py

diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index f318869..5ce4393 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -3,7 +3,6 @@
 
 import os
 import os.path
-import shutil
 import logging
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
@@ -13,15 +12,15 @@ from werkzeug.exceptions import NotFound
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
                           current_restricted_chars, common_path_separators
-from browsepy.compat import map, re_escape, FileNotFoundError
+from browsepy.compat import re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
 
 from .clipboard import Clipboard
 from .exceptions import FileActionsException, \
-                        InvalidClipboardModeError, \
                         InvalidClipboardItemsError, \
                         InvalidDirnameError, \
                         DirectoryCreationError
+from .paste import paste_clipboard
 
 
 __basedir__ = os.path.dirname(os.path.abspath(__file__))
@@ -125,30 +124,6 @@ def selection(path):
 @actions.route('/clipboard/paste', defaults={'path': ''})
 @actions.route('/clipboard/paste/<path:path>')
 def clipboard_paste(path):
-
-    def copy(target, node, join_fnc=os.path.join):
-        if node.is_excluded:
-            raise OSError(2, os.strerror(2))
-        dest = join_fnc(
-            target.path,
-            target.choose_filename(node.name)
-            )
-        if node.is_directory:
-            shutil.copytree(node.path, dest)
-        else:
-            shutil.copy2(node.path, dest)
-
-    def cut(target, node, join_fnc=os.path.join):
-        if node.is_excluded or not node.can_remove:
-            code = 2 if node.is_excluded else 1
-            raise OSError(code, os.strerror(code))
-        if node.parent.path != target.path:
-            dest = join_fnc(
-                target.path,
-                target.choose_filename(node.name)
-                )
-            shutil.move(node.path, dest)
-
     try:
         directory = Node.from_urlpath(path)
     except OutsideDirectoryBase:
@@ -162,28 +137,7 @@ def clipboard_paste(path):
         return NotFound()
 
     clipboard = Clipboard.from_request()
-    mode = clipboard.mode
-
-    if mode == 'cut':
-        paste_fnc = cut
-    elif mode == 'copy':
-        paste_fnc = copy
-    else:
-        raise InvalidClipboardModeError(
-            path=directory.path,
-            clipboard=clipboard,
-            mode=mode
-            )
-
-    issues = []
-    clipboard.mode = 'paste'  # disables exclusion
-    for node in map(Node.from_urlpath, clipboard):
-        try:
-            paste_fnc(directory, node)
-        except BaseException as e:
-            issues.append((node, e))
-
-    clipboard.mode = mode
+    success, issues = paste_clipboard(directory, clipboard)
     if issues:
         raise InvalidClipboardItemsError(
             path=directory.path,
@@ -191,7 +145,7 @@ def clipboard_paste(path):
             issues=issues
             )
 
-    if mode == 'cut':
+    if clipboard.mode == 'cut':
         clipboard.clear()
 
     response = redirect(url_for('browse', path=directory.urlpath))
diff --git a/browsepy/plugin/file_actions/paste.py b/browsepy/plugin/file_actions/paste.py
new file mode 100644
index 0000000..a1de913
--- /dev/null
+++ b/browsepy/plugin/file_actions/paste.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+import os
+import os.path
+import shutil
+import functools
+
+from browsepy.file import Node
+from browsepy.compat import map
+
+from .exceptions import InvalidClipboardModeError
+
+
+def copy(target, node, join_fnc=os.path.join):
+    if node.is_excluded:
+        raise OSError(2, os.strerror(2))
+    dest = join_fnc(
+        target.path,
+        target.choose_filename(node.name)
+        )
+    if node.is_directory:
+        shutil.copytree(node.path, dest)
+    else:
+        shutil.copy2(node.path, dest)
+    return dest
+
+
+def move(target, node, join_fnc=os.path.join):
+    if node.is_excluded or not node.can_remove:
+        code = 2 if node.is_excluded else 1
+        raise OSError(code, os.strerror(code))
+    if node.parent.path != target.path:
+        dest = join_fnc(
+            target.path,
+            target.choose_filename(node.name)
+            )
+        shutil.move(node.path, dest)
+        return dest
+    return node.path
+
+
+def paste_clipboard(target, clipboard):
+    '''
+    Get pasting function for given directory and keyboard.
+    '''
+    mode = clipboard.mode
+    if mode == 'cut':
+        paste_fnc = functools.partial(move, target)
+    elif mode == 'copy':
+        paste_fnc = functools.partial(copy, target)
+    else:
+        raise InvalidClipboardModeError(
+            path=target.path,
+            clipboard=clipboard,
+            mode=mode
+            )
+    success = []
+    issues = []
+    try:
+        clipboard.mode = 'paste'  # deactivates excluded_clipboard fnc
+        for node in map(Node.from_urlpath, clipboard):
+            try:
+                success.append(paste_fnc(node))
+            except BaseException as e:
+                issues.append((node, e))
+    finally:
+        clipboard.mode = mode
+    return success, issues
-- 
GitLab


From fb4fefa96008514930f1ac0f292a3fc41094e38a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 13 Apr 2018 00:07:41 +0200
Subject: [PATCH 025/171] use hex_codec instead of hex for compatibility

---
 browsepy/tests/test_stream.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/tests/test_stream.py b/browsepy/tests/test_stream.py
index 144ab8f..cbc5f39 100644
--- a/browsepy/tests/test_stream.py
+++ b/browsepy/tests/test_stream.py
@@ -19,7 +19,7 @@ class StreamTest(unittest.TestCase):
         shutil.rmtree(self.base)
 
     def randfile(self, size=1024):
-        name = codecs.encode(os.urandom(5), 'hex').decode()
+        name = codecs.encode(os.urandom(5), 'hex_codec').decode()
         with open(os.path.join(self.base, name), 'wb') as f:
             f.write(os.urandom(size))
 
-- 
GitLab


From 9d04f1faad132c865fcd6687131154827b208417 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 13 Apr 2018 21:10:14 +0200
Subject: [PATCH 026/171] send appropiate headers on tarfile responses

---
 browsepy/file.py   | 21 ++++++++++++++-------
 browsepy/http.py   | 41 +++++++++++++++++++++++++++++++++++++++++
 browsepy/stream.py | 36 ++++++++++++++++++++++++------------
 browsepy/widget.py |  2 +-
 4 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 browsepy/http.py

diff --git a/browsepy/file.py b/browsepy/file.py
index 1b3b14c..920bbcc 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -17,6 +17,7 @@ from werkzeug.utils import cached_property
 from . import compat
 from . import manager
 from .compat import range
+from .http import Headers
 from .stream import TarFileStream
 from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
                         PathTooLongError, FilenameTooLongError
@@ -636,14 +637,20 @@ class Directory(Node):
         :returns: Response object
         :rtype: flask.Response
         '''
-
+        stream = TarFileStream(
+            self.path,
+            self.app.config['directory_tar_buffsize'],
+            self.plugin_manager.check_excluded,
+            )
         return self.app.response_class(
-            TarFileStream(
-                self.path,
-                self.app.config['directory_tar_buffsize'],
-                self.plugin_manager.check_excluded,
-                ),
-            mimetype="application/octet-stream"
+            stream,
+            direct_passthrough=True,
+            headers=Headers(
+                content_type=stream.mimetype,
+                content_type_options={'encoding': stream.encoding},
+                content_disposition='attachment',
+                content_disposition_options={'filename': stream.name},
+                )
             )
 
     def contains(self, filename):
diff --git a/browsepy/http.py b/browsepy/http.py
new file mode 100644
index 0000000..9fdfada
--- /dev/null
+++ b/browsepy/http.py
@@ -0,0 +1,41 @@
+
+import re
+
+from werkzeug.http import dump_options_header
+from werkzeug.datastructures import Headers as BaseHeaders
+
+
+class Headers(BaseHeaders):
+    '''
+    A wrapper around :class:`werkzeug.datastructures.Headers`, allowing
+    to specify headers with options.
+    '''
+    snake_replace = staticmethod(re.compile(r'(^|-)[a-z]').sub)
+
+    @classmethod
+    def genpair(cls, key, optkey, values):
+        '''
+        Extract value and options from values dict based on given key and
+        options-key.
+
+        :param key: value key
+        :type key: str
+        :param optkey: options key
+        :type optkey: str
+        :param values: value dictionary
+        :type values: dict
+        :returns: tuple of (key, value)
+        :rtype: tuple of str
+        '''
+        return (
+            cls.snake_replace(lambda x: x[0].upper(), key.replace('_', '-')),
+            dump_options_header(values[key], values.get(optkey, {})),
+            )
+
+    def __init__(self, options_suffix='_options', **kwargs):
+        items = [
+            self.genpair(key, '%s_%s' % (key, options_suffix), kwargs)
+            for key in kwargs
+            if not key.endswith(options_suffix)
+            ]
+        return super(Headers, self).__init__(items)
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 50ea279..d48dc47 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -5,7 +5,7 @@ import tarfile
 import threading
 import functools
 
-import browsepy.compat as compat
+from . import compat
 
 
 class BlockingPipeAbort(RuntimeError):
@@ -123,20 +123,29 @@ class TarFileStream(compat.Iterator):
     thread_class = threading.Thread
     tarfile_class = tarfile.open
 
-    extensions = {
-        'gz': 'tgz',
-        'bz2': 'tar.bz2',
-        'xz': 'tar.xz',
+    mimetype = 'application/x-tar'
+    compresion_modes = {
+        None: ('', 'tar'),
+        'gzip': ('gz', 'tgz'),
+        'bzip2': ('bz2', 'tar.bz2'),
+        'xz': ('xz', 'tar.xz'),
         }
 
     @property
     def name(self):
-        return '%s.%s' % (
-            os.path.basename(self.path),
-            self.extensions.get(self._compress, 'tar')
-            )
+        '''
+        Filename generated from given path and compression method.
+        '''
+        return '%s.%s' % (os.path.basename(self.path), self._extension)
 
-    def __init__(self, path, buffsize=10240, exclude=None, compress='gz'):
+    @property
+    def encoding(self):
+        '''
+        Mimetype parameters (such as encoding).
+        '''
+        return self._compress
+
+    def __init__(self, path, buffsize=10240, exclude=None, compress='gzip'):
         '''
         Initialize thread and class (thread is not started until interated.)
         Note that compress parameter will be ignored if buffsize is below 16.
@@ -155,7 +164,10 @@ class TarFileStream(compat.Iterator):
 
         self._started = False
         self._buffsize = buffsize
-        self._compress = compress if compress and buffsize > 15 else ''
+
+        self._compress = compress if compress and buffsize > 15 else None
+        self._mode, self._extension = self.compresion_modes[self._compress]
+
         self._pipe = self.pipe_class()
         self._th = self.thread_class(target=self._fill)
 
@@ -178,7 +190,7 @@ class TarFileStream(compat.Iterator):
 
         tarfile = self.tarfile_class(
             fileobj=self._pipe,
-            mode='w|{}'.format(self._compress),
+            mode='w|{}'.format(self._mode),
             bufsize=self._buffsize
             )
 
diff --git a/browsepy/widget.py b/browsepy/widget.py
index afbda38..fed6642 100644
--- a/browsepy/widget.py
+++ b/browsepy/widget.py
@@ -55,7 +55,7 @@ class LinkWidget(WidgetBase):
                 self.icon if self.icon is not None else
                 'dir-icon' if file.is_directory else
                 'file-icon',
-            )
+                )
         return self
 
 
-- 
GitLab


From 944eaac7b204969cdf285fcdd13fe21a064f218a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Mon, 16 Apr 2018 11:16:49 +0200
Subject: [PATCH 027/171] use backwards-compatible regex match group

---
 browsepy/http.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/browsepy/http.py b/browsepy/http.py
index 9fdfada..7da14cf 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -8,7 +8,7 @@ from werkzeug.datastructures import Headers as BaseHeaders
 class Headers(BaseHeaders):
     '''
     A wrapper around :class:`werkzeug.datastructures.Headers`, allowing
-    to specify headers with options.
+    to specify headers with options on initialization.
     '''
     snake_replace = staticmethod(re.compile(r'(^|-)[a-z]').sub)
 
@@ -28,11 +28,19 @@ class Headers(BaseHeaders):
         :rtype: tuple of str
         '''
         return (
-            cls.snake_replace(lambda x: x[0].upper(), key.replace('_', '-')),
+            cls.snake_replace(
+                lambda x: x.group(0).upper(),
+                key.replace('_', '-')
+                ),
             dump_options_header(values[key], values.get(optkey, {})),
             )
 
     def __init__(self, options_suffix='_options', **kwargs):
+        '''
+        :param options_suffix: suffix for header options (default: '_options')
+        :type options_suffix: str
+        :param **kwargs: headers as keyword arguments
+        '''
         items = [
             self.genpair(key, '%s_%s' % (key, options_suffix), kwargs)
             for key in kwargs
-- 
GitLab


From 4864e3dfdc7ea0a48de6727804b4f1131a6c0e34 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 18 Apr 2018 22:22:33 +0200
Subject: [PATCH 028/171] test tarfilestream filename

---
 browsepy/tests/test_file.py   |  2 +-
 browsepy/tests/test_module.py | 57 ++++++++++++++++++++++++++---------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index 368169c..80f9947 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -304,7 +304,7 @@ class TestFileFunctions(unittest.TestCase):
         self.assertRaises(
             browsepy.OutsideDirectoryBase,
             self.module.relativize_path, '/other', '/parent', '/'
-        )
+            )
 
     def test_under_base(self):
         self.assertTrue(
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index b8b1c0a..b43fc9c 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -9,11 +9,13 @@ import tempfile
 import tarfile
 import io
 import mimetypes
+import collections
 
 import flask
 import bs4
 
 from werkzeug.exceptions import NotFound
+from werkzeug.http import parse_options_header
 
 import browsepy
 import browsepy.file
@@ -40,6 +42,36 @@ class Page(object):
         return cls(source, response)
 
 
+class DirectoryDownload(Page):
+    file_class = collections.namedtuple('File', ('name', 'size'))
+
+    def __init__(self, filename, content_type, files, response=None):
+        self.filename = filename
+        self.content_type = content_type
+        self.files = files
+        self.response = response
+
+    @classmethod
+    def from_source(cls, source, response=None):
+        iodata = io.BytesIO(source)
+        with tarfile.open('p.tgz', mode="r:gz", fileobj=iodata) as tgz:
+            files = [
+                cls.file_class(member.name, member.size)
+                for member in tgz.getmembers()
+                if member.name
+                ]
+        files.sort()
+        filename = None
+        content_type = None
+        if response:
+            content_type = response.content_type
+            disposition = response.headers.get('Content-Disposition')
+            mode, options = parse_options_header(disposition)
+            if mode == 'attachment' and 'filename' in options:
+                filename = options['filename']
+        return cls(filename, content_type, files, response)
+
+
 class ListPage(Page):
     def __init__(self, path, directories, files, removable, upload, tarfile,
                  source, response=None):
@@ -128,6 +160,7 @@ class TestApp(unittest.TestCase):
     generic_page_class = Page
     list_page_class = ListPage
     confirm_page_class = ConfirmPage
+    directory_download_class = DirectoryDownload
     page_exceptions = {
         404: Page404Exception,
         400: Page400Exception,
@@ -198,6 +231,8 @@ class TestApp(unittest.TestCase):
             page_class = self.confirm_page_class
         elif endpoint == 'sort' and follow_redirects:
             page_class = self.list_page_class
+        elif endpoint == 'download_directory':
+            page_class = self.directory_download_class
         else:
             page_class = self.generic_page_class
         with kwargs.pop('client', None) or self.app.test_client() as client:
@@ -391,33 +426,27 @@ class TestApp(unittest.TestCase):
         bindata = bytes(range(256))
         exclude = self.app.config['exclude_fnc']
 
-        def tarball_files(path):
-            page = self.get('download_directory', path=path)
-            iodata = io.BytesIO(page.data)
-            with tarfile.open('p.tgz', mode="r:gz", fileobj=iodata) as tgz:
-                tgz_files = [
-                    member.name
-                    for member in tgz.getmembers()
-                    if member.name
-                    ]
-            tgz_files.sort()
-            return tgz_files
-
         for path in (binfile, excfile):
             with open(path, 'wb') as f:
                 f.write(bindata)
 
         self.app.config['exclude_fnc'] = None
 
+        response = self.get('download_directory', path='start')
+        self.assertEqual(response.filename, 'start.tgz')
+        self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(
-            tarball_files('start'),
+            [f.name for f in response.files],
             ['testfile.%s' % x for x in ('bin', 'exc', 'txt')]
             )
 
         self.app.config['exclude_fnc'] = lambda p: p.endswith('.exc')
 
+        response = self.get('download_directory', path='start')
+        self.assertEqual(response.filename, 'start.tgz')
+        self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(
-            tarball_files('start'),
+            [f.name for f in response.files],
             ['testfile.%s' % x for x in ('bin', 'txt')]
             )
 
-- 
GitLab


From 34c6feee6837c7fd2400aa81dc489340f82640f7 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 18 Apr 2018 22:55:30 +0200
Subject: [PATCH 029/171] fix tarfile download headers

---
 browsepy/http.py              |  2 +-
 browsepy/tests/test_module.py | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/browsepy/http.py b/browsepy/http.py
index 7da14cf..6a48e92 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -42,7 +42,7 @@ class Headers(BaseHeaders):
         :param **kwargs: headers as keyword arguments
         '''
         items = [
-            self.genpair(key, '%s_%s' % (key, options_suffix), kwargs)
+            self.genpair(key, '%s%s' % (key, options_suffix), kwargs)
             for key in kwargs
             if not key.endswith(options_suffix)
             ]
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index b43fc9c..c2e70ef 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -45,9 +45,10 @@ class Page(object):
 class DirectoryDownload(Page):
     file_class = collections.namedtuple('File', ('name', 'size'))
 
-    def __init__(self, filename, content_type, files, response=None):
+    def __init__(self, filename, content_type, encoding, files, response=None):
         self.filename = filename
         self.content_type = content_type
+        self.encoding = encoding
         self.files = files
         self.response = response
 
@@ -63,13 +64,17 @@ class DirectoryDownload(Page):
         files.sort()
         filename = None
         content_type = None
+        encoding = None
         if response:
-            content_type = response.content_type
+            content_type, options = parse_options_header(response.content_type)
+            if 'encoding' in options:
+                encoding = options['encoding']
+
             disposition = response.headers.get('Content-Disposition')
             mode, options = parse_options_header(disposition)
             if mode == 'attachment' and 'filename' in options:
                 filename = options['filename']
-        return cls(filename, content_type, files, response)
+        return cls(filename, content_type, encoding, files, response)
 
 
 class ListPage(Page):
@@ -435,6 +440,7 @@ class TestApp(unittest.TestCase):
         response = self.get('download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
         self.assertEqual(response.content_type, 'application/x-tar')
+        self.assertEqual(response.encoding, 'gzip')
         self.assertEqual(
             [f.name for f in response.files],
             ['testfile.%s' % x for x in ('bin', 'exc', 'txt')]
@@ -445,6 +451,7 @@ class TestApp(unittest.TestCase):
         response = self.get('download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
         self.assertEqual(response.content_type, 'application/x-tar')
+        self.assertEqual(response.encoding, 'gzip')
         self.assertEqual(
             [f.name for f in response.files],
             ['testfile.%s' % x for x in ('bin', 'txt')]
-- 
GitLab


From 457ec2cee6a9b0117972c242ea10f6fa6e793a9c Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 28 Apr 2018 03:36:52 +0200
Subject: [PATCH 030/171] initial datacookie implmentation

---
 browsepy/__init__.py                      |  65 +++---
 browsepy/abc.py                           |  15 ++
 browsepy/compat.py                        |   2 +
 browsepy/exceptions.py                    |  12 ++
 browsepy/file.py                          |  12 +-
 browsepy/http.py                          | 239 ++++++++++++++++++++--
 browsepy/plugin/file_actions/clipboard.py |  84 ++------
 browsepy/plugin/file_actions/tests.py     |  46 +++--
 browsepy/tests/test_http.py               |  28 +++
 browsepy/tests/test_module.py             |   8 +-
 browsepy/tests/test_transform.py          |   1 +
 11 files changed, 364 insertions(+), 148 deletions(-)
 create mode 100644 browsepy/abc.py
 create mode 100644 browsepy/tests/test_http.py

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 6909a8a..51ce398 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -4,19 +4,19 @@
 import logging
 import os
 import os.path
-import json
-import base64
 
 from flask import Response, request, render_template, redirect, \
                   url_for, send_from_directory, stream_with_context, \
                   make_response
 from werkzeug.exceptions import NotFound
 
+from .http import DataCookie
 from .appconfig import Flask
 from .manager import PluginManager
 from .file import Node, secure_filename
 from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
-                        InvalidFilenameError, InvalidPathError
+                        InvalidFilenameError, InvalidPathError, \
+                        InvalidCookieSizeError
 from . import compat
 from . import __meta__ as meta
 
@@ -56,21 +56,7 @@ if 'BROWSEPY_SETTINGS' in os.environ:
     app.config.from_envvar('BROWSEPY_SETTINGS')
 
 plugin_manager = PluginManager(app)
-
-
-def iter_cookie_browse_sorting(cookies):
-    '''
-    Get sorting-cookie from cookies dictionary.
-
-    :yields: tuple of path and sorting property
-    :ytype: 2-tuple of strings
-    '''
-    try:
-        data = cookies.get('browse-sorting', 'e30=').encode('ascii')
-        for path, prop in json.loads(base64.b64decode(data).decode('utf-8')):
-            yield path, prop
-    except (ValueError, TypeError, KeyError) as e:
-        logger.exception(e)
+sorting_cookie = DataCookie('browse-sorting')
 
 
 def get_cookie_browse_sorting(path, default):
@@ -81,9 +67,12 @@ def get_cookie_browse_sorting(path, default):
     :rtype: string
     '''
     if request:
-        for cpath, cprop in iter_cookie_browse_sorting(request.cookies):
-            if path == cpath:
-                return cprop
+        try:
+            for cpath, cprop in sorting_cookie.load_headers(request.headers):
+                if path == cpath:
+                    return cprop
+        except BaseException:
+            pass
     return default
 
 
@@ -92,11 +81,12 @@ def browse_sortkey_reverse(prop):
     Get sorting function for directory listing based on given attribute
     name, with some caveats:
     * Directories will be first.
-    * If *name* is given, link widget lowercase text will be used istead.
+    * If *name* is given, link widget lowercase text will be used instead.
     * If *size* is given, bytesize will be used.
 
     :param prop: file attribute name
-    :returns: tuple with sorting gunction and reverse bool
+    :type prop: str
+    :returns: tuple with sorting function and reverse bool
     :rtype: tuple of a dict and a bool
     '''
     if prop.startswith('-'):
@@ -164,21 +154,26 @@ def sort(property, path):
     if not directory.is_directory or directory.is_excluded:
         return NotFound()
 
-    data = [
-        (cpath, cprop)
-        for cpath, cprop in iter_cookie_browse_sorting(request.cookies)
-        if cpath != path
-        ]
-    data.append((path, property))
-    raw_data = base64.b64encode(json.dumps(data).encode('utf-8'))
+    data = [(path, property)]
+    try:
+        data[:-1] = [
+            (cpath, cprop)
+            for cpath, cprop in sorting_cookie.load_headers(request.headers)
+            if cpath != path
+            ]
+    except BaseException:
+        pass
 
-    # prevent cookie becoming too large
-    while len(raw_data) > 3975:  # 4000 - len('browse-sorting=""; Path=/')
-        data.pop(0)
-        raw_data = base64.b64encode(json.dumps(data).encode('utf-8'))
+    # handle cookie becoming too large
+    while True:
+        try:
+            headers = sorting_cookie.dump_headers(data, request.headers)
+            break
+        except InvalidCookieSizeError:
+            data.pop(0)
 
     response = redirect(url_for(".browse", path=directory.urlpath))
-    response.set_cookie('browse-sorting', raw_data)
+    response.headers.extend(headers)
     return response
 
 
diff --git a/browsepy/abc.py b/browsepy/abc.py
new file mode 100644
index 0000000..1f69753
--- /dev/null
+++ b/browsepy/abc.py
@@ -0,0 +1,15 @@
+
+from abc import ABC
+
+from .compat import NoneType
+
+
+class JSONSerializable(ABC):
+    pass
+
+
+JSONSerializable.register(NoneType)
+JSONSerializable.register(int)
+JSONSerializable.register(float)
+JSONSerializable.register(list)
+JSONSerializable.register(str)
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 44f7000..75047fa 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -358,3 +358,5 @@ else:
     unicode = str
     chr = chr
     bytes = bytes
+
+NoneType = type(None)
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index 8a47c03..c72c3df 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -69,3 +69,15 @@ class FilenameTooLongError(InvalidFilenameError):
         self.limit = limit
         super(FilenameTooLongError, self).__init__(
             message, path=path, filename=filename)
+
+
+class InvalidCookieSizeError(ValueError):
+    '''
+    Exception raised when a paginated cookie exceeds its maximun page number.
+    '''
+    code = 'invalid-cookie-size'
+    template = 'Value too big to fit in {} cookies.'
+
+    def __init__(self, message=None, max_cookies=None):
+        self.max_cookies = max_cookies
+        message = message or self.template.format(max_cookies=max_cookies)
diff --git a/browsepy/file.py b/browsepy/file.py
index 920bbcc..61c5a37 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -646,10 +646,14 @@ class Directory(Node):
             stream,
             direct_passthrough=True,
             headers=Headers(
-                content_type=stream.mimetype,
-                content_type_options={'encoding': stream.encoding},
-                content_disposition='attachment',
-                content_disposition_options={'filename': stream.name},
+                content_type=(
+                    stream.mimetype,
+                    {'encoding': stream.encoding} if stream.encoding else {},
+                    ),
+                content_disposition=(
+                    'attachment',
+                    {'filename': stream.name} if stream.name else {},
+                    )
                 )
             )
 
diff --git a/browsepy/http.py b/browsepy/http.py
index 6a48e92..f8140dd 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -1,49 +1,244 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
 
 import re
+import string
+import json
+import base64
+import logging
+import zlib
 
-from werkzeug.http import dump_options_header
+from werkzeug.http import dump_header, dump_options_header, dump_cookie, \
+                          parse_cookie
 from werkzeug.datastructures import Headers as BaseHeaders
 
+from .compat import range, map
+from .exceptions import InvalidCookieSizeError
+
+
+logger = logging.getLogger(__name__)
+
 
 class Headers(BaseHeaders):
     '''
     A wrapper around :class:`werkzeug.datastructures.Headers`, allowing
     to specify headers with options on initialization.
+
+    Headers are provided as keyword arguments while values can be either
+    :type:`str` (no options) or tuple of :type:`str` and :type:`dict`.
     '''
     snake_replace = staticmethod(re.compile(r'(^|-)[a-z]').sub)
 
     @classmethod
-    def genpair(cls, key, optkey, values):
+    def genpair(cls, key, value):
         '''
         Extract value and options from values dict based on given key and
         options-key.
 
         :param key: value key
         :type key: str
-        :param optkey: options key
-        :type optkey: str
-        :param values: value dictionary
-        :type values: dict
-        :returns: tuple of (key, value)
-        :rtype: tuple of str
-        '''
-        return (
-            cls.snake_replace(
-                lambda x: x.group(0).upper(),
-                key.replace('_', '-')
-                ),
-            dump_options_header(values[key], values.get(optkey, {})),
+        :param value: value or value/options pair
+        :type value: str or pair of (str, dict)
+        :returns: tuple with key and value
+        :rtype: tuple of (str, str)
+        '''
+        rkey = cls.snake_replace(
+            lambda x: x.group(0).upper(),
+            key.replace('_', '-')
+            )
+        rvalue = (
+            dump_header([value])
+            if isinstance(value, str) else
+            dump_options_header(*value)
             )
+        return rkey, rvalue
 
-    def __init__(self, options_suffix='_options', **kwargs):
+    def __init__(self, **kwargs):
         '''
-        :param options_suffix: suffix for header options (default: '_options')
-        :type options_suffix: str
-        :param **kwargs: headers as keyword arguments
+        :param **kwargs: header and values as keyword arguments
+        :type **kwargs: str or (str, dict)
         '''
         items = [
-            self.genpair(key, '%s%s' % (key, options_suffix), kwargs)
-            for key in kwargs
-            if not key.endswith(options_suffix)
+            self.genpair(key, value)
+            for key, value in kwargs.items()
             ]
         return super(Headers, self).__init__(items)
+
+
+class DataCookie(object):
+    '''
+    Compressed base64 paginated cookie manager.
+
+    Usage
+    -----
+
+    > from flask import Flask, request, make_response
+    >
+    > app = Flask(__name__)
+    > cookie = DataCookie('my-cookie')
+    >
+    > @app.route('/get')
+    > def get():
+    >     return 'Cookie value is %s' % cookie.load(request.cookies)
+    >
+    > @app.route('/set')
+    > def set():
+    >     response = make_response('Cookie set')
+    >     cookie.dump('setted', response, request.cookies)
+    >     return response
+
+    '''
+    NOT_FOUND = object()
+    cookie_path = '/'
+    page_digits = string.digits + string.ascii_letters
+    max_pages = 5
+    max_length = 3990
+    size_error = InvalidCookieSizeError
+    compress_fnc = staticmethod(zlib.compress)
+    decompress_fnc = staticmethod(zlib.decompress)
+    headers_class = BaseHeaders
+
+    def __init__(self, cookie_name, max_pages=None):
+        self.cookie_name = cookie_name
+        self.request_cache_field = '_browsepy.cache.cookie.%s' % cookie_name
+        self.max_pages = max_pages or self.max_pages
+
+    @classmethod
+    def _name_page(cls, page):
+        '''
+        Converts page integer to string, using fewer characters as possible.
+        If string is given, it is returned as is.
+
+        :param page: page number
+        :type page: int or str
+        :return: page id
+        :rtype: str
+        '''
+        if isinstance(page, str):
+            return page
+
+        digits = []
+
+        if page > 1:
+            base = len(cls.page_digits)
+            remaining = page - 1
+            while remaining >= base:
+                remaining, modulus = divmod(remaining, base)
+                digits.append(modulus)
+            digits.append(remaining)
+            digits.reverse()
+
+        return ''.join(map(cls.page_digits.__getitem__, digits))
+
+    def _name_cookie_page(self, page):
+        '''
+        Get name of cookie corresponding to given page.
+
+        By design (see :method:`_name_page`), pages lower than 1 results on
+        cookie names without a page name.
+
+        :param page: page number or name
+        :type page: int or str
+        :returns: cookie name
+        :rtype: str
+        '''
+        return '{}{}'.format(self.cookie_name, self._name_page(page))
+
+    def _available_cookie_size(self, name):
+        '''
+        Get available cookie size for value.
+        '''
+        return self.max_length - len(name + self.cookie_path)
+
+    def _extract_cookies(self, headers):
+        '''
+        Extract relevant cookies from headers.
+        '''
+        regex_page_name = '[%s]' % re.escape(self.page_digits)
+        regex = re.compile('^%s$' % self._name_cookie_page(regex_page_name))
+        return {
+            key: value
+            for header in headers.get_all('cookie')
+            for key, value in parse_cookie(header).items()
+            if regex.match(key)
+            }
+
+    def load_headers(self, headers):
+        '''
+        Parse data from relevant paginated cookie data on request headers.
+
+        :param headers: request headers
+        :type headers: werkzeug.http.Headers
+        :returns: deserialized value
+        :rtype: browsepy.abc.JSONSerializable
+        '''
+        cookies = self._extract_cookies(headers)
+        chunks = []
+        for i in range(self.max_pages):
+            name = self._name_cookie_page(i)
+            cookie = cookies.get(name, '').encode('ascii')
+            chunks.append(cookie)
+            if len(cookie) < self._available_cookie_size(name):
+                break
+        data = b''.join(chunks)
+        try:
+            data = base64.b64decode(data)
+            serialized = self.decompress_fnc(data)
+            return json.loads(serialized.decode('utf-8'))
+        except (json.JSONDecodeError, ValueError, TypeError):
+            return None
+
+    def dump_headers(self, data, headers=None):
+        '''
+        Serialize given object into a :class:`werkzeug.datastructures.Headers`
+        instance.
+
+        :param data: any json-serializable value
+        :type data: browsepy.abc.JSONSerializable
+        :param headers: optional request headers, used to truncate old pages
+        :type headers: werkzeug.http.Headers
+        :return: response headers
+        :rtype: werkzeug.http.Headers
+        '''
+        result = self.headers_class()
+        serialized = self.compress_fnc(json.dumps(data).encode('utf-8'))
+        data = base64.b64encode(serialized)
+        start = 0
+        total = len(data)
+        for i in range(self.max_pages):
+            name = self._name_cookie_page(i)
+            end = start + self._available_cookie_size(name)
+            result.set(name, data[start:end].decode('ascii'))
+            start = end
+            if start > total:
+                # incidentally, an empty page will be added after start == size
+                break
+        else:
+            # pages exhausted, limit reached
+            raise self.size_error(max_cookies=self.max_pages)
+
+        if headers:
+            result.extend(self.truncate_headers(headers, i + 1))
+
+        return headers
+
+    def truncate_headers(self, headers, start=0):
+        '''
+        Evict relevant cookies found on request headers, optionally starting
+        from a given page number.
+
+        :param headers: request headers, required to truncate old pages
+        :type headers: werkzeug.http.Headers
+        :param start: paginated cookie start, defaults to 0
+        :type start: int
+        :return: response headers
+        :rtype: werkzeug.http.Headers
+        '''
+        name_cookie = self._name_cookie_page
+        cookie_names = set(self._extract_cookies(headers))
+        cookie_names.difference_update(name_cookie(i) for i in range(start))
+
+        result = self.headers_class()
+        for name in cookie_names:
+            result.add('Set-Cookie', dump_cookie(name, expires=0))
+        return result
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index 753174e..b023cfa 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -6,25 +6,10 @@ import json
 import base64
 import logging
 import hashlib
-import functools
-
-try:
-    import lzma
-    LZMA_OPTIONS = {
-        'format': lzma.FORMAT_RAW,
-        'filters': [
-            {'id': lzma.FILTER_DELTA, 'dist': 5},
-            {'id': lzma.FILTER_LZMA2, 'preset': lzma.PRESET_DEFAULT},
-            ]
-        }
-    compress = functools.partial(lzma.compress, **LZMA_OPTIONS)
-    decompress = functools.partial(lzma.decompress, **LZMA_OPTIONS)
-except ImportError:
-    from zlib import compress, decompress
-
 
 from flask import request
-from browsepy.compat import range
+from browsepy.http import DataCookie
+from browsepy.exceptions import InvalidCookieSizeError
 
 from .exceptions import InvalidClipboardSizeError
 
@@ -36,11 +21,9 @@ class Clipboard(set):
     Clipboard (set) with convenience methods to pick its state from request
     cookies and save it to response cookies.
     '''
-    cookie_secret = os.urandom(256)
-    cookie_name = 'clipboard-{:x}'
-    cookie_path = '/'
+    data_cookie = DataCookie('clipboard', max_pages=20)
+    secret = os.urandom(256)
     request_cache_field = '_browsepy_file_actions_clipboard_cache'
-    max_pages = 20
 
     @classmethod
     def count(cls, request=request):
@@ -71,57 +54,15 @@ class Clipboard(set):
         self = cls()
         setattr(request, cls.request_cache_field, self)
         try:
-            self.__setstate__(cls._read_paginated_cookie(request))
+            self.__setstate__(cls.data_cookie.load_headers(request.headers))
         except BaseException:
             pass
         return self
 
-    @classmethod
-    def _paginated_cookie_length(cls, page=0):
-        name_fnc = cls.cookie_name.format
-        return 3990 - len(name_fnc(page) + cls.cookie_path)
-
-    @classmethod
-    def _read_paginated_cookie(cls, request=request):
-        chunks = []
-        if request:
-            name_fnc = cls.cookie_name.format
-            for i in range(cls.max_pages):  # 2 ** 32 - 1
-                cookie = request.cookies.get(name_fnc(i), '').encode('ascii')
-                chunks.append(cookie)
-                if len(cookie) < cls._paginated_cookie_length(i):
-                    break
-        serialized = decompress(base64.b64decode(b''.join(chunks)))
-        return json.loads(serialized.decode('utf-8'))
-
-    @classmethod
-    def _write_paginated_cookie(cls, data, response):
-        serialized = compress(json.dumps(data).encode('utf-8'))
-        data = base64.b64encode(serialized)
-        name_fnc = cls.cookie_name.format
-        start = 0
-        size = len(data)
-        for i in range(cls.max_pages):
-            end = cls._paginated_cookie_length(i)
-            response.set_cookie(name_fnc(i), data[start:end].decode('ascii'))
-            start = end
-            if start > size:  # we need an empty page after start == size
-                return i
-        raise InvalidClipboardSizeError(max_cookies=cls.max_pages)
-
-    @classmethod
-    def _delete_paginated_cookie(cls, response, start=0, request=request):
-        name_fnc = cls.cookie_name.format
-        for i in range(start, cls.max_pages):
-            name = name_fnc(i)
-            if name not in request.cookies:
-                break
-            response.set_cookie(name, '', expires=0)
-
     @classmethod
     def _signature(cls, items, method):
         serialized = json.dumps(items).encode('utf-8')
-        data = cls.cookie_secret + method.encode('utf-8') + serialized
+        data = cls.secret + method.encode('utf-8') + serialized
         return base64.b64encode(hashlib.sha512(data).digest()).decode('ascii')
 
     def __init__(self, iterable=(), mode='copy'):
@@ -151,8 +92,15 @@ class Clipboard(set):
         :param request: optional request, defaults to current flask request
         :type request: werkzeug.Request
         '''
-        start = 0
         if self:
             data = self.__getstate__()
-            start = self._write_paginated_cookie(data, response) + 1
-        self._delete_paginated_cookie(response, start, request)
+            try:
+                headers = self.data_cookie.dump_headers(data, request.headers)
+            except InvalidCookieSizeError as e:
+                raise InvalidClipboardSizeError(
+                    clipboard=self,
+                    max_cookies=e.max_cookies
+                    )
+        else:
+            headers = self.data_cookie.truncate_headers(request.headers)
+        response.headers.extend(headers)
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 82eb014..74dba56 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -10,6 +10,8 @@ import bs4
 import flask
 
 from werkzeug.utils import cached_property
+from werkzeug.http import Headers, parse_cookie, dump_cookie, \
+                          parse_options_header
 
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
@@ -17,21 +19,43 @@ import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
 import browsepy.file as browsepy_file
 import browsepy.manager as browsepy_manager
 import browsepy.exceptions as browsepy_exceptions
-import browsepy.compat as compat
 import browsepy
 
 
-class CookieProxy(object):
+class CookieHeaderMock(object):
+    @property
+    def cookies(self):
+        return {
+            key: value
+            for header in self.headers.get_all('Set-Cookie')
+            for key, value in parse_cookie(header).items()
+            if parse_options_header(header)[1].get('expire', 1) > 0
+            }
+
+    def __init__(self):
+        self.headers = Headers()
+
+    def set_cookie(self, name, value='', **kwargs):
+        self.headers.add('Set-Cookie', dump_cookie(name, value, **kwargs))
+        self.headers.add('Cookie', dump_cookie(name, value))
+
+
+class CookieProxy(CookieHeaderMock):
     def __init__(self, client):
         self._client = client
+        super(CookieProxy, self).__init__()
 
     @property
     def cookies(self):
-        return {
+        result = {
             cookie.name: cookie.value for cookie in self._client.cookie_jar
             }
+        result.update(super(CookieProxy, self).cookies)
+        return result
 
     def set_cookie(self, name, value, **kwargs):
+        super(CookieProxy, self).set_cookie(name, value, **kwargs)
+
         for cookie in self._client.cookie_jar:
             if cookie.name == name:
                 self._client.cookie_jar.clear(
@@ -40,17 +64,9 @@ class CookieProxy(object):
             self._client.environ_base['REMOTE_ADDR'], name, value, **kwargs)
 
 
-class RequestMock(object):
-    def __init__(self):
-        self.cookies = {}
-
+class RequestMock(CookieHeaderMock):
     def set_cookie(self, name, value, expires=sys.maxsize, **kwargs):
-        if isinstance(value, compat.bytes):
-            value = value.decode('utf-8')
-        if expires:
-            self.cookies[name] = value
-        elif name in self.cookies:
-            del self.cookies[name]
+        super(RequestMock, self).set_cookie(name, value, **kwargs)
         field = file_actions_clipboard.Clipboard.request_cache_field
         setattr(self, field, None)
 
@@ -515,14 +531,14 @@ class TestClipboard(unittest.TestCase):
             )
 
     def test_unreadable(self):
-        name = self.module.Clipboard.cookie_name.format(0)
+        name = self.module.Clipboard.data_cookie._name_cookie_page(0)
         request = RequestMock()
         request.set_cookie(name, 'a')
         clipboard = self.module.Clipboard.from_request(request)
         self.assertFalse(clipboard)
 
     def test_cookie_cleanup(self):
-        name = self.module.Clipboard.cookie_name.format(0)
+        name = self.module.Clipboard.data_cookie._name_cookie_page(0)
         request = RequestMock()
         request.set_cookie(name, 'value')
         clipboard = self.module.Clipboard()
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
new file mode 100644
index 0000000..0048651
--- /dev/null
+++ b/browsepy/tests/test_http.py
@@ -0,0 +1,28 @@
+
+import unittest
+
+import browsepy.http
+
+
+class TestHeaders(unittest.TestCase):
+    module = browsepy.http
+
+    def test_simple(self):
+        headers = self.module.Headers(
+            simple_header='something',
+            other_header='something else',
+            )
+        self.assertEqual(
+            headers.get('Simple-Header'),
+            'something',
+            )
+
+    def test_options(self):
+        headers = self.module.Headers(
+            option_header=('something', {'option': 1}),
+            other_header='something else',
+            )
+        self.assertEqual(
+            headers.get('Option-Header'),
+            'something; option=1',
+            )
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index c2e70ef..5914c8c 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -442,8 +442,8 @@ class TestApp(unittest.TestCase):
         self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(response.encoding, 'gzip')
         self.assertEqual(
-            [f.name for f in response.files],
-            ['testfile.%s' % x for x in ('bin', 'exc', 'txt')]
+            [f1.name for f1 in response.files],
+            ['testfile.%s' % x1 for x1 in ('bin', 'exc', 'txt')]
             )
 
         self.app.config['exclude_fnc'] = lambda p: p.endswith('.exc')
@@ -453,8 +453,8 @@ class TestApp(unittest.TestCase):
         self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(response.encoding, 'gzip')
         self.assertEqual(
-            [f.name for f in response.files],
-            ['testfile.%s' % x for x in ('bin', 'txt')]
+            [f2.name for f2 in response.files],
+            ['testfile.%s' % x2 for x2 in ('bin', 'txt')]
             )
 
         self.app.config['exclude_fnc'] = exclude
diff --git a/browsepy/tests/test_transform.py b/browsepy/tests/test_transform.py
index ac3a16b..ee48793 100755
--- a/browsepy/tests/test_transform.py
+++ b/browsepy/tests/test_transform.py
@@ -78,6 +78,7 @@ class TestGlob(unittest.TestCase):
                 '/a',
                 '/ñ',
                 '/1',
+                b'/\xc3\xa0',  # /à
                 ), (
                 '/_',
                 )),
-- 
GitLab


From 62b5b6078b190086664665a44f02253269bda72d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 10 May 2018 00:42:31 +0200
Subject: [PATCH 031/171] reduce complexity

---
 browsepy/__init__.py                      |  36 +++--
 browsepy/exceptions.py                    |   5 +-
 browsepy/http.py                          | 157 +++++++++++++---------
 browsepy/plugin/file_actions/__init__.py  |  10 +-
 browsepy/plugin/file_actions/clipboard.py |   6 +-
 browsepy/plugin/file_actions/tests.py     | 109 ++++++++-------
 6 files changed, 191 insertions(+), 132 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 51ce398..aa655bd 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -5,6 +5,8 @@ import logging
 import os
 import os.path
 
+from datetime import timedelta
+
 from flask import Response, request, render_template, redirect, \
                   url_for, send_from_directory, stream_with_context, \
                   make_response
@@ -56,7 +58,21 @@ if 'BROWSEPY_SETTINGS' in os.environ:
     app.config.from_envvar('BROWSEPY_SETTINGS')
 
 plugin_manager = PluginManager(app)
-sorting_cookie = DataCookie('browse-sorting')
+sorting_cookie = DataCookie('browse-sorting', max_age=timedelta(days=90))
+
+
+def iter_cookie_browse_sorting(cookies):
+    '''
+    Get sorting-cookie from cookies dictionary.
+
+    :yields: tuple of path and sorting property
+    :ytype: 2-tuple of strings
+    '''
+    try:
+        for path, prop in sorting_cookie.load_cookies(cookies, ()):
+            yield path, prop
+    except ValueError as e:
+        logger.exception(e)
 
 
 def get_cookie_browse_sorting(path, default):
@@ -67,12 +83,9 @@ def get_cookie_browse_sorting(path, default):
     :rtype: string
     '''
     if request:
-        try:
-            for cpath, cprop in sorting_cookie.load_headers(request.headers):
-                if path == cpath:
-                    return cprop
-        except BaseException:
-            pass
+        for cpath, cprop in iter_cookie_browse_sorting(request.cookies):
+            if path == cpath:
+                return cprop
     return default
 
 
@@ -156,16 +169,17 @@ def sort(property, path):
 
     data = [(path, property)]
     try:
-        data[:-1] = [
+        data.extend(
             (cpath, cprop)
-            for cpath, cprop in sorting_cookie.load_headers(request.headers)
+            for cpath, cprop in iter_cookie_browse_sorting(request.cookies)
             if cpath != path
-            ]
+            )
     except BaseException:
         pass
 
     # handle cookie becoming too large
-    while True:
+    headers = ()
+    while data:
         try:
             headers = sorting_cookie.dump_headers(data, request.headers)
             break
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index c72c3df..1ed1e9d 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -76,8 +76,9 @@ class InvalidCookieSizeError(ValueError):
     Exception raised when a paginated cookie exceeds its maximun page number.
     '''
     code = 'invalid-cookie-size'
-    template = 'Value too big to fit in {} cookies.'
+    template = 'Value too big to fit in {0.max_cookies} cookies.'
 
     def __init__(self, message=None, max_cookies=None):
         self.max_cookies = max_cookies
-        message = message or self.template.format(max_cookies=max_cookies)
+        message = self.template.format(self) if message is None else message
+        super(InvalidCookieSizeError, self).__init__(message)
diff --git a/browsepy/http.py b/browsepy/http.py
index f8140dd..052db6e 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -2,7 +2,6 @@
 # -*- coding: UTF-8 -*-
 
 import re
-import string
 import json
 import base64
 import logging
@@ -12,7 +11,7 @@ from werkzeug.http import dump_header, dump_options_header, dump_cookie, \
                           parse_cookie
 from werkzeug.datastructures import Headers as BaseHeaders
 
-from .compat import range, map
+from .compat import range
 from .exceptions import InvalidCookieSizeError
 
 
@@ -88,47 +87,44 @@ class DataCookie(object):
     >     return response
 
     '''
-    NOT_FOUND = object()
-    cookie_path = '/'
-    page_digits = string.digits + string.ascii_letters
-    max_pages = 5
-    max_length = 3990
+    page_length = 4000
     size_error = InvalidCookieSizeError
-    compress_fnc = staticmethod(zlib.compress)
-    decompress_fnc = staticmethod(zlib.decompress)
     headers_class = BaseHeaders
 
-    def __init__(self, cookie_name, max_pages=None):
-        self.cookie_name = cookie_name
-        self.request_cache_field = '_browsepy.cache.cookie.%s' % cookie_name
-        self.max_pages = max_pages or self.max_pages
-
-    @classmethod
-    def _name_page(cls, page):
+    @staticmethod
+    def _serialize(data):
         '''
-        Converts page integer to string, using fewer characters as possible.
-        If string is given, it is returned as is.
-
-        :param page: page number
-        :type page: int or str
-        :return: page id
-        :rtype: str
+        :type data: json-serializable
+        :rtype: bytes
         '''
-        if isinstance(page, str):
-            return page
+        serialized = zlib.compress(json.dumps(data).encode('utf-8'))
+        return base64.b64encode(serialized).decode('ascii')
 
-        digits = []
-
-        if page > 1:
-            base = len(cls.page_digits)
-            remaining = page - 1
-            while remaining >= base:
-                remaining, modulus = divmod(remaining, base)
-                digits.append(modulus)
-            digits.append(remaining)
-            digits.reverse()
+    @staticmethod
+    def _deserialize(data):
+        '''
+        :type data: bytes
+        :rtype: json-serializable
+        '''
+        decoded = base64.b64decode(data)
+        serialized = zlib.decompress(decoded)
+        return json.loads(serialized)
 
-        return ''.join(map(cls.page_digits.__getitem__, digits))
+    def __init__(self, cookie_name, max_pages=1, max_age=None, path='/'):
+        '''
+        :param cookie_name: first cookie name and prefix for the following
+        :type cookie_name: str
+        :param max_pages: maximum allowed cookie parts, defaults to 1
+        :type max_pages: int
+        :param max_age: cookie lifetime in seconds or None (session, default)
+        :type max_age: int, datetime.timedelta or None
+        :param path: cookie path, defaults to /
+        :type path: str
+        '''
+        self.cookie_name = cookie_name
+        self.max_pages = max_pages
+        self.max_age = max_age
+        self.path = path
 
     def _name_cookie_page(self, page):
         '''
@@ -142,20 +138,35 @@ class DataCookie(object):
         :returns: cookie name
         :rtype: str
         '''
-        return '{}{}'.format(self.cookie_name, self._name_page(page))
+        return '{}{}'.format(
+            self.cookie_name,
+            page if isinstance(page, str) else
+            '-{:x}'.format(page - 1) if page else
+            ''
+            )
 
     def _available_cookie_size(self, name):
         '''
         Get available cookie size for value.
+
+        :param name: cookie name
+        :type name: str
+        :return: available bytes for cookie value
+        :rtype: int
         '''
-        return self.max_length - len(name + self.cookie_path)
+        empty = 'Set-Cookie: %s' % dump_cookie(
+            name,
+            value=' ',  # force quotes
+            max_age=self.max_age,
+            path=self.path
+            )
+        return self.page_length - len(empty)
 
     def _extract_cookies(self, headers):
         '''
         Extract relevant cookies from headers.
         '''
-        regex_page_name = '[%s]' % re.escape(self.page_digits)
-        regex = re.compile('^%s$' % self._name_cookie_page(regex_page_name))
+        regex = re.compile('^%s$' % self._name_cookie_page('(-[0-9a-f])?'))
         return {
             key: value
             for header in headers.get_all('cookie')
@@ -163,16 +174,15 @@ class DataCookie(object):
             if regex.match(key)
             }
 
-    def load_headers(self, headers):
+    def load_cookies(self, cookies, default=None):
         '''
-        Parse data from relevant paginated cookie data on request headers.
+        Parse data from relevant paginated cookie data given as mapping.
 
-        :param headers: request headers
-        :type headers: werkzeug.http.Headers
+        :param cookies: request cookies
+        :type cookies: collections.abc.Mapping
         :returns: deserialized value
         :rtype: browsepy.abc.JSONSerializable
         '''
-        cookies = self._extract_cookies(headers)
         chunks = []
         for i in range(self.max_pages):
             name = self._name_cookie_page(i)
@@ -181,12 +191,24 @@ class DataCookie(object):
             if len(cookie) < self._available_cookie_size(name):
                 break
         data = b''.join(chunks)
-        try:
-            data = base64.b64decode(data)
-            serialized = self.decompress_fnc(data)
-            return json.loads(serialized.decode('utf-8'))
-        except (json.JSONDecodeError, ValueError, TypeError):
-            return None
+        if data:
+            try:
+                return self._deserialize(data)
+            except BaseException:
+                pass
+        return default
+
+    def load_headers(self, headers, default=None):
+        '''
+        Parse data from relevant paginated cookie data on request headers.
+
+        :param headers: request headers
+        :type headers: werkzeug.http.Headers
+        :returns: deserialized value
+        :rtype: browsepy.abc.JSONSerializable
+        '''
+        cookies = self._extract_cookies(headers)
+        return self.load_cookies(cookies)
 
     def dump_headers(self, data, headers=None):
         '''
@@ -201,26 +223,29 @@ class DataCookie(object):
         :rtype: werkzeug.http.Headers
         '''
         result = self.headers_class()
-        serialized = self.compress_fnc(json.dumps(data).encode('utf-8'))
-        data = base64.b64encode(serialized)
+        data = self._serialize(data)
         start = 0
-        total = len(data)
+        size = len(data)
         for i in range(self.max_pages):
             name = self._name_cookie_page(i)
             end = start + self._available_cookie_size(name)
-            result.set(name, data[start:end].decode('ascii'))
+            result.set(
+                'Set-Cookie',
+                dump_cookie(
+                    name,
+                    data[start:end],
+                    max_age=self.max_age,
+                    path=self.path,
+                    )
+                )
+            if end > size:
+                # incidentally, an empty page will be added after end == size
+                if headers:
+                    result.extend(self.truncate_headers(headers, i + 1))
+                return result
             start = end
-            if start > total:
-                # incidentally, an empty page will be added after start == size
-                break
-        else:
-            # pages exhausted, limit reached
-            raise self.size_error(max_cookies=self.max_pages)
-
-        if headers:
-            result.extend(self.truncate_headers(headers, i + 1))
-
-        return headers
+        # pages exhausted, limit reached
+        raise self.size_error(max_cookies=self.max_pages)
 
     def truncate_headers(self, headers, start=0):
         '''
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 5ce4393..fb27e36 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -18,6 +18,7 @@ from browsepy.exceptions import OutsideDirectoryBase
 from .clipboard import Clipboard
 from .exceptions import FileActionsException, \
                         InvalidClipboardItemsError, \
+                        InvalidClipboardModeError, \
                         InvalidDirnameError, \
                         DirectoryCreationError
 from .paste import paste_clipboard
@@ -100,13 +101,18 @@ def selection(path):
                 mode = action
                 break
 
+        clipboard = Clipboard(request.form.getlist('path'), mode)
+
         if mode in ('cut', 'copy'):
             response = redirect(url_for('browse', path=directory.urlpath))
-            clipboard = Clipboard(request.form.getlist('path'), mode)
             clipboard.to_response(response)
             return response
 
-        return redirect(request.path)
+        raise InvalidClipboardModeError(
+            path=directory.path,
+            clipboard=clipboard,
+            mode=clipboard.mode,
+            )
 
     clipboard = Clipboard.from_request()
     clipboard.mode = 'select'  # disables exclusion
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
index b023cfa..9c0f0b7 100644
--- a/browsepy/plugin/file_actions/clipboard.py
+++ b/browsepy/plugin/file_actions/clipboard.py
@@ -60,9 +60,9 @@ class Clipboard(set):
         return self
 
     @classmethod
-    def _signature(cls, items, method):
-        serialized = json.dumps(items).encode('utf-8')
-        data = cls.secret + method.encode('utf-8') + serialized
+    def _signature(cls, items, mode):
+        serialized = json.dumps([items, mode]).encode('utf-8')
+        data = cls.secret + serialized
         return base64.b64encode(hashlib.sha512(data).digest()).decode('ascii')
 
     def __init__(self, iterable=(), mode='copy'):
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 74dba56..ac91556 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -16,6 +16,7 @@ from werkzeug.http import Headers, parse_cookie, dump_cookie, \
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
 import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
+import browsepy.http as browsepy_http
 import browsepy.file as browsepy_file
 import browsepy.manager as browsepy_manager
 import browsepy.exceptions as browsepy_exceptions
@@ -23,11 +24,13 @@ import browsepy
 
 
 class CookieHeaderMock(object):
+    header = 'Cookie'
+
     @property
     def cookies(self):
         return {
             key: value
-            for header in self.headers.get_all('Set-Cookie')
+            for header in self.headers.get_all(self.header)
             for key, value in parse_cookie(header).items()
             if parse_options_header(header)[1].get('expire', 1) > 0
             }
@@ -36,39 +39,31 @@ class CookieHeaderMock(object):
         self.headers = Headers()
 
     def set_cookie(self, name, value='', **kwargs):
-        self.headers.add('Set-Cookie', dump_cookie(name, value, **kwargs))
-        self.headers.add('Cookie', dump_cookie(name, value))
-
-
-class CookieProxy(CookieHeaderMock):
-    def __init__(self, client):
-        self._client = client
-        super(CookieProxy, self).__init__()
+        self.headers.add(self.header, dump_cookie(name, value))
 
-    @property
-    def cookies(self):
-        result = {
-            cookie.name: cookie.value for cookie in self._client.cookie_jar
-            }
-        result.update(super(CookieProxy, self).cookies)
-        return result
 
-    def set_cookie(self, name, value, **kwargs):
-        super(CookieProxy, self).set_cookie(name, value, **kwargs)
+class ResponseMock(CookieHeaderMock):
+    header = 'Set-Cookie'
 
-        for cookie in self._client.cookie_jar:
-            if cookie.name == name:
-                self._client.cookie_jar.clear(
+    def dump_cookies(self, client):
+        owned = self.cookies
+        for cookie in client.cookie_jar:
+            if cookie.name in owned:
+                client.cookie_jar.clear(
                     cookie.domain, cookie.path, cookie.name)
-        return self._client.set_cookie(
-            self._client.environ_base['REMOTE_ADDR'], name, value, **kwargs)
+
+        for name, value in owned.items():
+            client.set_cookie(client.environ_base['REMOTE_ADDR'], name, value)
 
 
 class RequestMock(CookieHeaderMock):
-    def set_cookie(self, name, value, expires=sys.maxsize, **kwargs):
-        super(RequestMock, self).set_cookie(name, value, **kwargs)
-        field = file_actions_clipboard.Clipboard.request_cache_field
-        setattr(self, field, None)
+    def load_cookies(self, client):
+        self.headers.clear()
+        for cookie in client.cookie_jar:
+            self.headers.add(
+                self.header,
+                dump_cookie(cookie.name, cookie.value)
+                )
 
 
 class Page(object):
@@ -201,11 +196,14 @@ class TestIntegration(unittest.TestCase):
                     page.widgets
                     )
 
-            proxy = CookieProxy(client)
-            clipboard = self.clipboard_module.Clipboard.from_request(proxy)
+            reqmock = RequestMock()
+            reqmock.load_cookies(client)
+            resmock = ResponseMock()
+            clipboard = self.clipboard_module.Clipboard.from_request(reqmock)
             clipboard.mode = 'copy'
             clipboard.add('whatever')
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
@@ -253,19 +251,23 @@ class TestIntegration(unittest.TestCase):
             page = Page(response.data)
             self.assertIn('potato', page.entries)
 
-            proxy = CookieProxy(client)
-            clipboard = self.clipboard_module.Clipboard.from_request(proxy)
+            reqmock = RequestMock()
+            reqmock.load_cookies(client)
+            resmock = ResponseMock()
+            clipboard = self.clipboard_module.Clipboard.from_request(reqmock)
             clipboard.mode = 'copy'
             clipboard.add('potato')
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
             page = Page(response.data)
             self.assertIn('potato', page.entries)
 
+            reqmock.load_cookies(client)
             clipboard.mode = 'cut'
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
 
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
@@ -431,35 +433,43 @@ class TestAction(unittest.TestCase):
             self.assertEqual(response.status_code, 404)
 
         with self.app.test_client() as client:
-            proxy = CookieProxy(client)
-            clipboard = self.clipboard_module.Clipboard.from_request(proxy)
+            reqmock = RequestMock()
+            reqmock.load_cookies(client)
+            resmock = ResponseMock()
+            clipboard = self.clipboard_module.Clipboard.from_request(reqmock)
             clipboard.mode = 'wrong-mode'
             clipboard.add('whatever')
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
+            reqmock.load_cookies(client)
             clipboard.mode = 'cut'
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 302)  # same location
 
             clipboard.mode = 'cut'
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 400)
 
             clipboard.mode = 'copy'
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
             clipboard.mode = 'copy'
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 400)
@@ -467,13 +477,15 @@ class TestAction(unittest.TestCase):
             self.app.config['exclude_fnc'] = lambda n: n.endswith('whatever')
 
             clipboard.mode = 'cut'
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
             clipboard.mode = 'copy'
-            clipboard.to_response(proxy, proxy)
+            clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
@@ -504,19 +516,20 @@ class TestClipboard(unittest.TestCase):
     module = file_actions_clipboard
 
     def test_count(self):
-        request = RequestMock()
-        self.assertEqual(self.module.Clipboard.count(request), 0)
+        reqmock = RequestMock()
+        resmock = ResponseMock()
+        self.assertEqual(self.module.Clipboard.count(resmock), 0)
 
         clipboard = self.module.Clipboard()
         clipboard.mode = 'test'
         clipboard.add('item')
-        clipboard.to_response(request, request)
+        clipboard.to_response(resmock, reqmock)
 
-        self.assertEqual(self.module.Clipboard.count(request), 1)
+        self.assertEqual(self.module.Clipboard.count(resmock), 1)
 
     def test_oveflow(self):
         class TinyClipboard(self.module.Clipboard):
-            max_pages = 2
+            data_cookie = browsepy_http.DataCookie('small-clipboard')
 
         request = RequestMock()
         clipboard = TinyClipboard()
-- 
GitLab


From cc842cbc901b9522dee75b706ba9268095e1e067 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 23 May 2018 20:50:51 +0200
Subject: [PATCH 032/171] wip

---
 browsepy/plugin/file_actions/tests.py | 112 ++++++++++++++++++++------
 browsepy/tests/test_http.py           |  30 +++++++
 2 files changed, 118 insertions(+), 24 deletions(-)

diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index ac91556..4f5773b 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -3,15 +3,15 @@ import tempfile
 import shutil
 import os
 import os.path
-import sys
 import functools
+import datetime
 
 import bs4
 import flask
 
 from werkzeug.utils import cached_property
 from werkzeug.http import Headers, parse_cookie, dump_cookie, \
-                          parse_options_header
+                          parse_options_header, parse_date
 
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
@@ -25,45 +25,103 @@ import browsepy
 
 class CookieHeaderMock(object):
     header = 'Cookie'
+    def parse_cookie(self, header):
+        cookies = parse_cookie(header)
+        if len(cookies) != 1:
+            # multi-cookie header (Cookie), no options
+            return cookies, {}
+        name, value = tuple(cookies.items())[0]
+        cookie, _ = parse_options_header(header)
+        extra = header[len(cookie):]
+
+        for part in .split('; '):
+
+            if part.startswith('Expires='):
+                expire = part[8:].replace('"', '')
+                options['expires'] = parse_date(expire)
+
+
+    def check_expired(self, options):
+
+                    if expire and < datetime.datetime.now():
+                        return True
+
+    def check_expired(self, header):
+
+
+
+        cookie, options = parse_options_header(header)
+        if 'Expires' in options:  # implies Set-Cookie
+
+        if options.get('Max-Age', '1') == '0':
+            return True
+        return False
+
+    @property
+    def _cookies(self):
+        check_expired = self.check_expired
+        return [
+            (name, value, check_expired(header))
+            for header in self.headers.get_all(self.header)
+            for name, value in parse_cookie(header).items()
+            ]
 
     @property
     def cookies(self):
         return {
-            key: value
-            for header in self.headers.get_all(self.header)
-            for key, value in parse_cookie(header).items()
-            if parse_options_header(header)[1].get('expire', 1) > 0
+            name: value
+            for name, value, expired in self._cookies
+            if not expired
             }
 
     def __init__(self):
         self.headers = Headers()
 
     def set_cookie(self, name, value='', **kwargs):
-        self.headers.add(self.header, dump_cookie(name, value))
+        owned = [
+            for name, value, expires in self._cookies
+            if name != name
+            ]
+
+
+        for name, value in owned.items():
+            self.headers.add(self.header, dump_cookie(name, value, **kwargs))
+
+    def clear(self):
+        self.headers.clear()
 
 
 class ResponseMock(CookieHeaderMock):
     header = 'Set-Cookie'
 
     def dump_cookies(self, client):
-        owned = self.cookies
-        for cookie in client.cookie_jar:
-            if cookie.name in owned:
-                client.cookie_jar.clear(
-                    cookie.domain, cookie.path, cookie.name)
-
-        for name, value in owned.items():
-            client.set_cookie(client.environ_base['REMOTE_ADDR'], name, value)
+        owned = self._cookies
+        if isinstance(client, CookieHeaderMock):
+            client.clear()
+            for name, value in owned.items():
+                client.set_cookie(name, value)
+        else:
+            for cookie in client.cookie_jar:
+                if cookie.name in owned:
+                    client.cookie_jar.clear(
+                        cookie.domain, cookie.path, cookie.name)
+
+            for name, value in owned.items():
+                client.set_cookie(
+                    client.environ_base['REMOTE_ADDR'], name, value)
 
 
 class RequestMock(CookieHeaderMock):
     def load_cookies(self, client):
-        self.headers.clear()
+        self.clear()
+
         for cookie in client.cookie_jar:
-            self.headers.add(
-                self.header,
-                dump_cookie(cookie.name, cookie.value)
-                )
+            self.set_cookie(cookie.name, cookie.value)
+
+    def uncache(self):
+        field = file_actions_clipboard.Clipboard.request_cache_field
+        if hasattr(self, field):
+            delattr(self, field)
 
 
 class Page(object):
@@ -500,6 +558,7 @@ class TestAction(unittest.TestCase):
                 '/file-actions/selection',
                 data={
                     'path': files,
+                    'action-copy': 'whatever',
                     })
             self.assertEqual(response.status_code, 302)
 
@@ -518,14 +577,16 @@ class TestClipboard(unittest.TestCase):
     def test_count(self):
         reqmock = RequestMock()
         resmock = ResponseMock()
-        self.assertEqual(self.module.Clipboard.count(resmock), 0)
+        self.assertEqual(self.module.Clipboard.count(reqmock), 0)
 
         clipboard = self.module.Clipboard()
         clipboard.mode = 'test'
         clipboard.add('item')
         clipboard.to_response(resmock, reqmock)
+        resmock.dump_cookies(reqmock)
+        reqmock.uncache()
 
-        self.assertEqual(self.module.Clipboard.count(resmock), 1)
+        self.assertEqual(self.module.Clipboard.count(reqmock), 1)
 
     def test_oveflow(self):
         class TinyClipboard(self.module.Clipboard):
@@ -554,9 +615,12 @@ class TestClipboard(unittest.TestCase):
         name = self.module.Clipboard.data_cookie._name_cookie_page(0)
         request = RequestMock()
         request.set_cookie(name, 'value')
+        response = ResponseMock()
+        response.set_cookie(name, 'value')
         clipboard = self.module.Clipboard()
-        clipboard.to_response(request, request)
-        self.assertNotIn(name, request.cookies)
+        clipboard.to_response(response, request)
+        print(response.headers)
+        self.assertNotIn(name, response.cookies)
 
 
 class TestException(unittest.TestCase):
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
index 0048651..ebd2d84 100644
--- a/browsepy/tests/test_http.py
+++ b/browsepy/tests/test_http.py
@@ -1,8 +1,34 @@
 
+import re
 import unittest
+import datetime
+
+import werkzeug
 
 import browsepy.http
 
+resc = re.compile(r'^((?P<key>[^=;]+)(=(?P<value>[^;]+))?(;|$))')
+
+def parse_set_cookies(headers, dt=None):
+    '''
+    :param headers: header structure
+    :type headers: werkzeug.http.Headers
+    '''
+    if dt is None:
+        dt = datetime.datetime.now()
+    cookies = {}
+    for value in headers.get_all('Set-Cookie'):
+        items = [match.groupdict() for match in resc.finditer(value)]
+        name = items[0]['key']
+        options = {
+            item['key'].strip(): item['value'].strip()
+            for item in item
+            }
+        if 'expires' in options:
+            options['expires'] = werkzeug.parse_date(options['expires'])
+
+
+
 
 class TestHeaders(unittest.TestCase):
     module = browsepy.http
@@ -26,3 +52,7 @@ class TestHeaders(unittest.TestCase):
             headers.get('Option-Header'),
             'something; option=1',
             )
+
+
+class TestDataCookie(unittest.TestCase):
+    pass
-- 
GitLab


From 6140e3c4f0d7b3d8e1763d289ef96491fd8df971 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 24 May 2018 01:37:01 +0200
Subject: [PATCH 033/171] implement set_cookie_parser, add pycodestyle
 unittest, disable flake8 pycodestyle

---
 Makefile                              |  4 +-
 browsepy/http.py                      | 53 ++++++++++++++++-
 browsepy/plugin/file_actions/tests.py | 83 +++++++++++----------------
 browsepy/tests/test_code_quality.py   | 65 +++++++++++++++++++++
 browsepy/tests/test_http.py           | 65 +++++++++++++++------
 requirements/development.txt          |  2 +-
 setup.cfg                             |  2 +-
 setup.py                              |  3 +
 8 files changed, 206 insertions(+), 71 deletions(-)
 create mode 100644 browsepy/tests/test_code_quality.py

diff --git a/Makefile b/Makefile
index 1355301..828e39c 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,11 @@ showdoc: doc
 eslint:
 	eslint ${CURDIR}/browsepy
 
-pep8:
+pycodestyle:
 	pycodestyle --show-source browsepy
 	pycodestyle --show-source setup.py
 
-pycodestyle: pep8
+pep8: pycodestyle
 
 flake8:
 	flake8 --show-source browsepy
diff --git a/browsepy/http.py b/browsepy/http.py
index 052db6e..74a169b 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -8,7 +8,7 @@ import logging
 import zlib
 
 from werkzeug.http import dump_header, dump_options_header, dump_cookie, \
-                          parse_cookie
+                          parse_cookie, parse_date
 from werkzeug.datastructures import Headers as BaseHeaders
 
 from .compat import range
@@ -267,3 +267,54 @@ class DataCookie(object):
         for name in cookie_names:
             result.add('Set-Cookie', dump_cookie(name, expires=0))
         return result
+
+
+def parse_set_cookie_option(name, value):
+    '''
+    Parse Set-Cookie header option (acepting option 'value' as cookie value),
+    both name and value.
+
+    Resulting names are compatible as :func:`werkzeug.http.dump_cookie`
+    keyword arguments.
+
+    :param name: option name
+    :type name: str
+    :param value: option value
+    :type value: str
+    :returns: tuple of parsed name and option, or None if name is unknown
+    :rtype: tuple of str or None
+    '''
+    try:
+        if name == 'Max-Age':
+            return 'max_age', int(value)
+        if name == 'Expires':
+            return 'expires', parse_date(value)
+        if name in ('value', 'Path', 'Domain', 'SameSite'):
+            return name.lower(), value
+        if name in ('Secure', 'HttpOnly'):
+            return name.lower(), True
+    except (AttributeError, ValueError, TypeError):
+        pass
+    except BaseException as e:
+        logger.exception(e)
+
+
+re_parse_set_cookie = re.compile(r'([^=;]+)(?:=([^;]*))?(?:$|;\s*)')
+
+
+def parse_set_cookie(header, option_parse_fnc=parse_set_cookie_option):
+    '''
+    Parse the content of a Set-Type HTTP header.
+
+    Result options are compatible as :func:`werkzeug.http.dump_cookie`
+    keyword arguments.
+
+    :param header: Set-Cookie header value
+    :type header: str
+    :returns: tuple with cookie name and its options
+    :rtype: tuple of str and dict
+    '''
+    pairs = re_parse_set_cookie.findall(header)
+    name, value = pairs[0]
+    pairs[0] = ('value', parse_cookie('v=%s' % value).get('v', None))
+    return name, dict(filter(None, (option_parse_fnc(*p) for p in pairs)))
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 4f5773b..023439d 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -10,8 +10,7 @@ import bs4
 import flask
 
 from werkzeug.utils import cached_property
-from werkzeug.http import Headers, parse_cookie, dump_cookie, \
-                          parse_options_header, parse_date
+from werkzeug.http import Headers, parse_cookie, dump_cookie
 
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
@@ -25,67 +24,47 @@ import browsepy
 
 class CookieHeaderMock(object):
     header = 'Cookie'
-    def parse_cookie(self, header):
-        cookies = parse_cookie(header)
-        if len(cookies) != 1:
-            # multi-cookie header (Cookie), no options
-            return cookies, {}
-        name, value = tuple(cookies.items())[0]
-        cookie, _ = parse_options_header(header)
-        extra = header[len(cookie):]
-
-        for part in .split('; '):
-
-            if part.startswith('Expires='):
-                expire = part[8:].replace('"', '')
-                options['expires'] = parse_date(expire)
-
-
-    def check_expired(self, options):
-
-                    if expire and < datetime.datetime.now():
-                        return True
-
-    def check_expired(self, header):
-
-
-
-        cookie, options = parse_options_header(header)
-        if 'Expires' in options:  # implies Set-Cookie
-
-        if options.get('Max-Age', '1') == '0':
-            return True
-        return False
 
     @property
     def _cookies(self):
-        check_expired = self.check_expired
         return [
-            (name, value, check_expired(header))
+            (name, {'value': value})
             for header in self.headers.get_all(self.header)
             for name, value in parse_cookie(header).items()
             ]
 
     @property
     def cookies(self):
+        is_valid = self.valid
         return {
-            name: value
-            for name, value, expired in self._cookies
-            if not expired
+            name: options.get('value')
+            for name, options in self._cookies
+            if is_valid(options)
             }
 
+    def valid(self, cookie_options):
+        dt = datetime.datetime.now()
+        return (
+            cookie_options.get('max_age', 1) > 0 and
+            cookie_options.get('expiration', dt) >= dt
+            )
+
     def __init__(self):
         self.headers = Headers()
 
+    def add_cookie(self, name, value='', **kwargs):
+        self.headers.add(self.header, dump_cookie(name, value, **kwargs))
+
     def set_cookie(self, name, value='', **kwargs):
         owned = [
-            for name, value, expires in self._cookies
+            (name, options)
+            for name, options in self._cookies
             if name != name
             ]
-
-
-        for name, value in owned.items():
-            self.headers.add(self.header, dump_cookie(name, value, **kwargs))
+        self.clear()
+        for name, options in owned:
+            self.headers.add(self.header, dump_cookie(name, **options))
+        self.add_cookie(name, value, **kwargs)
 
     def clear(self):
         self.headers.clear()
@@ -94,21 +73,27 @@ class CookieHeaderMock(object):
 class ResponseMock(CookieHeaderMock):
     header = 'Set-Cookie'
 
+    @property
+    def _cookies(self):
+        return [
+            browsepy_http.parse_set_cookie(header)
+            for header in self.headers.get_all(self.header)
+            ]
+
     def dump_cookies(self, client):
         owned = self._cookies
         if isinstance(client, CookieHeaderMock):
             client.clear()
-            for name, value in owned.items():
-                client.set_cookie(name, value)
+            for name, options in owned:
+                client.add_cookie(name, **options)
         else:
             for cookie in client.cookie_jar:
-                if cookie.name in owned:
-                    client.cookie_jar.clear(
+                client.cookie_jar.clear(
                         cookie.domain, cookie.path, cookie.name)
 
-            for name, value in owned.items():
+            for name, options in owned:
                 client.set_cookie(
-                    client.environ_base['REMOTE_ADDR'], name, value)
+                    client.environ_base['REMOTE_ADDR'], name, **options)
 
 
 class RequestMock(CookieHeaderMock):
diff --git a/browsepy/tests/test_code_quality.py b/browsepy/tests/test_code_quality.py
new file mode 100644
index 0000000..f23029c
--- /dev/null
+++ b/browsepy/tests/test_code_quality.py
@@ -0,0 +1,65 @@
+import re
+import os.path
+import unittest
+import pycodestyle
+import functools
+
+
+class DeferredReport(pycodestyle.StandardReport):
+    def __init__(self, *args, **kwargs):
+        self.print_fnc = kwargs.pop('print_fnc')
+        super(DeferredReport, self).__init__(*args, **kwargs)
+
+    def get_file_results(self):
+        self._deferred_print.sort()
+        for line_number, offset, code, text, doc in self._deferred_print:
+            error = {
+                'path': self.filename,
+                'row': self.line_offset + line_number,
+                'col': offset + 1,
+                'code': code,
+                'text': text,
+                }
+            lines = [self._fmt % error]
+            if line_number <= len(self.lines):
+                line = self.lines[line_number - 1]
+                lines.extend((
+                    line.rstrip(),
+                    re.sub(r'\S', ' ', line[:offset]) + '^'
+                    ))
+            if doc:
+                lines.append('    ' + doc.strip())
+            error['message'] = '\n'.join(lines)
+            self.print_fnc(error)
+        return self.file_errors
+
+
+class TestCodeQuality(unittest.TestCase):
+    base = os.path.join(
+        os.path.dirname(__file__),
+        os.path.pardir,
+        )
+    setup_py = os.path.join(base, '..', 'setup.py')
+    config_file = os.path.join(base, '..', 'setup.cfg')
+
+    def test_conformance(self):
+        '''
+        Test pep-8 conformance
+        '''
+        messages = []
+        style = pycodestyle.StyleGuide(
+            config_file=self.config_file,
+            paths=[self.base, self.setup_py],
+            reporter=functools.partial(
+                DeferredReport,
+                print_fnc=messages.append
+                )
+            )
+        result = style.check_files()
+        text = ''.join(
+            '%s\n    %s' % ('' if n else '\n', line)
+            for message in messages
+            for n, line in enumerate(message['message'].splitlines())
+            )
+        self.assertEqual(
+            result.total_errors, 0, "Code style errors:%s" % text)
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
index ebd2d84..30f1177 100644
--- a/browsepy/tests/test_http.py
+++ b/browsepy/tests/test_http.py
@@ -1,33 +1,64 @@
 
 import re
+import logging
 import unittest
-import datetime
 
 import werkzeug
 
 import browsepy.http
 
-resc = re.compile(r'^((?P<key>[^=;]+)(=(?P<value>[^;]+))?(;|$))')
+logger = logging.getLogger(__name__)
+rct = re.compile(
+    r'([^=;]+)(?:=([^;]*))?\s*(?:$|;\s+)'
+    )
 
-def parse_set_cookies(headers, dt=None):
+
+def parse_set_cookie_option(name, value):
     '''
-    :param headers: header structure
-    :type headers: werkzeug.http.Headers
+    Parse Set-Cookie header option (acepting option 'value' as cookie value),
+    both name and value.
+
+    Resulting names are compatible as :func:`werkzeug.http.dump_cookie`
+    keyword arguments.
+
+    :param name: option name
+    :type name: str
+    :param value: option value
+    :type value: str
+    :returns: tuple of parsed name and option, or None if name is unknown
+    :rtype: tuple of str or None
     '''
-    if dt is None:
-        dt = datetime.datetime.now()
-    cookies = {}
-    for value in headers.get_all('Set-Cookie'):
-        items = [match.groupdict() for match in resc.finditer(value)]
-        name = items[0]['key']
-        options = {
-            item['key'].strip(): item['value'].strip()
-            for item in item
-            }
-        if 'expires' in options:
-            options['expires'] = werkzeug.parse_date(options['expires'])
+    try:
+        if name == 'Max-Age':
+            return 'max_age', int(value)
+        if name == 'Expires':
+            return 'expires', werkzeug.parse_date(value)
+        if name in ('value', 'Path', 'Domain', 'SameSite'):
+            return name.lower(), value
+        if name in ('Secure', 'HttpOnly'):
+            return name.lower(), True
+    except (AttributeError, ValueError, TypeError):
+        pass
+    except BaseException as e:
+        logger.exception(e)
 
 
+def parse_set_cookie(header, option_parse_fnc=parse_set_cookie_option):
+    '''
+    Parse the content of a Set-Type HTTP header.
+
+    Result options are compatible as :func:`werkzeug.http.dump_cookie`
+    keyword arguments.
+
+    :param header: Set-Cookie header value
+    :type header: str
+    :returns: tuple with cookie name and its options
+    :rtype: tuple of str and dict
+    '''
+    pairs = rct.findall(header)
+    name, value = pairs[0]
+    pairs[0] = ('value', werkzeug.parse_cookie('v=%s' % value).get('v', None))
+    return name, dict(filter(None, (option_parse_fnc(*p) for p in pairs)))
 
 
 class TestHeaders(unittest.TestCase):
diff --git a/requirements/development.txt b/requirements/development.txt
index ce54672..4fe96a5 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -25,7 +25,7 @@
 
 setuptools
 wheel
-pycodestyle<2.4.0
+pycodestyle
 flake8
 coverage
 pyaml
diff --git a/setup.cfg b/setup.cfg
index 451da18..76001e3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ tag_build =
 ignore = E123,E126,E121,W504
 
 [flake8]
-ignore = E123,E126,E121,W504
+select = F,C
 max-complexity = 9
 
 [yapf]
diff --git a/setup.py b/setup.py
index b2d0ef7..4b540b5 100644
--- a/setup.py
+++ b/setup.py
@@ -108,6 +108,9 @@ setup(
     install_requires=(
         ['flask', 'unicategories'] + extra_requires
         ),
+    extras_require={
+        'tests': ['beautifulsoup4'],
+        },
     tests_require=['beautifulsoup4'],
     test_suite='browsepy.tests',
     test_runner='browsepy.tests.runner:DebuggerTextTestRunner',
-- 
GitLab


From 0a393e64d6c0da55a6cda05d2d3be135ed731866 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 24 May 2018 19:16:29 +0200
Subject: [PATCH 034/171] fixes

---
 Makefile                    |   6 +-
 browsepy/http.py            |   2 +-
 browsepy/tests/test_http.py | 112 +++++++++++++++++-------------------
 setup.cfg                   |   2 +
 4 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/Makefile b/Makefile
index 828e39c..527050e 100644
--- a/Makefile
+++ b/Makefile
@@ -42,14 +42,12 @@ eslint:
 	eslint ${CURDIR}/browsepy
 
 pycodestyle:
-	pycodestyle --show-source browsepy
-	pycodestyle --show-source setup.py
+	pycodestyle browsepy setup.py
 
 pep8: pycodestyle
 
 flake8:
-	flake8 --show-source browsepy
-	flake8 --show-source setup.py
+	flake8 browsepy setup.py
 
 coverage:
 	coverage run --source=browsepy setup.py test
diff --git a/browsepy/http.py b/browsepy/http.py
index 74a169b..e482d7c 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -229,7 +229,7 @@ class DataCookie(object):
         for i in range(self.max_pages):
             name = self._name_cookie_page(i)
             end = start + self._available_cookie_size(name)
-            result.set(
+            result.add(
                 'Set-Cookie',
                 dump_cookie(
                     name,
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
index 30f1177..3226f10 100644
--- a/browsepy/tests/test_http.py
+++ b/browsepy/tests/test_http.py
@@ -1,65 +1,11 @@
 
-import re
-import logging
+import os
 import unittest
-
-import werkzeug
+import datetime
+import base64
 
 import browsepy.http
 
-logger = logging.getLogger(__name__)
-rct = re.compile(
-    r'([^=;]+)(?:=([^;]*))?\s*(?:$|;\s+)'
-    )
-
-
-def parse_set_cookie_option(name, value):
-    '''
-    Parse Set-Cookie header option (acepting option 'value' as cookie value),
-    both name and value.
-
-    Resulting names are compatible as :func:`werkzeug.http.dump_cookie`
-    keyword arguments.
-
-    :param name: option name
-    :type name: str
-    :param value: option value
-    :type value: str
-    :returns: tuple of parsed name and option, or None if name is unknown
-    :rtype: tuple of str or None
-    '''
-    try:
-        if name == 'Max-Age':
-            return 'max_age', int(value)
-        if name == 'Expires':
-            return 'expires', werkzeug.parse_date(value)
-        if name in ('value', 'Path', 'Domain', 'SameSite'):
-            return name.lower(), value
-        if name in ('Secure', 'HttpOnly'):
-            return name.lower(), True
-    except (AttributeError, ValueError, TypeError):
-        pass
-    except BaseException as e:
-        logger.exception(e)
-
-
-def parse_set_cookie(header, option_parse_fnc=parse_set_cookie_option):
-    '''
-    Parse the content of a Set-Type HTTP header.
-
-    Result options are compatible as :func:`werkzeug.http.dump_cookie`
-    keyword arguments.
-
-    :param header: Set-Cookie header value
-    :type header: str
-    :returns: tuple with cookie name and its options
-    :rtype: tuple of str and dict
-    '''
-    pairs = rct.findall(header)
-    name, value = pairs[0]
-    pairs[0] = ('value', werkzeug.parse_cookie('v=%s' % value).get('v', None))
-    return name, dict(filter(None, (option_parse_fnc(*p) for p in pairs)))
-
 
 class TestHeaders(unittest.TestCase):
     module = browsepy.http
@@ -85,5 +31,55 @@ class TestHeaders(unittest.TestCase):
             )
 
 
+class TestParseSetCookie(unittest.TestCase):
+    module = browsepy.http
+
+    def test_parse(self):
+        tests = {
+            'value-cookie=value': {
+                'name': 'value-cookie',
+                'value': 'value',
+                },
+            'expiration-cookie=value; Expires=Thu, 24 May 2018 18:10:26 GMT': {
+                'name': 'expiration-cookie',
+                'value': 'value',
+                'expires': datetime.datetime(2018, 5, 24, 18, 10, 26),
+                },
+            'maxage-cookie="value with spaces"; Max-Age=0': {
+                'name': 'maxage-cookie',
+                'value': 'value with spaces',
+                'max_age': 0,
+                },
+            'secret-cookie; HttpOnly; Secure': {
+                'name': 'secret-cookie',
+                'value': '',
+                'httponly': True,
+                'secure': True,
+                },
+            'spaced name=value': {
+                'name': 'spaced name',
+                'value': 'value',
+                },
+            }
+        for cookie, data in tests.items():
+            name, parsed = self.module.parse_set_cookie(cookie)
+            parsed['name'] = name
+            self.assertEquals(parsed, data)
+
+
 class TestDataCookie(unittest.TestCase):
-    pass
+    module = browsepy.http
+    manager_cls = module.DataCookie
+
+    def random_text(self, size=2):
+        bytedata = base64.b64encode(os.urandom(size))
+        return bytedata.decode('ascii')[:size]
+
+    def test_pagination(self):
+        data = self.random_text(self.manager_cls.page_length)
+        manager = self.manager_cls('cookie', max_pages=3)
+        headers = manager.dump_headers(data)
+        print(headers)
+        self.assertEqual(len(headers), 2)
+        self.assertEqual(manager.load_headers(headers), data)
+
diff --git a/setup.cfg b/setup.cfg
index 76001e3..57e5abb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,11 +8,13 @@ universal = 1
 tag_build =
 
 [pycodestyle]
+show-source = True
 ignore = E123,E126,E121,W504
 
 [flake8]
 select = F,C
 max-complexity = 9
+show-source = True
 
 [yapf]
 align_closing_bracket_with_visual_indent = true
-- 
GitLab


From 4cf75428feb0f903e4086f16a26aebb9c1071347 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 26 May 2018 19:38:25 +0200
Subject: [PATCH 035/171] datacookie tests and fixes

---
 browsepy/http.py                    | 140 ++++++++++++++++------------
 browsepy/tests/test_code_quality.py |  10 +-
 browsepy/tests/test_http.py         |  74 +++++++++++++--
 3 files changed, 154 insertions(+), 70 deletions(-)

diff --git a/browsepy/http.py b/browsepy/http.py
index e482d7c..664efd0 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -87,9 +87,10 @@ class DataCookie(object):
     >     return response
 
     '''
-    page_length = 4000
     size_error = InvalidCookieSizeError
     headers_class = BaseHeaders
+    header_max_size = 4096
+    header_initial_size = len('Set-Cookie: ')
 
     @staticmethod
     def _serialize(data):
@@ -110,21 +111,44 @@ class DataCookie(object):
         serialized = zlib.decompress(decoded)
         return json.loads(serialized)
 
-    def __init__(self, cookie_name, max_pages=1, max_age=None, path='/'):
+    def __init__(self, cookie_name, max_pages=1,
+                 max_age=None, expires=None, path='/',
+                 domain=None, secure=False, httponly=False,
+                 charset='utf-8', sync_expires=True):
         '''
         :param cookie_name: first cookie name and prefix for the following
         :type cookie_name: str
         :param max_pages: maximum allowed cookie parts, defaults to 1
         :type max_pages: int
-        :param max_age: cookie lifetime in seconds or None (session, default)
-        :type max_age: int, datetime.timedelta or None
-        :param path: cookie path, defaults to /
+        :param max_age: cookie lifetime
+        :type max_age: int or datetime.timedelta
+        :param expires: date (or timestamp) of cookie expiration
+        :type expires: datetime.datetime or int
+        :param path: cookie domain path, defaults to '/'
         :type path: str
+        :param domain: cookie domain, defaults to current
+        :type domain: str
+        :param secure: either cookie will only be available via HTTPS or not
+        :type secure: bool
+        :param httponly: either cookie can be accessed via Javascript or not
+        :type httponly: bool
+        :param charset: the encoding for unicode values, defaults to utf-8
+        :type charset: str
+        :param sync_expires: set expires based on max_age as default
+        :type sync_expires: bool
         '''
-        self.cookie_name = cookie_name
         self.max_pages = max_pages
-        self.max_age = max_age
-        self.path = path
+        self.cookie_name = cookie_name
+        self.cookie_options = {
+            'max_age': max_age,
+            'expires': None,
+            'path': path,
+            'domain': domain,
+            'secure': secure,
+            'httponly': httponly,
+            'charset': charset,
+            'sync_expires': sync_expires,
+            }
 
     def _name_cookie_page(self, page):
         '''
@@ -141,10 +165,23 @@ class DataCookie(object):
         return '{}{}'.format(
             self.cookie_name,
             page if isinstance(page, str) else
-            '-{:x}'.format(page - 1) if page else
+            '-{:x}'.format(page + 1) if page else
             ''
             )
 
+    def _dump_cookie(self, name, value):
+        '''
+        Dump cookie with configured options.
+
+        :param name: cookie name
+        :type name: str
+        :param value: cookie value
+        :type value: str
+        :returns: Set-Cookie header value
+        :rtype: str
+        '''
+        return dump_cookie(name, value, **self.cookie_options)
+
     def _available_cookie_size(self, name):
         '''
         Get available cookie size for value.
@@ -154,19 +191,19 @@ class DataCookie(object):
         :return: available bytes for cookie value
         :rtype: int
         '''
-        empty = 'Set-Cookie: %s' % dump_cookie(
-            name,
-            value=' ',  # force quotes
-            max_age=self.max_age,
-            path=self.path
-            )
-        return self.page_length - len(empty)
+        empty = self._dump_cookie(name, ' ')  # forces quotes
+        return self.header_max_size - self.header_initial_size - len(empty)
 
     def _extract_cookies(self, headers):
         '''
         Extract relevant cookies from headers.
+
+        :param headers: request headers
+        :type headers: werkzeug.datasturctures.Headers
+        :returns: cookies
+        :rtype: dict
         '''
-        regex = re.compile('^%s$' % self._name_cookie_page('(-[0-9a-f])?'))
+        regex = re.compile('^%s$' % self._name_cookie_page('(-[0-9a-f]+)?'))
         return {
             key: value
             for header in headers.get_all('cookie')
@@ -229,15 +266,7 @@ class DataCookie(object):
         for i in range(self.max_pages):
             name = self._name_cookie_page(i)
             end = start + self._available_cookie_size(name)
-            result.add(
-                'Set-Cookie',
-                dump_cookie(
-                    name,
-                    data[start:end],
-                    max_age=self.max_age,
-                    path=self.path,
-                    )
-                )
+            result.add('Set-Cookie', self._dump_cookie(name, data[start:end]))
             if end > size:
                 # incidentally, an empty page will be added after end == size
                 if headers:
@@ -265,44 +294,14 @@ class DataCookie(object):
 
         result = self.headers_class()
         for name in cookie_names:
-            result.add('Set-Cookie', dump_cookie(name, expires=0))
+            result.add('Set-Cookie', dump_cookie(name, max_age=0, expires=0))
         return result
 
 
-def parse_set_cookie_option(name, value):
-    '''
-    Parse Set-Cookie header option (acepting option 'value' as cookie value),
-    both name and value.
-
-    Resulting names are compatible as :func:`werkzeug.http.dump_cookie`
-    keyword arguments.
-
-    :param name: option name
-    :type name: str
-    :param value: option value
-    :type value: str
-    :returns: tuple of parsed name and option, or None if name is unknown
-    :rtype: tuple of str or None
-    '''
-    try:
-        if name == 'Max-Age':
-            return 'max_age', int(value)
-        if name == 'Expires':
-            return 'expires', parse_date(value)
-        if name in ('value', 'Path', 'Domain', 'SameSite'):
-            return name.lower(), value
-        if name in ('Secure', 'HttpOnly'):
-            return name.lower(), True
-    except (AttributeError, ValueError, TypeError):
-        pass
-    except BaseException as e:
-        logger.exception(e)
-
-
 re_parse_set_cookie = re.compile(r'([^=;]+)(?:=([^;]*))?(?:$|;\s*)')
 
 
-def parse_set_cookie(header, option_parse_fnc=parse_set_cookie_option):
+def parse_set_cookie(header):
     '''
     Parse the content of a Set-Type HTTP header.
 
@@ -314,7 +313,26 @@ def parse_set_cookie(header, option_parse_fnc=parse_set_cookie_option):
     :returns: tuple with cookie name and its options
     :rtype: tuple of str and dict
     '''
+
+    def parse_option(pair):
+        name, value = pair
+        try:
+            if name == 'Max-Age':
+                return 'max_age', int(value)
+            if name == 'Expires':
+                return 'expires', parse_date(value)
+            if name in ('Path', 'Domain', 'SameSite'):
+                return name.lower(), value
+            if name in ('Secure', 'HttpOnly'):
+                return name.lower(), True
+        except (AttributeError, ValueError, TypeError):
+            pass
+        except BaseException as e:
+            logger.exception(e)
+        return None, None
+
     pairs = re_parse_set_cookie.findall(header)
-    name, value = pairs[0]
-    pairs[0] = ('value', parse_cookie('v=%s' % value).get('v', None))
-    return name, dict(filter(None, (option_parse_fnc(*p) for p in pairs)))
+    name, value = pairs.pop(0)
+    options = {k: v for k, v in map(parse_option, pairs) if k}
+    options['value'] = parse_cookie('v=%s' % value).get('v', None)
+    return name, options
diff --git a/browsepy/tests/test_code_quality.py b/browsepy/tests/test_code_quality.py
index f23029c..dd07e17 100644
--- a/browsepy/tests/test_code_quality.py
+++ b/browsepy/tests/test_code_quality.py
@@ -8,13 +8,20 @@ import functools
 class DeferredReport(pycodestyle.StandardReport):
     def __init__(self, *args, **kwargs):
         self.print_fnc = kwargs.pop('print_fnc')
+        self.location_base = kwargs.pop('location_base')
         super(DeferredReport, self).__init__(*args, **kwargs)
 
+    @property
+    def location(self):
+        if self.filename:
+            return os.path.relpath(self.filename, self.location_base)
+        return self.filename
+
     def get_file_results(self):
         self._deferred_print.sort()
         for line_number, offset, code, text, doc in self._deferred_print:
             error = {
-                'path': self.filename,
+                'path': self.location,
                 'row': self.line_offset + line_number,
                 'col': offset + 1,
                 'code': code,
@@ -52,6 +59,7 @@ class TestCodeQuality(unittest.TestCase):
             paths=[self.base, self.setup_py],
             reporter=functools.partial(
                 DeferredReport,
+                location_base=self.base,
                 print_fnc=messages.append
                 )
             )
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
index 3226f10..30cbfd2 100644
--- a/browsepy/tests/test_http.py
+++ b/browsepy/tests/test_http.py
@@ -3,8 +3,13 @@ import os
 import unittest
 import datetime
 import base64
+import zlib
+
+import werkzeug.http
+import werkzeug.datastructures
 
 import browsepy.http
+import browsepy.exceptions
 
 
 class TestHeaders(unittest.TestCase):
@@ -70,16 +75,69 @@ class TestParseSetCookie(unittest.TestCase):
 class TestDataCookie(unittest.TestCase):
     module = browsepy.http
     manager_cls = module.DataCookie
+    header_cls = werkzeug.datastructures.Headers
+    cookie_size_exception = browsepy.exceptions.InvalidCookieSizeError
 
     def random_text(self, size=2):
-        bytedata = base64.b64encode(os.urandom(size))
-        return bytedata.decode('ascii')[:size]
+        bytedata = zlib.compress(os.urandom(size * 3), 9)  # ensure entropy
+        b64data = base64.b64encode(bytedata)
+        return b64data.decode('ascii')[:size]
+
+    def parse_response_cookies(self, headers):
+        '''
+        :type headers: werkzeug.datastructures.Headers
+        '''
+        return {
+            name: options
+            for name, options in map(
+                self.module.parse_set_cookie,
+                headers.get_all('set-cookie')
+                )}
+
+    def response_to_request_headers(self, headers):
+        '''
+        :type headers: werkzeug.datastructures.Headers
+        '''
+        return self.header_cls(
+            ('Cookie', werkzeug.http.dump_cookie(name, options['value']))
+            for name, options in self.parse_response_cookies(headers).items()
+            )
 
     def test_pagination(self):
-        data = self.random_text(self.manager_cls.page_length)
-        manager = self.manager_cls('cookie', max_pages=3)
-        headers = manager.dump_headers(data)
-        print(headers)
-        self.assertEqual(len(headers), 2)
-        self.assertEqual(manager.load_headers(headers), data)
+        data = self.random_text(self.manager_cls.header_max_size)
+        manager = self.manager_cls('cookie', max_pages=2)
+
+        rheaders = manager.dump_headers(data)
+        self.assertEqual(len(rheaders), 2)
+
+        qheaders = self.response_to_request_headers(rheaders)
+        self.assertEqual(manager.load_headers(qheaders), data)
+
+        rheaders = manager.dump_headers('shorter-data', qheaders)
+        self.assertEqual(len(rheaders), 2)  # 1 for value, 1 for discard
+
+        cookies = self.parse_response_cookies(rheaders)
+
+        cookie1 = cookies['cookie']
+        deserialized = manager.load_cookies({'cookie': cookie1['value']})
+        self.assertEqual(deserialized, 'shorter-data')
+
+        cookie2 = cookies['cookie-2']
+        self.assertEqual(cookie2['value'], '')
+        self.assertLess(cookie2['expires'], datetime.datetime.now())
+        self.assertLess(cookie2['max_age'], 1)
+
+    def test_max_pagination(self):
+        manager = self.manager_cls('cookie', max_pages=2)
+        self.assertRaises(
+            self.cookie_size_exception,
+            manager.dump_headers,
+            self.random_text(self.manager_cls.header_max_size * 2)
+            )
 
+    def test_truncate(self):
+        qheaders = self.header_cls([('Cookie', 'cookie=value')])
+        manager = self.manager_cls('cookie', max_pages=2)
+        rheaders = manager.truncate_headers(qheaders)
+        parsed = self.parse_response_cookies(rheaders)
+        self.assertEqual(parsed['cookie']['value'], '')
-- 
GitLab


From 597e2be79ab465264c3fa194e1b672d40af0fc30 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 27 May 2018 18:06:54 +0200
Subject: [PATCH 036/171] fix clipboard exclude test, add bad datacookie test

---
 browsepy/plugin/file_actions/tests.py | 32 ++++++++++++++++++---------
 browsepy/tests/test_http.py           |  6 +++++
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 023439d..d328102 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -35,19 +35,24 @@ class CookieHeaderMock(object):
 
     @property
     def cookies(self):
-        is_valid = self.valid
+        is_expired = self.expired
         return {
             name: options.get('value')
             for name, options in self._cookies
-            if is_valid(options)
+            if not is_expired(options)
             }
 
-    def valid(self, cookie_options):
-        dt = datetime.datetime.now()
-        return (
-            cookie_options.get('max_age', 1) > 0 and
-            cookie_options.get('expiration', dt) >= dt
-            )
+    @property
+    def expired_cookies(self):
+        is_expired = self.expired
+        return {
+            name: options.get('value')
+            for name, options in self._cookies
+            if is_expired(options)
+            }
+
+    def expired(self, options):
+        return False
 
     def __init__(self):
         self.headers = Headers()
@@ -80,6 +85,13 @@ class ResponseMock(CookieHeaderMock):
             for header in self.headers.get_all(self.header)
             ]
 
+    def expired(self, cookie_options):
+        dt = datetime.datetime.now()
+        return (
+            cookie_options.get('max_age', 1) < 1 or
+            cookie_options.get('expiration', dt) < dt
+            )
+
     def dump_cookies(self, client):
         owned = self._cookies
         if isinstance(client, CookieHeaderMock):
@@ -311,6 +323,7 @@ class TestIntegration(unittest.TestCase):
             reqmock.load_cookies(client)
             clipboard.mode = 'cut'
             clipboard.to_response(resmock, reqmock)
+            resmock.dump_cookies(client)
 
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
@@ -601,10 +614,9 @@ class TestClipboard(unittest.TestCase):
         request = RequestMock()
         request.set_cookie(name, 'value')
         response = ResponseMock()
-        response.set_cookie(name, 'value')
         clipboard = self.module.Clipboard()
         clipboard.to_response(response, request)
-        print(response.headers)
+        self.assertIn(name, response.expired_cookies)
         self.assertNotIn(name, response.cookies)
 
 
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
index 30cbfd2..862aace 100644
--- a/browsepy/tests/test_http.py
+++ b/browsepy/tests/test_http.py
@@ -141,3 +141,9 @@ class TestDataCookie(unittest.TestCase):
         rheaders = manager.truncate_headers(qheaders)
         parsed = self.parse_response_cookies(rheaders)
         self.assertEqual(parsed['cookie']['value'], '')
+
+    def test_corrupted(self):
+        manager = self.manager_cls('cookie')
+        default = object()
+        data = manager.load_cookies({'cookie': 'corrupted'}, default)
+        self.assertIs(data, default)
-- 
GitLab


From 35ad46d6d45a8752a56fef3903e7859b1c5d460d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 30 May 2018 23:53:53 +0200
Subject: [PATCH 037/171] remove unused code, add coverage config excluding
 tests

---
 Makefile         |  2 +-
 browsepy/abc.py  | 15 ---------------
 browsepy/http.py |  3 ---
 setup.cfg        |  5 +++++
 4 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 browsepy/abc.py

diff --git a/Makefile b/Makefile
index 527050e..8ea3107 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ flake8:
 	flake8 browsepy setup.py
 
 coverage:
-	coverage run --source=browsepy setup.py test
+	coverage run setup.py test
 
 showcoverage: coverage
 	coverage html
diff --git a/browsepy/abc.py b/browsepy/abc.py
deleted file mode 100644
index 1f69753..0000000
--- a/browsepy/abc.py
+++ /dev/null
@@ -1,15 +0,0 @@
-
-from abc import ABC
-
-from .compat import NoneType
-
-
-class JSONSerializable(ABC):
-    pass
-
-
-JSONSerializable.register(NoneType)
-JSONSerializable.register(int)
-JSONSerializable.register(float)
-JSONSerializable.register(list)
-JSONSerializable.register(str)
diff --git a/browsepy/http.py b/browsepy/http.py
index 664efd0..bc18ddf 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -218,7 +218,6 @@ class DataCookie(object):
         :param cookies: request cookies
         :type cookies: collections.abc.Mapping
         :returns: deserialized value
-        :rtype: browsepy.abc.JSONSerializable
         '''
         chunks = []
         for i in range(self.max_pages):
@@ -242,7 +241,6 @@ class DataCookie(object):
         :param headers: request headers
         :type headers: werkzeug.http.Headers
         :returns: deserialized value
-        :rtype: browsepy.abc.JSONSerializable
         '''
         cookies = self._extract_cookies(headers)
         return self.load_cookies(cookies)
@@ -253,7 +251,6 @@ class DataCookie(object):
         instance.
 
         :param data: any json-serializable value
-        :type data: browsepy.abc.JSONSerializable
         :param headers: optional request headers, used to truncate old pages
         :type headers: werkzeug.http.Headers
         :return: response headers
diff --git a/setup.cfg b/setup.cfg
index 57e5abb..8104f2b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,3 +19,8 @@ show-source = True
 [yapf]
 align_closing_bracket_with_visual_indent = true
 
+[coverage:run]
+source = browsepy
+omit =
+    */tests/*
+    */tests.py
-- 
GitLab


From 2e373d7f2579e1c2dd279d1a92216eceefe7784f Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 31 May 2018 00:22:02 +0200
Subject: [PATCH 038/171] revert to flake8-compatible pycodestyle dev
 requirement

---
 browsepy/tests/test_code_quality.py | 3 ++-
 requirements/development.txt        | 2 +-
 setup.py                            | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/browsepy/tests/test_code_quality.py b/browsepy/tests/test_code_quality.py
index dd07e17..0983943 100644
--- a/browsepy/tests/test_code_quality.py
+++ b/browsepy/tests/test_code_quality.py
@@ -1,9 +1,10 @@
 import re
 import os.path
 import unittest
-import pycodestyle
 import functools
 
+import pycodestyle
+
 
 class DeferredReport(pycodestyle.StandardReport):
     def __init__(self, *args, **kwargs):
diff --git a/requirements/development.txt b/requirements/development.txt
index 4fe96a5..ce54672 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -25,7 +25,7 @@
 
 setuptools
 wheel
-pycodestyle
+pycodestyle<2.4.0
 flake8
 coverage
 pyaml
diff --git a/setup.py b/setup.py
index 4b540b5..38a56ed 100644
--- a/setup.py
+++ b/setup.py
@@ -109,9 +109,9 @@ setup(
         ['flask', 'unicategories'] + extra_requires
         ),
     extras_require={
-        'tests': ['beautifulsoup4'],
+        'tests': ['beautifulsoup4', 'pycodestyle'],
         },
-    tests_require=['beautifulsoup4'],
+    tests_require=['beautifulsoup4', 'pycodestyle'],
     test_suite='browsepy.tests',
     test_runner='browsepy.tests.runner:DebuggerTextTestRunner',
     zip_safe=False,
-- 
GitLab


From a6443ef84668071fda20d4b83c6887227e7328b6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 31 May 2018 00:31:39 +0200
Subject: [PATCH 039/171] fix list-comprenhension redefining variable, add bs4
 to dev requirements

---
 browsepy/plugin/file_actions/tests.py | 10 +++++-----
 requirements/development.txt          |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index d328102..bc44843 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -62,13 +62,13 @@ class CookieHeaderMock(object):
 
     def set_cookie(self, name, value='', **kwargs):
         owned = [
-            (name, options)
-            for name, options in self._cookies
-            if name != name
+            (cname, coptions)
+            for cname, coptions in self._cookies
+            if cname != name
             ]
         self.clear()
-        for name, options in owned:
-            self.headers.add(self.header, dump_cookie(name, **options))
+        for cname, coptions in owned:
+            self.headers.add(self.header, dump_cookie(cname, **coptions))
         self.add_cookie(name, value, **kwargs)
 
     def clear(self):
diff --git a/requirements/development.txt b/requirements/development.txt
index ce54672..dfe20d9 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -28,4 +28,5 @@ wheel
 pycodestyle<2.4.0
 flake8
 coverage
+beautifulsoup4
 pyaml
-- 
GitLab


From 939e48a8fc812f88dbe63425707c3b525dfd29da Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 31 May 2018 01:18:02 +0200
Subject: [PATCH 040/171] fix json-from-bytes failing on old python versions

---
 browsepy/http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/http.py b/browsepy/http.py
index bc18ddf..8ff9091 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -108,7 +108,7 @@ class DataCookie(object):
         :rtype: json-serializable
         '''
         decoded = base64.b64decode(data)
-        serialized = zlib.decompress(decoded)
+        serialized = zlib.decompress(decoded).decode('utf-8')
         return json.loads(serialized)
 
     def __init__(self, cookie_name, max_pages=1,
-- 
GitLab


From c5fc14dfa7460a648fd6957d835d8abbd3514a06 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 28 Dec 2018 15:37:12 +0000
Subject: [PATCH 041/171] update requirents, doc and ci

---
 .appveyor.yml                |   8 +++
 .python-version              |   2 +-
 .travis.yml                  |   1 +
 doc/integrations.rst         | 107 ++++++++++++++++++++++++++++++++---
 requirements/development.txt |   2 +-
 5 files changed, 110 insertions(+), 10 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1818bd9..b9408f8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -42,6 +42,14 @@ environment:
       PYTHON_VERSION: "3.6.1"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python37"
+      PYTHON_VERSION: "3.7.1"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.1"
+      PYTHON_ARCH: "64"
+
 build: off
 
 init:
diff --git a/.python-version b/.python-version
index 0f44168..a76ccff 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.6.4
+3.7.1
diff --git a/.travis.yml b/.travis.yml
index 465bcef..1307d1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ matrix:
   - python: "3.4"
   - python: "3.5"
   - python: "3.6"
+  - python: "3.7"
     env:
     - eslint=yes
     - sphinx=yes
diff --git a/doc/integrations.rst b/doc/integrations.rst
index 6352b77..1d654f2 100644
--- a/doc/integrations.rst
+++ b/doc/integrations.rst
@@ -39,6 +39,99 @@ The other way of loading a plugin programmatically is calling
 :meth:`browsepy.manager.PluginManager.load_plugin` for browsepy's plugin
 manager.
 
+.. _integrations-wsgi:
+
+Waitress and any WSGI application
+---------------------------------
+
+Startup script running browsepy inside
+`waitress <https://docs.pylonsproject.org/projects/waitress/en/latest/>`_
+along with a root wsgi application.
+
+.. code-block:: python
+
+    #!/env/bin/python
+
+    import os
+    import os.path
+    import sys
+
+    import flask
+    import werkzeug.wsgi
+    import waitress
+
+    import browsepy
+
+
+    class cfg():
+        base_path = os.path.abspath(os.path.dirname(__file__))
+        static_path = os.path.join(base_path, 'static')
+        media_path = os.path.expandvars('$HOME/media')
+
+        stderr_path = os.path.join(base_path, 'stderr.log')
+        stdout_path = os.path.join(base_path, 'stdout.log')
+        pid_path = os.path.join(base_path, 'pidfile.pid')
+
+
+    def setup_browsepy():
+        browsepy.app.config.update(
+            APPLICATION_ROOT='/browse',
+            directory_base=cfg.media_path,
+            directory_start=cfg.media_path,
+            directory_remove=cfg.media_path,
+            directory_upload=cfg.media_path,
+            plugin_modules=['player'],
+            )
+        browsepy.plugin_manager.load_arguments([
+            '--plugin=player',
+            '--player-directory-play'
+            ])
+        browsepy.plugin_manager.reload()
+        return browsepy.app
+
+
+    def setup_app():
+        app = flask.Flask(
+            __name__,
+            static_folder=cfg.static_path,
+            static_url_path='',
+            )
+
+        @app.route('/')
+        def index():
+            return flask.send_from_directory(cfg.static_path, 'index.html')
+
+        return app
+
+
+    def setup_dispatcher():
+        return werkzeug.wsgi.DispatcherMiddleware(
+            setup_app(),
+            {
+                '/browse': setup_browsepy(),
+                # add other wsgi apps here
+                }
+            )
+
+
+    def main():
+        sys.stderr = open(cfg.stderr_path, 'w')
+        sys.stdout = open(cfg.stdout_path, 'w')
+        with open(cfg.pid_path, 'w') as f:
+            f.write('%d' % os.getpid())
+
+        try:
+            print('Starting server')
+            waitress.serve(setup_dispatcher(), listen='127.0.0.1:8080')
+        finally:
+            sys.stderr.close()
+            sys.stdout.close()
+
+
+    if __name__ == '__main__':
+        main()
+
+
 .. _integrations-cherrymusic:
 
 Cherrypy and Cherrymusic
@@ -50,7 +143,6 @@ server provided by `cherrymusic <http://www.fomori.org/cherrymusic/>`_.
 .. code-block:: python
 
     #!/env/bin/python
-    # -*- coding: UTF-8 -*-
 
     import os
     import sys
@@ -73,7 +165,6 @@ server provided by `cherrymusic <http://www.fomori.org/cherrymusic/>`_.
     base_path = abspath(dirname(__file__))
     static_path = joinpath(base_path, 'static')
     media_path = expandvars('$HOME/media')
-    download_path = joinpath(media_path, 'downloads')
     root_config = {
         '/': {
             'tools.staticdir.on': True,
@@ -85,12 +176,12 @@ server provided by `cherrymusic <http://www.fomori.org/cherrymusic/>`_.
         'server.rootpath': '/player',
     }
     browsepy.config.update(
-        APPLICATION_ROOT = '/browse',
-        directory_base = media_path,
-        directory_start = media_path,
-        directory_remove = media_path,
-        directory_upload = media_path,
-        plugin_modules = ['player'],
+        APPLICATION_ROOT='/browse',
+        directory_base=media_path,
+        directory_start=media_path,
+        directory_remove=media_path,
+        directory_upload=media_path,
+        plugin_modules=['player'],
     )
     plugin_manager.reload()
 
diff --git a/requirements/development.txt b/requirements/development.txt
index dfe20d9..634202a 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -25,7 +25,7 @@
 
 setuptools
 wheel
-pycodestyle<2.4.0
+pycodestyle
 flake8
 coverage
 beautifulsoup4
-- 
GitLab


From 6fe73fc4a1c440d53a6bc0b8c04e278b032e0c4b Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 30 Mar 2019 23:50:06 +0100
Subject: [PATCH 042/171] migrate to cookieman

---
 .gitignore                                    |   1 -
 .vscode/settings.json                         |  17 ++
 browsepy/__init__.py                          |  63 ++--
 browsepy/__main__.py                          |   6 +-
 browsepy/__meta__.py                          |  12 -
 browsepy/exceptions.py                        |  13 -
 browsepy/http.py                              | 281 +-----------------
 browsepy/plugin/file_actions/__init__.py      |  73 ++---
 browsepy/plugin/file_actions/clipboard.py     | 106 -------
 browsepy/plugin/file_actions/paste.py         |  22 +-
 .../templates/selection.file_actions.html     |   2 +-
 browsepy/plugin/file_actions/tests.py         |  25 +-
 browsepy/tests/meta.py                        |  75 +++++
 browsepy/tests/test_code_quality.py           |  91 ++----
 browsepy/tests/test_http.py                   | 121 +-------
 browsepy/utils.py                             |  15 +
 requirements.txt                              |   3 -
 requirements/base.txt                         |  10 +-
 requirements/ci.txt                           |   1 -
 requirements/compat.txt                       |  27 --
 requirements/development.txt                  |  21 +-
 requirements/doc.txt                          |   1 -
 setup.cfg                                     |  14 +-
 setup.py                                      |  92 ++----
 24 files changed, 264 insertions(+), 828 deletions(-)
 create mode 100644 .vscode/settings.json
 delete mode 100644 browsepy/__meta__.py
 delete mode 100644 browsepy/plugin/file_actions/clipboard.py
 create mode 100644 browsepy/tests/meta.py
 create mode 100644 browsepy/utils.py
 delete mode 100644 requirements/compat.txt

diff --git a/.gitignore b/.gitignore
index bf44bca..82e54ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .git
 .c9
 .idea
-.vscode
 .coverage
 htmlcov
 dist
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..5534594
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,17 @@
+{
+    "editor.rulers": [
+        72,
+        79
+    ],
+    "editor.tabSize": 4,
+    "files.trimTrailingWhitespace": true,
+    "files.insertFinalNewline": true,
+    "python.formatting.provider": "yapf",
+    "python.unitTest.unittestEnabled": true,
+    "python.linting.flake8Enabled": true,
+    "python.linting.enabled": true,
+    "python.linting.pep8Enabled": true,
+    "python.linting.pep8Path": "pycodestyle",
+    "python.linting.pylintEnabled": false,
+    "python.jediEnabled": true
+}
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index aa655bd..729916b 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -1,42 +1,36 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
+__version__ = '0.5.6'
+
 import logging
 import os
 import os.path
 
-from datetime import timedelta
+import cookieman
 
 from flask import Response, request, render_template, redirect, \
                   url_for, send_from_directory, stream_with_context, \
-                  make_response
+                  make_response, session
 from werkzeug.exceptions import NotFound
 
-from .http import DataCookie
 from .appconfig import Flask
 from .manager import PluginManager
 from .file import Node, secure_filename
 from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
-                        InvalidFilenameError, InvalidPathError, \
-                        InvalidCookieSizeError
+                        InvalidFilenameError, InvalidPathError
 from . import compat
-from . import __meta__ as meta
-
-__app__ = meta.app  # noqa
-__version__ = meta.version  # noqa
-__license__ = meta.license  # noqa
-__author__ = meta.author  # noqa
-__basedir__ = os.path.abspath(os.path.dirname(compat.fsdecode(__file__)))
+from . import utils
 
 logger = logging.getLogger(__name__)
 
 app = Flask(
     __name__,
     static_url_path='/static',
-    static_folder=os.path.join(__basedir__, "static"),
-    template_folder=os.path.join(__basedir__, "templates")
+    static_folder=utils.ppath('static'),
+    template_folder=utils.ppath('templates'),
     )
 app.config.update(
+    application_name='browsepy',
     directory_base=compat.getcwd(),
     directory_start=None,
     directory_remove=None,
@@ -53,26 +47,24 @@ app.config.update(
     exclude_fnc=None,
     )
 app.jinja_env.add_extension('browsepy.transform.htmlcompress.HTMLCompress')
+app.secret_key = utils.random_string(4096)
 
 if 'BROWSEPY_SETTINGS' in os.environ:
     app.config.from_envvar('BROWSEPY_SETTINGS')
 
 plugin_manager = PluginManager(app)
-sorting_cookie = DataCookie('browse-sorting', max_age=timedelta(days=90))
+session_manager = cookieman.CookieMan()
 
+app.session_interface = session_manager
 
-def iter_cookie_browse_sorting(cookies):
-    '''
-    Get sorting-cookie from cookies dictionary.
 
-    :yields: tuple of path and sorting property
-    :ytype: 2-tuple of strings
-    '''
-    try:
-        for path, prop in sorting_cookie.load_cookies(cookies, ()):
-            yield path, prop
-    except ValueError as e:
-        logger.exception(e)
+@session_manager.register('browse:sort')
+def shrink_browse_sort(data, last):
+    if data['browse:sort'] and not last:
+        data['browse:sort'].pop()
+    else:
+        del data['browse:sort']
+    return data
 
 
 def get_cookie_browse_sorting(path, default):
@@ -83,7 +75,7 @@ def get_cookie_browse_sorting(path, default):
     :rtype: string
     '''
     if request:
-        for cpath, cprop in iter_cookie_browse_sorting(request.cookies):
+        for cpath, cprop in session.get('browse:sort', ()):
             if path == cpath:
                 return cprop
     return default
@@ -171,24 +163,13 @@ def sort(property, path):
     try:
         data.extend(
             (cpath, cprop)
-            for cpath, cprop in iter_cookie_browse_sorting(request.cookies)
+            for cpath, cprop in session.get('browse:sort', ())
             if cpath != path
             )
     except BaseException:
         pass
 
-    # handle cookie becoming too large
-    headers = ()
-    while data:
-        try:
-            headers = sorting_cookie.dump_headers(data, request.headers)
-            break
-        except InvalidCookieSizeError:
-            data.pop(0)
-
-    response = redirect(url_for(".browse", path=directory.urlpath))
-    response.headers.extend(headers)
-    return response
+    return redirect(url_for(".browse", path=directory.urlpath))
 
 
 @app.route("/browse", defaults={"path": ""})
diff --git a/browsepy/__main__.py b/browsepy/__main__.py
index 9bdb7a2..d453cfe 100644
--- a/browsepy/__main__.py
+++ b/browsepy/__main__.py
@@ -11,7 +11,6 @@ import warnings
 import flask
 
 from . import app
-from . import __meta__ as meta
 from .compat import PY_LEGACY, getdebug, get_terminal_size
 from .transform.glob import translate
 
@@ -53,15 +52,16 @@ class ArgParse(argparse.ArgumentParser):
         )
     default_removable = app.config['directory_remove']
     default_upload = app.config['directory_upload']
+    name = app.config['application_name']
 
     default_host = os.getenv('BROWSEPY_HOST', '127.0.0.1')
     default_port = os.getenv('BROWSEPY_PORT', '8080')
     plugin_action_class = PluginAction
 
     defaults = {
-        'prog': meta.app,
+        'prog': name,
         'formatter_class': HelpFormatter,
-        'description': 'description: starts a %s web file browser' % meta.app
+        'description': 'description: starts a %s web file browser' % name
         }
 
     def __init__(self, sep=os.sep):
diff --git a/browsepy/__meta__.py b/browsepy/__meta__.py
deleted file mode 100644
index 0ca7f53..0000000
--- a/browsepy/__meta__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-
-app = 'browsepy'
-description = 'Simple web file browser'
-version = '0.5.6'
-license = 'MIT'
-author_name = 'Felipe A. Hernandez'
-author_mail = 'ergoithz@gmail.com'
-author = '%s <%s>' % (author_name, author_mail)
-url = 'https://github.com/ergoithz/browsepy'
-tarball = '%s/archive/%s.tar.gz' % (url, version)
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index 1ed1e9d..8a47c03 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -69,16 +69,3 @@ class FilenameTooLongError(InvalidFilenameError):
         self.limit = limit
         super(FilenameTooLongError, self).__init__(
             message, path=path, filename=filename)
-
-
-class InvalidCookieSizeError(ValueError):
-    '''
-    Exception raised when a paginated cookie exceeds its maximun page number.
-    '''
-    code = 'invalid-cookie-size'
-    template = 'Value too big to fit in {0.max_cookies} cookies.'
-
-    def __init__(self, message=None, max_cookies=None):
-        self.max_cookies = max_cookies
-        message = self.template.format(self) if message is None else message
-        super(InvalidCookieSizeError, self).__init__(message)
diff --git a/browsepy/http.py b/browsepy/http.py
index 8ff9091..cb73cfa 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -1,19 +1,11 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 import re
-import json
-import base64
 import logging
-import zlib
 
-from werkzeug.http import dump_header, dump_options_header, dump_cookie, \
-                          parse_cookie, parse_date
+from werkzeug.http import dump_header, dump_options_header
 from werkzeug.datastructures import Headers as BaseHeaders
 
-from .compat import range
-from .exceptions import InvalidCookieSizeError
-
 
 logger = logging.getLogger(__name__)
 
@@ -62,274 +54,3 @@ class Headers(BaseHeaders):
             for key, value in kwargs.items()
             ]
         return super(Headers, self).__init__(items)
-
-
-class DataCookie(object):
-    '''
-    Compressed base64 paginated cookie manager.
-
-    Usage
-    -----
-
-    > from flask import Flask, request, make_response
-    >
-    > app = Flask(__name__)
-    > cookie = DataCookie('my-cookie')
-    >
-    > @app.route('/get')
-    > def get():
-    >     return 'Cookie value is %s' % cookie.load(request.cookies)
-    >
-    > @app.route('/set')
-    > def set():
-    >     response = make_response('Cookie set')
-    >     cookie.dump('setted', response, request.cookies)
-    >     return response
-
-    '''
-    size_error = InvalidCookieSizeError
-    headers_class = BaseHeaders
-    header_max_size = 4096
-    header_initial_size = len('Set-Cookie: ')
-
-    @staticmethod
-    def _serialize(data):
-        '''
-        :type data: json-serializable
-        :rtype: bytes
-        '''
-        serialized = zlib.compress(json.dumps(data).encode('utf-8'))
-        return base64.b64encode(serialized).decode('ascii')
-
-    @staticmethod
-    def _deserialize(data):
-        '''
-        :type data: bytes
-        :rtype: json-serializable
-        '''
-        decoded = base64.b64decode(data)
-        serialized = zlib.decompress(decoded).decode('utf-8')
-        return json.loads(serialized)
-
-    def __init__(self, cookie_name, max_pages=1,
-                 max_age=None, expires=None, path='/',
-                 domain=None, secure=False, httponly=False,
-                 charset='utf-8', sync_expires=True):
-        '''
-        :param cookie_name: first cookie name and prefix for the following
-        :type cookie_name: str
-        :param max_pages: maximum allowed cookie parts, defaults to 1
-        :type max_pages: int
-        :param max_age: cookie lifetime
-        :type max_age: int or datetime.timedelta
-        :param expires: date (or timestamp) of cookie expiration
-        :type expires: datetime.datetime or int
-        :param path: cookie domain path, defaults to '/'
-        :type path: str
-        :param domain: cookie domain, defaults to current
-        :type domain: str
-        :param secure: either cookie will only be available via HTTPS or not
-        :type secure: bool
-        :param httponly: either cookie can be accessed via Javascript or not
-        :type httponly: bool
-        :param charset: the encoding for unicode values, defaults to utf-8
-        :type charset: str
-        :param sync_expires: set expires based on max_age as default
-        :type sync_expires: bool
-        '''
-        self.max_pages = max_pages
-        self.cookie_name = cookie_name
-        self.cookie_options = {
-            'max_age': max_age,
-            'expires': None,
-            'path': path,
-            'domain': domain,
-            'secure': secure,
-            'httponly': httponly,
-            'charset': charset,
-            'sync_expires': sync_expires,
-            }
-
-    def _name_cookie_page(self, page):
-        '''
-        Get name of cookie corresponding to given page.
-
-        By design (see :method:`_name_page`), pages lower than 1 results on
-        cookie names without a page name.
-
-        :param page: page number or name
-        :type page: int or str
-        :returns: cookie name
-        :rtype: str
-        '''
-        return '{}{}'.format(
-            self.cookie_name,
-            page if isinstance(page, str) else
-            '-{:x}'.format(page + 1) if page else
-            ''
-            )
-
-    def _dump_cookie(self, name, value):
-        '''
-        Dump cookie with configured options.
-
-        :param name: cookie name
-        :type name: str
-        :param value: cookie value
-        :type value: str
-        :returns: Set-Cookie header value
-        :rtype: str
-        '''
-        return dump_cookie(name, value, **self.cookie_options)
-
-    def _available_cookie_size(self, name):
-        '''
-        Get available cookie size for value.
-
-        :param name: cookie name
-        :type name: str
-        :return: available bytes for cookie value
-        :rtype: int
-        '''
-        empty = self._dump_cookie(name, ' ')  # forces quotes
-        return self.header_max_size - self.header_initial_size - len(empty)
-
-    def _extract_cookies(self, headers):
-        '''
-        Extract relevant cookies from headers.
-
-        :param headers: request headers
-        :type headers: werkzeug.datasturctures.Headers
-        :returns: cookies
-        :rtype: dict
-        '''
-        regex = re.compile('^%s$' % self._name_cookie_page('(-[0-9a-f]+)?'))
-        return {
-            key: value
-            for header in headers.get_all('cookie')
-            for key, value in parse_cookie(header).items()
-            if regex.match(key)
-            }
-
-    def load_cookies(self, cookies, default=None):
-        '''
-        Parse data from relevant paginated cookie data given as mapping.
-
-        :param cookies: request cookies
-        :type cookies: collections.abc.Mapping
-        :returns: deserialized value
-        '''
-        chunks = []
-        for i in range(self.max_pages):
-            name = self._name_cookie_page(i)
-            cookie = cookies.get(name, '').encode('ascii')
-            chunks.append(cookie)
-            if len(cookie) < self._available_cookie_size(name):
-                break
-        data = b''.join(chunks)
-        if data:
-            try:
-                return self._deserialize(data)
-            except BaseException:
-                pass
-        return default
-
-    def load_headers(self, headers, default=None):
-        '''
-        Parse data from relevant paginated cookie data on request headers.
-
-        :param headers: request headers
-        :type headers: werkzeug.http.Headers
-        :returns: deserialized value
-        '''
-        cookies = self._extract_cookies(headers)
-        return self.load_cookies(cookies)
-
-    def dump_headers(self, data, headers=None):
-        '''
-        Serialize given object into a :class:`werkzeug.datastructures.Headers`
-        instance.
-
-        :param data: any json-serializable value
-        :param headers: optional request headers, used to truncate old pages
-        :type headers: werkzeug.http.Headers
-        :return: response headers
-        :rtype: werkzeug.http.Headers
-        '''
-        result = self.headers_class()
-        data = self._serialize(data)
-        start = 0
-        size = len(data)
-        for i in range(self.max_pages):
-            name = self._name_cookie_page(i)
-            end = start + self._available_cookie_size(name)
-            result.add('Set-Cookie', self._dump_cookie(name, data[start:end]))
-            if end > size:
-                # incidentally, an empty page will be added after end == size
-                if headers:
-                    result.extend(self.truncate_headers(headers, i + 1))
-                return result
-            start = end
-        # pages exhausted, limit reached
-        raise self.size_error(max_cookies=self.max_pages)
-
-    def truncate_headers(self, headers, start=0):
-        '''
-        Evict relevant cookies found on request headers, optionally starting
-        from a given page number.
-
-        :param headers: request headers, required to truncate old pages
-        :type headers: werkzeug.http.Headers
-        :param start: paginated cookie start, defaults to 0
-        :type start: int
-        :return: response headers
-        :rtype: werkzeug.http.Headers
-        '''
-        name_cookie = self._name_cookie_page
-        cookie_names = set(self._extract_cookies(headers))
-        cookie_names.difference_update(name_cookie(i) for i in range(start))
-
-        result = self.headers_class()
-        for name in cookie_names:
-            result.add('Set-Cookie', dump_cookie(name, max_age=0, expires=0))
-        return result
-
-
-re_parse_set_cookie = re.compile(r'([^=;]+)(?:=([^;]*))?(?:$|;\s*)')
-
-
-def parse_set_cookie(header):
-    '''
-    Parse the content of a Set-Type HTTP header.
-
-    Result options are compatible as :func:`werkzeug.http.dump_cookie`
-    keyword arguments.
-
-    :param header: Set-Cookie header value
-    :type header: str
-    :returns: tuple with cookie name and its options
-    :rtype: tuple of str and dict
-    '''
-
-    def parse_option(pair):
-        name, value = pair
-        try:
-            if name == 'Max-Age':
-                return 'max_age', int(value)
-            if name == 'Expires':
-                return 'expires', parse_date(value)
-            if name in ('Path', 'Domain', 'SameSite'):
-                return name.lower(), value
-            if name in ('Secure', 'HttpOnly'):
-                return name.lower(), True
-        except (AttributeError, ValueError, TypeError):
-            pass
-        except BaseException as e:
-            logger.exception(e)
-        return None, None
-
-    pairs = re_parse_set_cookie.findall(header)
-    name, value = pairs.pop(0)
-    options = {k: v for k, v in map(parse_option, pairs) if k}
-    options['value'] = parse_cookie('v=%s' % value).get('v', None)
-    return name, options
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index fb27e36..bdcd74c 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -6,7 +6,7 @@ import os.path
 import logging
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
-                  make_response
+                  session
 from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
@@ -15,7 +15,6 @@ from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
 from browsepy.compat import re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
 
-from .clipboard import Clipboard
 from .exceptions import FileActionsException, \
                         InvalidClipboardItemsError, \
                         InvalidClipboardModeError, \
@@ -41,6 +40,10 @@ re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
     )
 
 
+def get_clipboard():
+    return session.get('clipboard:paths', ('select', ()))
+
+
 @actions.route('/create/directory', methods=('GET', 'POST'),
                defaults={'path': ''})
 @actions.route('/create/directory/<path:path>', methods=('GET', 'POST'))
@@ -101,24 +104,23 @@ def selection(path):
                 mode = action
                 break
 
-        clipboard = Clipboard(request.form.getlist('path'), mode)
+        clipboard = request.form.getlist('path')
 
         if mode in ('cut', 'copy'):
-            response = redirect(url_for('browse', path=directory.urlpath))
-            clipboard.to_response(response)
-            return response
+            session['clipboard:paths'] = (mode, clipboard)
+            return redirect(url_for('browse', path=directory.urlpath))
 
         raise InvalidClipboardModeError(
             path=directory.path,
+            mode=mode,
             clipboard=clipboard,
-            mode=clipboard.mode,
             )
 
-    clipboard = Clipboard.from_request()
-    clipboard.mode = 'select'  # disables exclusion
+    mode, clipboard = get_clipboard()
     return render_template(
         'selection.file_actions.html',
         file=directory,
+        mode=mode,
         clipboard=clipboard,
         cut_support=any(node.can_remove for node in directory.listdir()),
         sort_property=sort_property,
@@ -142,52 +144,50 @@ def clipboard_paste(path):
       ):
         return NotFound()
 
-    clipboard = Clipboard.from_request()
-    success, issues = paste_clipboard(directory, clipboard)
+    mode, clipboard = get_clipboard()
+    success, issues, mode = paste_clipboard(directory, mode, clipboard)
     if issues:
         raise InvalidClipboardItemsError(
             path=directory.path,
+            mode=mode,
             clipboard=clipboard,
             issues=issues
             )
 
-    if clipboard.mode == 'cut':
-        clipboard.clear()
+    if mode == 'cut':
+        del session['clipboard:paths']
 
-    response = redirect(url_for('browse', path=directory.urlpath))
-    clipboard.to_response(response)
-    return response
+    return redirect(url_for('browse', path=directory.urlpath))
 
 
 @actions.route('/clipboard/clear', defaults={'path': ''})
 @actions.route('/clipboard/clear/<path:path>')
 def clipboard_clear(path):
-    response = redirect(url_for('browse', path=path))
-    clipboard = Clipboard.from_request()
-    clipboard.clear()
-    clipboard.to_response(response)
-    return response
+    if 'clipboard:paths' in session:
+        del session['clipboard:paths']
+    return redirect(url_for('browse', path=path))
 
 
 @actions.errorhandler(FileActionsException)
 def clipboard_error(e):
     file = Node(e.path) if hasattr(e, 'path') else None
-    clipboard = getattr(e, 'clipboard', None)
+    mode, clipboard = get_clipboard()
     issues = getattr(e, 'issues', ())
 
-    response = make_response((
+    if clipboard:
+        for issue in issues:
+            if isinstance(issue.error, FileNotFoundError):
+                path = issue.item.urlpath
+                if path in clipboard:
+                    clipboard.remove(path)
+
+    return (
         render_template(
             '400.file_actions.html',
-            error=e, file=file, clipboard=clipboard, issues=issues,
+            error=e, file=file, mode=mode, clipboard=clipboard, issues=issues,
             ),
         400
-        ))
-    if clipboard:
-        for issue in issues:
-            if isinstance(issue.error, FileNotFoundError):
-                clipboard.remove(issue.item.urlpath)
-        clipboard.to_response(response)
-    return response
+        )
 
 
 def register_plugin(manager):
@@ -201,11 +201,11 @@ def register_plugin(manager):
         return directory.is_directory and directory.can_upload
 
     def detect_clipboard(directory):
-        return directory.is_directory and Clipboard.from_request()
+        return directory.is_directory and 'clipboard:paths' in session
 
     def excluded_clipboard(path):
-        clipboard = Clipboard.from_request(request)
-        if clipboard.mode == 'cut':
+        mode, clipboard = get_clipboard()
+        if mode == 'cut':
             base = manager.app.config['directory_base']
             return abspath_to_urlpath(path, base) in clipboard
 
@@ -238,7 +238,10 @@ def register_plugin(manager):
         html=lambda file: render_template(
             'widget.clipboard.file_actions.html',
             file=file,
-            clipboard=Clipboard.from_request()
+            **dict(zip(
+                ('mode', 'clipboard'),
+                get_clipboard(),
+                )),
             ),
         filter=detect_clipboard,
         )
diff --git a/browsepy/plugin/file_actions/clipboard.py b/browsepy/plugin/file_actions/clipboard.py
deleted file mode 100644
index 9c0f0b7..0000000
--- a/browsepy/plugin/file_actions/clipboard.py
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-
-import os
-import json
-import base64
-import logging
-import hashlib
-
-from flask import request
-from browsepy.http import DataCookie
-from browsepy.exceptions import InvalidCookieSizeError
-
-from .exceptions import InvalidClipboardSizeError
-
-logger = logging.getLogger(__name__)
-
-
-class Clipboard(set):
-    '''
-    Clipboard (set) with convenience methods to pick its state from request
-    cookies and save it to response cookies.
-    '''
-    data_cookie = DataCookie('clipboard', max_pages=20)
-    secret = os.urandom(256)
-    request_cache_field = '_browsepy_file_actions_clipboard_cache'
-
-    @classmethod
-    def count(cls, request=request):
-        '''
-        Get how many clipboard items are stores on request cookies.
-
-        :param request: optional request, defaults to current flask request
-        :type request: werkzeug.Request
-        :return: number of clipboard items on request's cookies
-        :rtype: int
-        '''
-        return len(cls.from_request(request))
-
-    @classmethod
-    def from_request(cls, request=request):
-        '''
-        Create clipboard object from request cookies.
-        Uses request itself for cache.
-
-        :param request: optional request, defaults to current flask request
-        :type request: werkzeug.Request
-        :returns: clipboard instance
-        :rtype: Clipboard
-        '''
-        cached = getattr(request, cls.request_cache_field, None)
-        if cached is not None:
-            return cached
-        self = cls()
-        setattr(request, cls.request_cache_field, self)
-        try:
-            self.__setstate__(cls.data_cookie.load_headers(request.headers))
-        except BaseException:
-            pass
-        return self
-
-    @classmethod
-    def _signature(cls, items, mode):
-        serialized = json.dumps([items, mode]).encode('utf-8')
-        data = cls.secret + serialized
-        return base64.b64encode(hashlib.sha512(data).digest()).decode('ascii')
-
-    def __init__(self, iterable=(), mode='copy'):
-        self.mode = mode
-        super(Clipboard, self).__init__(iterable)
-
-    def __getstate__(self):
-        items = list(self)
-        return {
-            'mode': self.mode,
-            'items': items,
-            'signature': self._signature(items, self.mode),
-            }
-
-    def __setstate__(self, data):
-        if data['signature'] == self._signature(data['items'], data['mode']):
-            self.update(data['items'])
-            self.mode = data['mode']
-
-    def to_response(self, response, request=request):
-        '''
-        Save clipboard state to response taking care of disposing old clipboard
-        cookies from request.
-
-        :param response: response object to write cookies on
-        :type response: werkzeug.Response
-        :param request: optional request, defaults to current flask request
-        :type request: werkzeug.Request
-        '''
-        if self:
-            data = self.__getstate__()
-            try:
-                headers = self.data_cookie.dump_headers(data, request.headers)
-            except InvalidCookieSizeError as e:
-                raise InvalidClipboardSizeError(
-                    clipboard=self,
-                    max_cookies=e.max_cookies
-                    )
-        else:
-            headers = self.data_cookie.truncate_headers(request.headers)
-        response.headers.extend(headers)
diff --git a/browsepy/plugin/file_actions/paste.py b/browsepy/plugin/file_actions/paste.py
index a1de913..2163f1b 100644
--- a/browsepy/plugin/file_actions/paste.py
+++ b/browsepy/plugin/file_actions/paste.py
@@ -40,11 +40,10 @@ def move(target, node, join_fnc=os.path.join):
     return node.path
 
 
-def paste_clipboard(target, clipboard):
+def paste_clipboard(target, mode, clipboard):
     '''
     Get pasting function for given directory and keyboard.
     '''
-    mode = clipboard.mode
     if mode == 'cut':
         paste_fnc = functools.partial(move, target)
     elif mode == 'copy':
@@ -52,18 +51,15 @@ def paste_clipboard(target, clipboard):
     else:
         raise InvalidClipboardModeError(
             path=target.path,
+            mode=mode,
             clipboard=clipboard,
-            mode=mode
             )
     success = []
     issues = []
-    try:
-        clipboard.mode = 'paste'  # deactivates excluded_clipboard fnc
-        for node in map(Node.from_urlpath, clipboard):
-            try:
-                success.append(paste_fnc(node))
-            except BaseException as e:
-                issues.append((node, e))
-    finally:
-        clipboard.mode = mode
-    return success, issues
+    mode = 'paste'  # deactivates excluded_clipboard fnc
+    for node in map(Node.from_urlpath, clipboard):
+        try:
+            success.append(paste_fnc(node))
+        except BaseException as e:
+            issues.append((node, e))
+    return success, issues, mode
diff --git a/browsepy/plugin/file_actions/templates/selection.file_actions.html b/browsepy/plugin/file_actions/templates/selection.file_actions.html
index 646cb7a..ac333f9 100644
--- a/browsepy/plugin/file_actions/templates/selection.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/selection.file_actions.html
@@ -43,7 +43,7 @@
               <tr>
                 <td>
                   <input type="checkbox" name="path" value="{{ f.urlpath }}"
-                  {%- if f.urlpath in clipboard %} checked="checked"{% endif -%}
+                  {%- if f.urlpath in items %} checked="checked"{% endif -%}
                   >
                 </td>
                 <td>{{ f.link.text }}</td>
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index bc44843..a5fb70b 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -13,7 +13,6 @@ from werkzeug.utils import cached_property
 from werkzeug.http import Headers, parse_cookie, dump_cookie
 
 import browsepy.plugin.file_actions as file_actions
-import browsepy.plugin.file_actions.clipboard as file_actions_clipboard
 import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
 import browsepy.http as browsepy_http
 import browsepy.file as browsepy_file
@@ -108,19 +107,6 @@ class ResponseMock(CookieHeaderMock):
                     client.environ_base['REMOTE_ADDR'], name, **options)
 
 
-class RequestMock(CookieHeaderMock):
-    def load_cookies(self, client):
-        self.clear()
-
-        for cookie in client.cookie_jar:
-            self.set_cookie(cookie.name, cookie.value)
-
-    def uncache(self):
-        field = file_actions_clipboard.Clipboard.request_cache_field
-        if hasattr(self, field):
-            delattr(self, field)
-
-
 class Page(object):
     def __init__(self, source):
         self.tree = bs4.BeautifulSoup(source, 'html.parser')
@@ -209,7 +195,6 @@ class TestIntegration(unittest.TestCase):
     actions_module = file_actions
     manager_module = browsepy_manager
     browsepy_module = browsepy
-    clipboard_module = file_actions_clipboard
 
     def setUp(self):
         self.base = tempfile.mkdtemp()
@@ -251,14 +236,8 @@ class TestIntegration(unittest.TestCase):
                     page.widgets
                     )
 
-            reqmock = RequestMock()
-            reqmock.load_cookies(client)
-            resmock = ResponseMock()
-            clipboard = self.clipboard_module.Clipboard.from_request(reqmock)
-            clipboard.mode = 'copy'
-            clipboard.add('whatever')
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
+            with client.request_context():
+                flask.session['clipboard:paths'] = ('copy', ['whatever'])
 
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
diff --git a/browsepy/tests/meta.py b/browsepy/tests/meta.py
new file mode 100644
index 0000000..c929d35
--- /dev/null
+++ b/browsepy/tests/meta.py
@@ -0,0 +1,75 @@
+try:
+    import importlib.resources as res
+except ImportError:  # pragma: no cover
+    import importlib_resources as res  # to support python < 3.7
+
+
+class TestFileMeta(type):
+    '''
+    This metaclass generates test methods for every file matching given
+    rules (as class properties).
+
+    The added test methods will call an existing meta_test method passing
+    module name and filename as arguments.
+
+    Functions from :module:`importlib.resources` (see resource_methods) are
+    also injected for convenience.
+
+    Honored class properties:
+    - meta_test: called with module and filename by injected test methods.
+    - meta_module: module to inspect for files
+    - meta_file_extensions: filename extensions will result on test injection.
+    - meta_prefix: prefix added to injected tests (defaults to `file`)
+    '''
+
+    resource_methods = (
+        'contents',
+        'is_resource',
+        'open_binary',
+        'open_text',
+        'path',
+        'read_binary',
+        'read_text',
+        )
+
+    @classmethod
+    def iter_contents(cls, module, extensions):
+        for item in res.contents(module):
+            if res.is_resource(module, item):
+                if any(map(item.endswith, extensions)):
+                    yield (module, item)
+                continue
+            submodule = '%s.%s' % (module, item)
+            try:
+                for subitem in cls.iter_contents(submodule, extensions):
+                    yield subitem
+            except ImportError:
+                pass
+
+    @classmethod
+    def create_method(cls, module, filename, prefix, extensions):
+        def test(self):
+            self.meta_test(module, filename)
+        strip = max(len(ext) for ext in extensions if filename.endswith(ext))
+        test.__name__ = 'test_%s_%s_%s' % (
+            prefix,
+            module.replace('.', '_').strip('_'),
+            filename[:-strip].strip('_'),
+            )
+        return test
+
+    def __init__(self, name, bases, dct):
+        super(TestFileMeta, self).__init__(name, bases, dct)
+
+        # generate tests from files
+        name = self.meta_module
+        prefix = getattr(self, 'meta_prefix', 'file')
+        extensions = self.meta_file_extensions
+        for module, item in self.iter_contents(name, extensions):
+            test = self.create_method(module, item, prefix, extensions)
+            setattr(self, test.__name__, test)
+
+        # add resource methods
+        for method in self.resource_methods:
+            if not hasattr(self, method):
+                setattr(self, method, staticmethod(getattr(res, method)))
diff --git a/browsepy/tests/test_code_quality.py b/browsepy/tests/test_code_quality.py
index 0983943..a0b0b35 100644
--- a/browsepy/tests/test_code_quality.py
+++ b/browsepy/tests/test_code_quality.py
@@ -1,74 +1,29 @@
-import re
-import os.path
 import unittest
-import functools
 
+import six
 import pycodestyle
 
-
-class DeferredReport(pycodestyle.StandardReport):
-    def __init__(self, *args, **kwargs):
-        self.print_fnc = kwargs.pop('print_fnc')
-        self.location_base = kwargs.pop('location_base')
-        super(DeferredReport, self).__init__(*args, **kwargs)
-
-    @property
-    def location(self):
-        if self.filename:
-            return os.path.relpath(self.filename, self.location_base)
-        return self.filename
-
-    def get_file_results(self):
-        self._deferred_print.sort()
-        for line_number, offset, code, text, doc in self._deferred_print:
-            error = {
-                'path': self.location,
-                'row': self.line_offset + line_number,
-                'col': offset + 1,
-                'code': code,
-                'text': text,
-                }
-            lines = [self._fmt % error]
-            if line_number <= len(self.lines):
-                line = self.lines[line_number - 1]
-                lines.extend((
-                    line.rstrip(),
-                    re.sub(r'\S', ' ', line[:offset]) + '^'
-                    ))
-            if doc:
-                lines.append('    ' + doc.strip())
-            error['message'] = '\n'.join(lines)
-            self.print_fnc(error)
-        return self.file_errors
-
-
-class TestCodeQuality(unittest.TestCase):
-    base = os.path.join(
-        os.path.dirname(__file__),
-        os.path.pardir,
-        )
-    setup_py = os.path.join(base, '..', 'setup.py')
-    config_file = os.path.join(base, '..', 'setup.cfg')
-
-    def test_conformance(self):
-        '''
-        Test pep-8 conformance
-        '''
-        messages = []
-        style = pycodestyle.StyleGuide(
-            config_file=self.config_file,
-            paths=[self.base, self.setup_py],
-            reporter=functools.partial(
-                DeferredReport,
-                location_base=self.base,
-                print_fnc=messages.append
+from . import meta
+
+
+class TestCodeFormat(six.with_metaclass(meta.TestFileMeta, unittest.TestCase)):
+    '''
+    pycodestyle unit test
+    '''
+    meta_module = 'browsepy'
+    meta_prefix = 'code'
+    meta_file_extensions = ('.py',)
+
+    def meta_test(self, module, filename):
+        style = pycodestyle.StyleGuide(quiet=False)
+        with self.path(module, filename) as f:
+            result = style.check_files([str(f)])
+        self.assertFalse(result.total_errors, (
+            'Found {errors} code style error{s} (or warning{s}) '
+            'on module {module}, file {filename!r}.').format(
+                errors=result.total_errors,
+                s='s' if result.total_errors > 1 else '',
+                module=module,
+                filename=filename,
                 )
             )
-        result = style.check_files()
-        text = ''.join(
-            '%s\n    %s' % ('' if n else '\n', line)
-            for message in messages
-            for n, line in enumerate(message['message'].splitlines())
-            )
-        self.assertEqual(
-            result.total_errors, 0, "Code style errors:%s" % text)
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
index 862aace..a5b3ec4 100644
--- a/browsepy/tests/test_http.py
+++ b/browsepy/tests/test_http.py
@@ -1,12 +1,6 @@
+# -*- coding: UTF-8 -*-
 
-import os
 import unittest
-import datetime
-import base64
-import zlib
-
-import werkzeug.http
-import werkzeug.datastructures
 
 import browsepy.http
 import browsepy.exceptions
@@ -34,116 +28,3 @@ class TestHeaders(unittest.TestCase):
             headers.get('Option-Header'),
             'something; option=1',
             )
-
-
-class TestParseSetCookie(unittest.TestCase):
-    module = browsepy.http
-
-    def test_parse(self):
-        tests = {
-            'value-cookie=value': {
-                'name': 'value-cookie',
-                'value': 'value',
-                },
-            'expiration-cookie=value; Expires=Thu, 24 May 2018 18:10:26 GMT': {
-                'name': 'expiration-cookie',
-                'value': 'value',
-                'expires': datetime.datetime(2018, 5, 24, 18, 10, 26),
-                },
-            'maxage-cookie="value with spaces"; Max-Age=0': {
-                'name': 'maxage-cookie',
-                'value': 'value with spaces',
-                'max_age': 0,
-                },
-            'secret-cookie; HttpOnly; Secure': {
-                'name': 'secret-cookie',
-                'value': '',
-                'httponly': True,
-                'secure': True,
-                },
-            'spaced name=value': {
-                'name': 'spaced name',
-                'value': 'value',
-                },
-            }
-        for cookie, data in tests.items():
-            name, parsed = self.module.parse_set_cookie(cookie)
-            parsed['name'] = name
-            self.assertEquals(parsed, data)
-
-
-class TestDataCookie(unittest.TestCase):
-    module = browsepy.http
-    manager_cls = module.DataCookie
-    header_cls = werkzeug.datastructures.Headers
-    cookie_size_exception = browsepy.exceptions.InvalidCookieSizeError
-
-    def random_text(self, size=2):
-        bytedata = zlib.compress(os.urandom(size * 3), 9)  # ensure entropy
-        b64data = base64.b64encode(bytedata)
-        return b64data.decode('ascii')[:size]
-
-    def parse_response_cookies(self, headers):
-        '''
-        :type headers: werkzeug.datastructures.Headers
-        '''
-        return {
-            name: options
-            for name, options in map(
-                self.module.parse_set_cookie,
-                headers.get_all('set-cookie')
-                )}
-
-    def response_to_request_headers(self, headers):
-        '''
-        :type headers: werkzeug.datastructures.Headers
-        '''
-        return self.header_cls(
-            ('Cookie', werkzeug.http.dump_cookie(name, options['value']))
-            for name, options in self.parse_response_cookies(headers).items()
-            )
-
-    def test_pagination(self):
-        data = self.random_text(self.manager_cls.header_max_size)
-        manager = self.manager_cls('cookie', max_pages=2)
-
-        rheaders = manager.dump_headers(data)
-        self.assertEqual(len(rheaders), 2)
-
-        qheaders = self.response_to_request_headers(rheaders)
-        self.assertEqual(manager.load_headers(qheaders), data)
-
-        rheaders = manager.dump_headers('shorter-data', qheaders)
-        self.assertEqual(len(rheaders), 2)  # 1 for value, 1 for discard
-
-        cookies = self.parse_response_cookies(rheaders)
-
-        cookie1 = cookies['cookie']
-        deserialized = manager.load_cookies({'cookie': cookie1['value']})
-        self.assertEqual(deserialized, 'shorter-data')
-
-        cookie2 = cookies['cookie-2']
-        self.assertEqual(cookie2['value'], '')
-        self.assertLess(cookie2['expires'], datetime.datetime.now())
-        self.assertLess(cookie2['max_age'], 1)
-
-    def test_max_pagination(self):
-        manager = self.manager_cls('cookie', max_pages=2)
-        self.assertRaises(
-            self.cookie_size_exception,
-            manager.dump_headers,
-            self.random_text(self.manager_cls.header_max_size * 2)
-            )
-
-    def test_truncate(self):
-        qheaders = self.header_cls([('Cookie', 'cookie=value')])
-        manager = self.manager_cls('cookie', max_pages=2)
-        rheaders = manager.truncate_headers(qheaders)
-        parsed = self.parse_response_cookies(rheaders)
-        self.assertEqual(parsed['cookie']['value'], '')
-
-    def test_corrupted(self):
-        manager = self.manager_cls('cookie')
-        default = object()
-        data = manager.load_cookies({'cookie': 'corrupted'}, default)
-        self.assertIs(data, default)
diff --git a/browsepy/utils.py b/browsepy/utils.py
new file mode 100644
index 0000000..3b37ff8
--- /dev/null
+++ b/browsepy/utils.py
@@ -0,0 +1,15 @@
+
+import os
+import os.path
+import random
+import functools
+
+ppath = functools.partial(
+    os.path.join,
+    os.path.dirname(os.path.realpath(__file__)),
+    )
+
+
+def random_string(size, sample=tuple(map(chr, range(256)))):
+    randrange = functools.partial(random.randrange, 0, len(sample))
+    return ''.join(sample[randrange()] for i in range(size))
diff --git a/requirements.txt b/requirements.txt
index 48f4d82..5968891 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,6 @@
 # ---------------------------------
 #
 # - requirements.txt
-#   - requirements/compat.txt
 #   - requirements/development.txt
 #     - requirements/base.txt
 #
@@ -20,10 +19,8 @@
 # --------
 #
 # - requirements/ci.txt
-# - requirements/compat.txt
 # - requirements/development.txt
 #
 
--r requirements/compat.txt
 -r requirements/development.txt
 
diff --git a/requirements/base.txt b/requirements/base.txt
index 65fe872..4518665 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -5,16 +5,18 @@
 # This module lists the strict minimal subset of dependencies required to
 # run this application.
 #
-# Depending on your python environment, optional modules could be also
-# required. They're defined on `requirements/compat.txt`.
-#
 # See also
 # --------
 #
 # - requirements.txt
-# - requirements/compat.txt
 # - requirements/development.txt
 #
 
 flask
+cookieman
 unicategories
+
+# compat
+six
+scandir # python < 3.6
+backports.shutil_get_terminal_size # python < 3.3
diff --git a/requirements/ci.txt b/requirements/ci.txt
index a7d54ba..c6aa8f1 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -16,7 +16,6 @@
 # --------
 #
 # - requirements.txt
-# - requirements/compat.txt
 # - requirements/development.txt
 #
 
diff --git a/requirements/compat.txt b/requirements/compat.txt
deleted file mode 100644
index a593b7a..0000000
--- a/requirements/compat.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Compatibility requirements file
-# ===============================
-#
-# This module includes optional dependencies which could be required (or not)
-# based on your python version.
-#
-# They should be forward-compatible so you can install them all if you are not
-# sure.
-#
-# This requirements are conditional dependencies on 'source' distributable
-# packages, but regular dependencies of 'binary' distributable packages
-# (see `setup.py`).
-#
-# See also
-# --------
-#
-# - requirements.txt
-# - requirements/ci.txt
-# - requirements/development.txt
-#
-
-# python < 3.6
-scandir
-
-# python < 3.3
-backports.shutil_get_terminal_size
diff --git a/requirements/development.txt b/requirements/development.txt
index 634202a..cd9a5cd 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -18,15 +18,26 @@
 #
 # - requirements.txt
 # - requirements/ci.txt
-# - requirements/compat.txt
 #
 
 -r base.txt
 
-setuptools
-wheel
-pycodestyle
+# linting
 flake8
+doc8
+yapf
 coverage
+jedi
+
+# dev
+sphinx
+pycodestyle
+importlib_resources  # pycodestyle unittest with python < 3.7
+six  # compatible metaclass with python 2-3
+pyyaml
 beautifulsoup4
-pyaml
+
+# dist
+setuptools
+wheel
+twine
diff --git a/requirements/doc.txt b/requirements/doc.txt
index 2c2e5f6..1617bb9 100644
--- a/requirements/doc.txt
+++ b/requirements/doc.txt
@@ -18,7 +18,6 @@
 #
 # - requirements.txt
 # - requirements/ci.txt
-# - requirements/compat.txt
 #
 
 -r base.txt
diff --git a/setup.cfg b/setup.cfg
index 8104f2b..9cce8f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,26 +1,34 @@
 [metadata]
 description-file = README.rst
 
-[wheel]
+[bdist_wheel]
 universal = 1
 
 [egg_info]
 tag_build =
 
 [pycodestyle]
-show-source = True
 ignore = E123,E126,E121,W504
 
 [flake8]
+ignore = E123,E126,E121,W504
+max-complexity = 5
 select = F,C
-max-complexity = 9
 show-source = True
 
 [yapf]
 align_closing_bracket_with_visual_indent = true
 
 [coverage:run]
+branch = True
 source = browsepy
 omit =
     */tests/*
     */tests.py
+
+[coverage:report]
+show_missing = True
+fail_under = 100
+exclude_lines =
+    pragma: no cover
+    pass
diff --git a/setup.py b/setup.py
index 38a56ed..cf2ed59 100644
--- a/setup.py
+++ b/setup.py
@@ -1,55 +1,17 @@
 # -*- coding: utf-8 -*-
-"""
-browsepy
-========
-
-Simple web file browser with directory gzipped tarball download, file upload,
-removal and plugins.
-
-More details on project's README and
-`github page <https://github.com/ergoithz/browsepy/>`_.
-
-
-Development Version
--------------------
-
-The browsepy development version can be installed by cloning the git
-repository from `github`_::
-
-    git clone git@github.com:ergoithz/browsepy.git
-
-.. _github: https://github.com/ergoithz/browsepy
-
-License
--------
-MIT (see LICENSE file).
-"""
 
+import io
+import re
 import os
-import os.path
 import sys
-import shutil
-
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-sys.path[:], sys_path = [os.path.abspath('browsepy')], sys.path[:]
-import __meta__ as meta  # noqa
-sys.path[:] = sys_path
 
-with open('README.rst') as f:
-    meta_doc = f.read()
+from setuptools import setup, find_packages
 
-extra_requires = []
-bdist = 'bdist' in sys.argv or any(a.startswith('bdist_') for a in sys.argv)
+with io.open('README.rst', 'rt', encoding='utf8') as f:
+    readme = f.read()
 
-if bdist or not hasattr(os, 'scandir'):  # python 3.5+
-    extra_requires.append('scandir')
-
-if bdist or not hasattr(shutil, 'get_terminal_size'):  # python 3.3+
-    extra_requires.append('backports.shutil_get_terminal_size')
+with io.open('browsepy/__init__.py', 'rt', encoding='utf8') as f:
+    version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
 
 for debugger in ('ipdb', 'pudb', 'pdb'):
     opt = '--debug=%s' % debugger
@@ -58,33 +20,23 @@ for debugger in ('ipdb', 'pudb', 'pdb'):
         sys.argv.remove(opt)
 
 setup(
-    name=meta.app,
-    version=meta.version,
-    url=meta.url,
-    download_url=meta.tarball,
-    license=meta.license,
-    author=meta.author_name,
-    author_email=meta.author_mail,
-    description=meta.description,
-    long_description=meta_doc,
+    name='browsepy',
+    version=version,
+    url='https://github.com/ergoithz/browsepy',
+    license='MIT',
+    author='Felipe A. Hernandez',
+    author_email='ergoithz@gmail.com',
+    description='Simple web file browser',
+    long_description=readme,
+    long_description_content_type='text/x-rst',
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         ],
     keywords=['web', 'file', 'browser'],
-    packages=[
-        'browsepy',
-        'browsepy.tests',
-        'browsepy.tests.deprecated',
-        'browsepy.tests.deprecated.plugin',
-        'browsepy.transform',
-        'browsepy.plugin',
-        'browsepy.plugin.player',
-        'browsepy.plugin.file_actions',
-        ],
+    packages=find_packages(),
     entry_points={
         'console_scripts': (
             'browsepy=browsepy.__main__:main'
@@ -105,9 +57,13 @@ setup(
             'static/*',
             ],
         },
-    install_requires=(
-        ['flask', 'unicategories'] + extra_requires
-        ),
+    install_requires=[
+        'flask',
+        'unicategories',
+        'scandir',
+        'importlib_resources',
+        'backports.shutil_get_terminal_size'
+        ],
     extras_require={
         'tests': ['beautifulsoup4', 'pycodestyle'],
         },
-- 
GitLab


From 7111ac9c74ceb5c7d910615632811fe6ec4f61d2 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 31 Mar 2019 00:37:21 +0100
Subject: [PATCH 043/171] fix tests, simplify clipboard

---
 browsepy/__init__.py                       |  25 +--
 browsepy/__main__.py                       |   2 +-
 browsepy/manager.py                        |  28 +++
 browsepy/plugin/file_actions/__init__.py   |  53 +++--
 browsepy/plugin/file_actions/exceptions.py |  28 +--
 browsepy/plugin/file_actions/tests.py      | 223 +++------------------
 6 files changed, 105 insertions(+), 254 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 729916b..c728e74 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -30,7 +30,8 @@ app = Flask(
     template_folder=utils.ppath('templates'),
     )
 app.config.update(
-    application_name='browsepy',
+    SECRET_KEY=utils.random_string(4096),
+    APPLICATION_NAME='browsepy',
     directory_base=compat.getcwd(),
     directory_start=None,
     directory_remove=None,
@@ -47,18 +48,15 @@ app.config.update(
     exclude_fnc=None,
     )
 app.jinja_env.add_extension('browsepy.transform.htmlcompress.HTMLCompress')
-app.secret_key = utils.random_string(4096)
+app.session_interface = cookieman.CookieMan()
 
 if 'BROWSEPY_SETTINGS' in os.environ:
     app.config.from_envvar('BROWSEPY_SETTINGS')
 
 plugin_manager = PluginManager(app)
-session_manager = cookieman.CookieMan()
 
-app.session_interface = session_manager
 
-
-@session_manager.register('browse:sort')
+@app.session_interface.register('browse:sort')
 def shrink_browse_sort(data, last):
     if data['browse:sort'] and not last:
         data['browse:sort'].pop()
@@ -74,7 +72,7 @@ def get_cookie_browse_sorting(path, default):
     :returns: sorting property
     :rtype: string
     '''
-    if request:
+    if session:
         for cpath, cprop in session.get('browse:sort', ()):
             if path == cpath:
                 return cprop
@@ -159,15 +157,10 @@ def sort(property, path):
     if not directory.is_directory or directory.is_excluded:
         return NotFound()
 
-    data = [(path, property)]
-    try:
-        data.extend(
-            (cpath, cprop)
-            for cpath, cprop in session.get('browse:sort', ())
-            if cpath != path
-            )
-    except BaseException:
-        pass
+    if session:
+        data = session.get('browse:sort', [])
+        data.insert(0, (path, property))
+        session.modified = True
 
     return redirect(url_for(".browse", path=directory.urlpath))
 
diff --git a/browsepy/__main__.py b/browsepy/__main__.py
index d453cfe..948b01a 100644
--- a/browsepy/__main__.py
+++ b/browsepy/__main__.py
@@ -52,7 +52,7 @@ class ArgParse(argparse.ArgumentParser):
         )
     default_removable = app.config['directory_remove']
     default_upload = app.config['directory_upload']
-    name = app.config['application_name']
+    name = app.config['APPLICATION_NAME']
 
     default_host = os.getenv('BROWSEPY_HOST', '127.0.0.1')
     default_port = os.getenv('BROWSEPY_PORT', '8080')
diff --git a/browsepy/manager.py b/browsepy/manager.py
index fc9ce13..b8124e9 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -10,6 +10,8 @@ import collections
 from flask import current_app
 from werkzeug.utils import cached_property
 
+from cookieman import CookieMan
+
 from . import mimetype
 from . import compat
 from .compat import deprecated, usedoc
@@ -492,6 +494,31 @@ class MimetypePluginManager(RegistrablePluginManager):
         self._mimetype_functions.insert(0, fnc)
 
 
+class SessionPluginManager(PluginManagerBase):
+    def register_session(self, key_or_keys, shrink_fnc=None):
+        '''
+        Register session shrink function for specific session key or
+        keys. Can be used as decorator.
+
+        Usage:
+        >>> @app.session_interface.register('my_session_key')
+        ... def my_shrink_fnc(data):
+        ...     del data['my_session_key']
+        ...     return data
+
+        :param key_or_keys: key or iterable of keys would be affected
+        :type key_or_keys: Union[str, Iterable[str]]
+        :param shrink_fnc: shrinking function (optional for decorator)
+        :type shrink_fnc: cookieman.abc.ShrinkFunction
+        :returns: either original given shrink_fnc or decorator
+        :rtype: cookieman.abc.ShrinkFunction
+        '''
+        interface = self.app.session_interface
+        if isinstance(interface, CookieMan):
+            return interface.register(key_or_keys, shrink_fnc)
+        return shrink_fnc
+
+
 class ArgumentPluginManager(PluginManagerBase):
     '''
     Plugin manager for command-line argument registration.
@@ -753,6 +780,7 @@ class PluginManager(MimetypeActionPluginManager,
                     ExcludePluginManager,
                     WidgetPluginManager,
                     MimetypePluginManager,
+                    SessionPluginManager,
                     ArgumentPluginManager):
     '''
     Main plugin manager
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index bdcd74c..229f801 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -40,10 +40,6 @@ re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
     )
 
 
-def get_clipboard():
-    return session.get('clipboard:paths', ('select', ()))
-
-
 @actions.route('/create/directory', methods=('GET', 'POST'),
                defaults={'path': ''})
 @actions.route('/create/directory/<path:path>', methods=('GET', 'POST'))
@@ -107,7 +103,8 @@ def selection(path):
         clipboard = request.form.getlist('path')
 
         if mode in ('cut', 'copy'):
-            session['clipboard:paths'] = (mode, clipboard)
+            session['clipboard:mode'] = mode
+            session['clipboard:items'] = clipboard
             return redirect(url_for('browse', path=directory.urlpath))
 
         raise InvalidClipboardModeError(
@@ -116,12 +113,11 @@ def selection(path):
             clipboard=clipboard,
             )
 
-    mode, clipboard = get_clipboard()
     return render_template(
         'selection.file_actions.html',
         file=directory,
-        mode=mode,
-        clipboard=clipboard,
+        mode=session.get('clipboard:mode'),
+        clipboard=session.get('clipboard:items', ()),
         cut_support=any(node.can_remove for node in directory.listdir()),
         sort_property=sort_property,
         sort_fnc=sort_fnc,
@@ -144,8 +140,14 @@ def clipboard_paste(path):
       ):
         return NotFound()
 
-    mode, clipboard = get_clipboard()
-    success, issues, mode = paste_clipboard(directory, mode, clipboard)
+    mode = session.get('clipboard:mode')
+    clipboard = session.get('clipboard:items', ())
+
+    success, issues, nmode = paste_clipboard(directory, mode, clipboard)
+    if clipboard and mode != nmode:
+        session['mode'] = nmode
+        mode = nmode
+
     if issues:
         raise InvalidClipboardItemsError(
             path=directory.path,
@@ -171,20 +173,25 @@ def clipboard_clear(path):
 @actions.errorhandler(FileActionsException)
 def clipboard_error(e):
     file = Node(e.path) if hasattr(e, 'path') else None
-    mode, clipboard = get_clipboard()
     issues = getattr(e, 'issues', ())
 
-    if clipboard:
+    if session.get('clipboard:items'):
+        clipboard = session['clipboard:mode']
         for issue in issues:
             if isinstance(issue.error, FileNotFoundError):
                 path = issue.item.urlpath
                 if path in clipboard:
                     clipboard.remove(path)
+                    session.modified = True
 
     return (
         render_template(
             '400.file_actions.html',
-            error=e, file=file, mode=mode, clipboard=clipboard, issues=issues,
+            error=e,
+            file=file,
+            mode=session.get('clipboard:mode'),
+            clipboard=session.get('clipboard:items', ()),
+            issues=issues,
             ),
         400
         )
@@ -201,14 +208,22 @@ def register_plugin(manager):
         return directory.is_directory and directory.can_upload
 
     def detect_clipboard(directory):
-        return directory.is_directory and 'clipboard:paths' in session
+        return directory.is_directory and session.get('clipboard:mode')
 
     def excluded_clipboard(path):
-        mode, clipboard = get_clipboard()
-        if mode == 'cut':
+        if session.get('clipboard:mode') == 'cut':
             base = manager.app.config['directory_base']
+            clipboard = session.get('clipboard:items', ())
             return abspath_to_urlpath(path, base) in clipboard
 
+    def shrink(data, last):
+        if last:
+            # TODO: add warning message
+            del data['clipboard:items']
+            del data['clipboard:mode']
+        return data
+
+    manager.register_session(('clipboard:items', 'clipboard:mode'), shrink)
     manager.register_exclude_function(excluded_clipboard)
     manager.register_blueprint(actions)
     manager.register_widget(
@@ -238,10 +253,8 @@ def register_plugin(manager):
         html=lambda file: render_template(
             'widget.clipboard.file_actions.html',
             file=file,
-            **dict(zip(
-                ('mode', 'clipboard'),
-                get_clipboard(),
-                )),
+            mode=session.get('clipboard:mode'),
+            clipboard=session.get('clipboard:items', ()),
             ),
         filter=detect_clipboard,
         )
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index 35dd68e..d9b4391 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -67,7 +67,8 @@ class ClipboardException(FileActionsException):
     code = 'clipboard-invalid'
     template = 'Clipboard is invalid.'
 
-    def __init__(self, message=None, path=None, clipboard=None):
+    def __init__(self, message=None, path=None, mode=None, clipboard=None):
+        self.mode = mode
         self.clipboard = clipboard
         super(ClipboardException, self).__init__(message, path)
 
@@ -108,10 +109,11 @@ class InvalidClipboardItemsError(ClipboardException):
     code = 'clipboard-invalid-items'
     template = 'Clipboard has invalid items.'
 
-    def __init__(self, message=None, path=None, clipboard=None, issues=()):
+    def __init__(self, message=None, path=None, mode=None, clipboard=None,
+                 issues=()):
         self.issues = list(map(self.pair_class, issues))
         supa = super(InvalidClipboardItemsError, self)
-        supa.__init__(message, path, clipboard)
+        supa.__init__(message, path, mode, clipboard)
 
     def append(self, item, error):
         self.issues.append(self.pair_class((item, error)))
@@ -126,22 +128,6 @@ class InvalidClipboardModeError(ClipboardException):
     code = 'clipboard-invalid-mode'
     template = 'Clipboard mode {0.path!r} is not valid.'
 
-    def __init__(self, message=None, path=None, clipboard=None, mode=None):
-        self.mode = mode
+    def __init__(self, message=None, path=None, mode=None, clipboard=None):
         supa = super(InvalidClipboardModeError, self)
-        supa.__init__(message, path, clipboard)
-
-
-class InvalidClipboardSizeError(ClipboardException):
-    '''
-    Exception raised when a clipboard size exceeds cookie limit.
-
-    :property max_cookies: maximum allowed size
-    '''
-    code = 'clipboard-invalid-size'
-    template = 'Clipboard has too many items.'
-
-    def __init__(self, message=None, path=None, clipboard=None, max_cookies=0):
-        self.max_cookies = max_cookies
-        supa = super(InvalidClipboardSizeError, self)
-        supa.__init__(message, path, clipboard)
+        supa.__init__(message, path, mode, clipboard)
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index a5fb70b..6f03c46 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -4,109 +4,20 @@ import shutil
 import os
 import os.path
 import functools
-import datetime
 
 import bs4
 import flask
 
 from werkzeug.utils import cached_property
-from werkzeug.http import Headers, parse_cookie, dump_cookie
 
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
-import browsepy.http as browsepy_http
 import browsepy.file as browsepy_file
 import browsepy.manager as browsepy_manager
 import browsepy.exceptions as browsepy_exceptions
 import browsepy
 
 
-class CookieHeaderMock(object):
-    header = 'Cookie'
-
-    @property
-    def _cookies(self):
-        return [
-            (name, {'value': value})
-            for header in self.headers.get_all(self.header)
-            for name, value in parse_cookie(header).items()
-            ]
-
-    @property
-    def cookies(self):
-        is_expired = self.expired
-        return {
-            name: options.get('value')
-            for name, options in self._cookies
-            if not is_expired(options)
-            }
-
-    @property
-    def expired_cookies(self):
-        is_expired = self.expired
-        return {
-            name: options.get('value')
-            for name, options in self._cookies
-            if is_expired(options)
-            }
-
-    def expired(self, options):
-        return False
-
-    def __init__(self):
-        self.headers = Headers()
-
-    def add_cookie(self, name, value='', **kwargs):
-        self.headers.add(self.header, dump_cookie(name, value, **kwargs))
-
-    def set_cookie(self, name, value='', **kwargs):
-        owned = [
-            (cname, coptions)
-            for cname, coptions in self._cookies
-            if cname != name
-            ]
-        self.clear()
-        for cname, coptions in owned:
-            self.headers.add(self.header, dump_cookie(cname, **coptions))
-        self.add_cookie(name, value, **kwargs)
-
-    def clear(self):
-        self.headers.clear()
-
-
-class ResponseMock(CookieHeaderMock):
-    header = 'Set-Cookie'
-
-    @property
-    def _cookies(self):
-        return [
-            browsepy_http.parse_set_cookie(header)
-            for header in self.headers.get_all(self.header)
-            ]
-
-    def expired(self, cookie_options):
-        dt = datetime.datetime.now()
-        return (
-            cookie_options.get('max_age', 1) < 1 or
-            cookie_options.get('expiration', dt) < dt
-            )
-
-    def dump_cookies(self, client):
-        owned = self._cookies
-        if isinstance(client, CookieHeaderMock):
-            client.clear()
-            for name, options in owned:
-                client.add_cookie(name, **options)
-        else:
-            for cookie in client.cookie_jar:
-                client.cookie_jar.clear(
-                        cookie.domain, cookie.path, cookie.name)
-
-            for name, options in owned:
-                client.set_cookie(
-                    client.environ_base['REMOTE_ADDR'], name, **options)
-
-
 class Page(object):
     def __init__(self, source):
         self.tree = bs4.BeautifulSoup(source, 'html.parser')
@@ -200,6 +111,7 @@ class TestIntegration(unittest.TestCase):
         self.base = tempfile.mkdtemp()
         self.app = self.browsepy_module.app
         self.app.config.update(
+            SECRET_KEY='secret',
             directory_base=self.base,
             directory_start=self.base,
             directory_upload=None,
@@ -236,8 +148,9 @@ class TestIntegration(unittest.TestCase):
                     page.widgets
                     )
 
-            with client.request_context():
-                flask.session['clipboard:paths'] = ('copy', ['whatever'])
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'copy'
+                session['clipboard:items'] = ['whatever']
 
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
@@ -285,25 +198,16 @@ class TestIntegration(unittest.TestCase):
             page = Page(response.data)
             self.assertIn('potato', page.entries)
 
-            reqmock = RequestMock()
-            reqmock.load_cookies(client)
-            resmock = ResponseMock()
-            clipboard = self.clipboard_module.Clipboard.from_request(reqmock)
-            clipboard.mode = 'copy'
-            clipboard.add('potato')
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'copy'
+                session['clipboard:items'] = ['potato']
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
             page = Page(response.data)
             self.assertIn('potato', page.entries)
 
-            reqmock.load_cookies(client)
-            clipboard.mode = 'cut'
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'cut'
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
             page = Page(response.data)
@@ -312,7 +216,6 @@ class TestIntegration(unittest.TestCase):
 
 class TestAction(unittest.TestCase):
     module = file_actions
-    clipboard_module = file_actions_clipboard
 
     def setUp(self):
         self.base = tempfile.mkdtemp()
@@ -320,6 +223,7 @@ class TestAction(unittest.TestCase):
         self.app = flask.Flask('browsepy')
         self.app.register_blueprint(self.module.actions)
         self.app.config.update(
+            SECRET_KEY='secret',
             directory_base=self.base,
             directory_upload=self.base,
             directory_remove=self.base,
@@ -468,60 +372,41 @@ class TestAction(unittest.TestCase):
             self.assertEqual(response.status_code, 404)
 
         with self.app.test_client() as client:
-            reqmock = RequestMock()
-            reqmock.load_cookies(client)
-            resmock = ResponseMock()
-            clipboard = self.clipboard_module.Clipboard.from_request(reqmock)
-            clipboard.mode = 'wrong-mode'
-            clipboard.add('whatever')
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'wrong-mode'
+                session['clipboard:items'] = ['whatever']
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
-            reqmock.load_cookies(client)
-            clipboard.mode = 'cut'
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'cut'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 302)  # same location
 
-            clipboard.mode = 'cut'
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'cut'
             response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 400)
 
-            clipboard.mode = 'copy'
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'copy'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
-            clipboard.mode = 'copy'
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'copy'
             response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 400)
 
             self.app.config['exclude_fnc'] = lambda n: n.endswith('whatever')
 
-            clipboard.mode = 'cut'
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'cut'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
-            clipboard.mode = 'copy'
-            clipboard.to_response(resmock, reqmock)
-            resmock.dump_cookies(client)
-
+            with client.session_transaction() as session:
+                session['clipboard:mode'] = 'copy'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
@@ -548,73 +433,19 @@ class TestAction(unittest.TestCase):
             self.assertFalse(page.selected)
 
 
-class TestClipboard(unittest.TestCase):
-    module = file_actions_clipboard
-
-    def test_count(self):
-        reqmock = RequestMock()
-        resmock = ResponseMock()
-        self.assertEqual(self.module.Clipboard.count(reqmock), 0)
-
-        clipboard = self.module.Clipboard()
-        clipboard.mode = 'test'
-        clipboard.add('item')
-        clipboard.to_response(resmock, reqmock)
-        resmock.dump_cookies(reqmock)
-        reqmock.uncache()
-
-        self.assertEqual(self.module.Clipboard.count(reqmock), 1)
-
-    def test_oveflow(self):
-        class TinyClipboard(self.module.Clipboard):
-            data_cookie = browsepy_http.DataCookie('small-clipboard')
-
-        request = RequestMock()
-        clipboard = TinyClipboard()
-        clipboard.mode = 'test'
-        clipboard.update('item-%04d' % i for i in range(4000))
-
-        self.assertRaises(
-            file_actions_exceptions.InvalidClipboardSizeError,
-            clipboard.to_response,
-            request,
-            request
-            )
-
-    def test_unreadable(self):
-        name = self.module.Clipboard.data_cookie._name_cookie_page(0)
-        request = RequestMock()
-        request.set_cookie(name, 'a')
-        clipboard = self.module.Clipboard.from_request(request)
-        self.assertFalse(clipboard)
-
-    def test_cookie_cleanup(self):
-        name = self.module.Clipboard.data_cookie._name_cookie_page(0)
-        request = RequestMock()
-        request.set_cookie(name, 'value')
-        response = ResponseMock()
-        clipboard = self.module.Clipboard()
-        clipboard.to_response(response, request)
-        self.assertIn(name, response.expired_cookies)
-        self.assertNotIn(name, response.cookies)
-
-
 class TestException(unittest.TestCase):
     module = file_actions_exceptions
-    clipboard_class = file_actions_clipboard.Clipboard
     node_class = browsepy_file.Node
 
     def test_invalid_clipboard_items_error(self):
-        clipboard = self.clipboard_class((
-            'asdf',
-            ))
         pair = (
             self.node_class('/base/asdf'),
             Exception('Uncaught exception /base/asdf'),
             )
         e = self.module.InvalidClipboardItemsError(
             path='/',
-            clipboard=clipboard,
+            mode='cut',
+            clipboard=('asdf,'),
             issues=[pair]
             )
         e.append(
-- 
GitLab


From 2ef9e6d6f61a050f120f25e240f684c5882a229d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 31 Mar 2019 00:46:17 +0100
Subject: [PATCH 044/171] slim down makefile

---
 .travis.yml |  9 +++++----
 Makefile    | 50 +-------------------------------------------------
 2 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1307d1e..db92f2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ install:
       nvm install stable
       nvm use stable
       npm install eslint
-      export PATH="$PWD/node_modules/.bin:$PATH"
     fi
   - |
     if [ "$sphinx" = "yes" ]; then
@@ -35,14 +34,16 @@ install:
     fi
 
 script:
-  - make flake8 coverage
+  - coverage run setup.py test
+  - coverage report
   - |
     if [ "$eslint" = "yes" ]; then
-      make eslint
+      node_modules/.bin/eslint browsepy
     fi
   - |
     if [ "$sphinx" = "yes" ]; then
-      make doc
+      make -C doc html 2>&1 | grep -v \
+		    'WARNING: more than one target found for cross-reference'
     fi
 
 after_success:
diff --git a/Makefile b/Makefile
index 8ea3107..56f2e1a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,4 @@
-.PHONY: test clean upload doc showdoc eslint pep8 pycodestyle flake8 coverage showcoverage
-
-test: flake8 eslint
-	python -c 'import yaml, glob;[yaml.load(open(p)) for p in glob.glob(".*.yml")]'
-ifdef debug
-	python setup.py test --debug=$(debug)
-else
-	python setup.py test
-endif
+.PHONY: clean
 
 clean:
 	rm -rf \
@@ -16,43 +8,3 @@ clean:
 	find browsepy -type f -name "*.py[co]" -delete
 	find browsepy -type d -name "__pycache__" -delete
 	$(MAKE) -C doc clean
-
-build/env:
-	mkdir -p build
-	python3 -m venv build/env
-	build/env/bin/pip install pip --upgrade
-	build/env/bin/pip install wheel
-
-build: clean build/env
-	build/env/bin/python setup.py bdist_wheel
-	build/env/bin/python setup.py sdist
-
-upload: clean build/env
-	build/env/bin/python setup.py bdist_wheel upload
-	build/env/bin/python setup.py sdist upload
-
-doc:
-	$(MAKE) -C doc html 2>&1 | grep -v \
-		'WARNING: more than one target found for cross-reference'
-
-showdoc: doc
-	xdg-open file://${CURDIR}/doc/.build/html/index.html >> /dev/null
-
-eslint:
-	eslint ${CURDIR}/browsepy
-
-pycodestyle:
-	pycodestyle browsepy setup.py
-
-pep8: pycodestyle
-
-flake8:
-	flake8 browsepy setup.py
-
-coverage:
-	coverage run setup.py test
-
-showcoverage: coverage
-	coverage html
-	xdg-open file://${CURDIR}/htmlcov/index.html >> /dev/null
-
-- 
GitLab


From 538c0f23128125c9cb731ecd89b9b3833102c53f Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 31 Mar 2019 13:52:22 +0200
Subject: [PATCH 045/171] fix session usage and mime test

---
 browsepy/__init__.py        | 9 ++++-----
 browsepy/tests/test_file.py | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index c728e74..ee8e23e 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -72,7 +72,7 @@ def get_cookie_browse_sorting(path, default):
     :returns: sorting property
     :rtype: string
     '''
-    if session:
+    if request:
         for cpath, cprop in session.get('browse:sort', ()):
             if path == cpath:
                 return cprop
@@ -157,10 +157,9 @@ def sort(property, path):
     if not directory.is_directory or directory.is_excluded:
         return NotFound()
 
-    if session:
-        data = session.get('browse:sort', [])
-        data.insert(0, (path, property))
-        session.modified = True
+    if request:
+        session['browse:sort'] = \
+            [(path, property)] + session.get('browse:sort', [])
 
     return redirect(url_for(".browse", path=directory.urlpath))
 
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index 80f9947..cd0ace4 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -112,7 +112,7 @@ class TestFile(unittest.TestCase):
 
         bad_file = os.path.join(bad_path, 'file')
         with open(bad_file, 'w') as f:
-            f.write('#!/usr/bin/env bash\nexit 1\n')
+            f.write('#!/bin/sh\nexit 1\n')
         os.chmod(bad_file, os.stat(bad_file).st_mode | stat.S_IEXEC)
 
         old_path = os.environ['PATH']
-- 
GitLab


From 00d230ee7f77191917171b2f5b276a58be213c53 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 31 Mar 2019 14:40:23 +0200
Subject: [PATCH 046/171] use six, simplify code, add encoding headers for py2

---
 browsepy/appconfig.py                         |  2 ++
 browsepy/compat.py                            |  1 -
 browsepy/exceptions.py                        |  2 ++
 browsepy/file.py                              |  1 -
 browsepy/manager.py                           |  1 -
 browsepy/mimetype.py                          |  1 -
 browsepy/plugin/__init__.py                   |  1 -
 browsepy/plugin/file_actions/__init__.py      | 33 +++++++++--------
 browsepy/plugin/file_actions/exceptions.py    |  2 ++
 browsepy/plugin/file_actions/tests.py         |  2 ++
 .../file_actions/{paste.py => utils.py}       |  8 +++--
 browsepy/plugin/player/__init__.py            |  9 ++---
 browsepy/plugin/player/playable.py            | 35 +++++++++----------
 browsepy/plugin/player/tests.py               |  5 +--
 browsepy/plugin/player/utils.py               | 10 ++++++
 browsepy/stream.py                            |  1 +
 browsepy/utils.py                             |  1 +
 browsepy/widget.py                            |  4 ++-
 18 files changed, 67 insertions(+), 52 deletions(-)
 rename browsepy/plugin/file_actions/{paste.py => utils.py} (92%)
 create mode 100644 browsepy/plugin/player/utils.py

diff --git a/browsepy/appconfig.py b/browsepy/appconfig.py
index 384108e..56aceb2 100644
--- a/browsepy/appconfig.py
+++ b/browsepy/appconfig.py
@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 import flask
 import flask.config
 
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 75047fa..669645d 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 import os
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index 8a47c03..9f7a81f 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 
 class OutsideDirectoryBase(Exception):
     '''
diff --git a/browsepy/file.py b/browsepy/file.py
index 61c5a37..845aa5b 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 import os
diff --git a/browsepy/manager.py b/browsepy/manager.py
index b8124e9..be2b8fa 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 import re
diff --git a/browsepy/mimetype.py b/browsepy/mimetype.py
index b908dd2..bcdba47 100644
--- a/browsepy/mimetype.py
+++ b/browsepy/mimetype.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 import re
diff --git a/browsepy/plugin/__init__.py b/browsepy/plugin/__init__.py
index 8cb7f45..8d98fed 100644
--- a/browsepy/plugin/__init__.py
+++ b/browsepy/plugin/__init__.py
@@ -1,2 +1 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 229f801..ce7a39c 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -1,9 +1,7 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 import os
 import os.path
-import logging
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
                   session
@@ -20,19 +18,16 @@ from .exceptions import FileActionsException, \
                         InvalidClipboardModeError, \
                         InvalidDirnameError, \
                         DirectoryCreationError
-from .paste import paste_clipboard
 
+from . import utils
 
-__basedir__ = os.path.dirname(os.path.abspath(__file__))
-
-logger = logging.getLogger(__name__)
 
 actions = Blueprint(
     'file_actions',
     __name__,
     url_prefix='/file-actions',
-    template_folder=os.path.join(__basedir__, 'templates'),
-    static_folder=os.path.join(__basedir__, 'static'),
+    template_folder=utils.ppath('templates'),
+    static_folder=utils.ppath('static'),
     )
 
 re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
@@ -143,7 +138,7 @@ def clipboard_paste(path):
     mode = session.get('clipboard:mode')
     clipboard = session.get('clipboard:items', ())
 
-    success, issues, nmode = paste_clipboard(directory, mode, clipboard)
+    success, issues, nmode = utils.paste(directory, mode, clipboard)
     if clipboard and mode != nmode:
         session['mode'] = nmode
         mode = nmode
@@ -197,6 +192,14 @@ def clipboard_error(e):
         )
 
 
+def shrink_session(data, last):
+    if last:
+        # TODO: add warning message
+        del data['clipboard:items']
+        del data['clipboard:mode']
+    return data
+
+
 def register_plugin(manager):
     '''
     Register blueprints and actions using given plugin manager.
@@ -216,14 +219,6 @@ def register_plugin(manager):
             clipboard = session.get('clipboard:items', ())
             return abspath_to_urlpath(path, base) in clipboard
 
-    def shrink(data, last):
-        if last:
-            # TODO: add warning message
-            del data['clipboard:items']
-            del data['clipboard:mode']
-        return data
-
-    manager.register_session(('clipboard:items', 'clipboard:mode'), shrink)
     manager.register_exclude_function(excluded_clipboard)
     manager.register_blueprint(actions)
     manager.register_widget(
@@ -258,3 +253,7 @@ def register_plugin(manager):
             ),
         filter=detect_clipboard,
         )
+    manager.register_session(
+        ('clipboard:items', 'clipboard:mode'),
+        shrink_session,
+        )
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index d9b4391..8df75a0 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 import os
 import errno
 
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 6f03c46..0ae0458 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 import unittest
 import tempfile
 import shutil
diff --git a/browsepy/plugin/file_actions/paste.py b/browsepy/plugin/file_actions/utils.py
similarity index 92%
rename from browsepy/plugin/file_actions/paste.py
rename to browsepy/plugin/file_actions/utils.py
index 2163f1b..039e973 100644
--- a/browsepy/plugin/file_actions/paste.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
 import os
@@ -11,6 +10,11 @@ from browsepy.compat import map
 
 from .exceptions import InvalidClipboardModeError
 
+ppath = functools.partial(
+    os.path.join,
+    os.path.dirname(os.path.realpath(__file__)),
+    )
+
 
 def copy(target, node, join_fnc=os.path.join):
     if node.is_excluded:
@@ -40,7 +44,7 @@ def move(target, node, join_fnc=os.path.join):
     return node.path
 
 
-def paste_clipboard(target, mode, clipboard):
+def paste(target, mode, clipboard):
     '''
     Get pasting function for given directory and keyboard.
     '''
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index ccfbaf1..dcc0f8a 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -1,8 +1,5 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 
-import os.path
-
 from flask import Blueprint, render_template
 from werkzeug.exceptions import NotFound
 
@@ -13,15 +10,15 @@ from browsepy.file import OutsideDirectoryBase
 from .playable import PlayableFile, PlayableDirectory, \
                       PlayListFile, detect_playable_mimetype
 
+from . import utils
 
-__basedir__ = os.path.dirname(os.path.abspath(__file__))
 
 player = Blueprint(
     'player',
     __name__,
     url_prefix='/play',
-    template_folder=os.path.join(__basedir__, 'templates'),
-    static_folder=os.path.join(__basedir__, 'static'),
+    template_folder=utils.ppath('templates'),
+    static_folder=utils.ppath('static'),
     )
 
 
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index ea967ea..5b96487 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -1,28 +1,20 @@
+# -*- coding: UTF-8 -*-
+
 
 import sys
 import codecs
 import os.path
 import warnings
 
+import six
+import six.moves
+
 from werkzeug.utils import cached_property
 
-from browsepy.compat import range, PY_LEGACY  # noqa
 from browsepy.file import Node, File, Directory, \
                           underscore_replace, check_under_base
 
 
-if PY_LEGACY:
-    import ConfigParser as configparser
-else:
-    import configparser
-
-ConfigParserBase = (
-    configparser.SafeConfigParser
-    if hasattr(configparser, 'SafeConfigParser') else
-    configparser.ConfigParser
-    )
-
-
 class PLSFileParser(object):
     '''
     ConfigParser wrapper accepting fallback on get for convenience.
@@ -30,10 +22,14 @@ class PLSFileParser(object):
     This wraps instead of inheriting due ConfigParse being classobj on python2.
     '''
     NOT_SET = type('NotSetType', (object,), {})
-    parser_class = (
-        configparser.SafeConfigParser
-        if hasattr(configparser, 'SafeConfigParser') else
-        configparser.ConfigParser
+    option_exceptions = (
+        six.moves.configparser.NoOptionError,
+        ValueError,
+        )
+    parser_class = getattr(
+        six.moves.configparser,
+        'SafeConfigParser',
+        six.moves.configparser.ConfigParser
         )
 
     def __init__(self, path):
@@ -46,7 +42,7 @@ class PLSFileParser(object):
     def getint(self, section, key, fallback=NOT_SET):
         try:
             return self._parser.getint(section, key)
-        except (configparser.NoOptionError, ValueError):
+        except self.option_exceptions:
             if fallback is self.NOT_SET:
                 raise
             return fallback
@@ -54,7 +50,7 @@ class PLSFileParser(object):
     def get(self, section, key, fallback=NOT_SET):
         try:
             return self._parser.get(section, key)
-        except (configparser.NoOptionError, ValueError):
+        except self.option_exceptions:
             if fallback is self.NOT_SET:
                 raise
             return fallback
@@ -159,6 +155,7 @@ class PLSFile(PlayListFile):
     def _entries(self):
         parser = self.ini_parser_class(self.path)
         maxsize = parser.getint('playlist', 'NumberOfEntries', None)
+        range = six.moves.range
         for i in range(1, self.maxsize if maxsize is None else maxsize + 1):
             path = parser.get('playlist', 'File%d' % i, None)
             if not path:
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index fca8dc6..c40e2e2 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 
 import os
 import os.path
@@ -5,12 +6,12 @@ import unittest
 import shutil
 import tempfile
 
+import six
 import flask
 
 from werkzeug.exceptions import NotFound
 
 import browsepy
-import browsepy.compat as compat
 import browsepy.file as browsepy_file
 import browsepy.manager as browsepy_manager
 import browsepy.plugin.player as player
@@ -366,7 +367,7 @@ class TestBlueprint(TestPlayerBase):
 
 def p(*args):
     args = [
-        arg if isinstance(arg, compat.unicode) else arg.decode('utf-8')
+        arg if isinstance(arg, six.text_type) else arg.decode('utf-8')
         for arg in args
         ]
     return os.path.join(*args)
diff --git a/browsepy/plugin/player/utils.py b/browsepy/plugin/player/utils.py
new file mode 100644
index 0000000..907c240
--- /dev/null
+++ b/browsepy/plugin/player/utils.py
@@ -0,0 +1,10 @@
+# -*- coding: UTF-8 -*-
+
+import os
+import os.path
+import functools
+
+ppath = functools.partial(
+    os.path.join,
+    os.path.dirname(os.path.realpath(__file__)),
+    )
diff --git a/browsepy/stream.py b/browsepy/stream.py
index d48dc47..b834039 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 
 import os
 import os.path
diff --git a/browsepy/utils.py b/browsepy/utils.py
index 3b37ff8..5d84629 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 
 import os
 import os.path
diff --git a/browsepy/widget.py b/browsepy/widget.py
index fed6642..0ced542 100644
--- a/browsepy/widget.py
+++ b/browsepy/widget.py
@@ -1,9 +1,11 @@
+# -*- coding: UTF-8 -*-
 '''
 WARNING: deprecated module.
 
-API defined in this module has been deprecated in version 0.5 will likely be
+API defined in this module has been deprecated in version 0.5 and it will be
 removed at 0.6.
 '''
+
 import warnings
 
 from markupsafe import Markup
-- 
GitLab


From 306d74831ed91b9fad9f93a719d1a862d7a96b77 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 5 Apr 2019 16:57:38 +0200
Subject: [PATCH 047/171] refactor stream_template

---
 .vscode/settings.json                    |  3 ++-
 browsepy/__init__.py                     | 20 +++-----------------
 browsepy/plugin/file_actions/__init__.py |  3 ++-
 browsepy/plugin/player/__init__.py       |  4 ++--
 browsepy/utils.py                        | 19 +++++++++++++++++++
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5534594..cbbcd79 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,5 +13,6 @@
     "python.linting.pep8Enabled": true,
     "python.linting.pep8Path": "pycodestyle",
     "python.linting.pylintEnabled": false,
-    "python.jediEnabled": true
+    "python.jediEnabled": true,
+    "python.pythonPath": "env/bin/python"
 }
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index ee8e23e..b5733b9 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -8,14 +8,15 @@ import os.path
 
 import cookieman
 
-from flask import Response, request, render_template, redirect, \
-                  url_for, send_from_directory, stream_with_context, \
+from flask import request, render_template, redirect, \
+                  url_for, send_from_directory, \
                   make_response, session
 from werkzeug.exceptions import NotFound
 
 from .appconfig import Flask
 from .manager import PluginManager
 from .file import Node, secure_filename
+from .utils import stream_template
 from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
                         InvalidFilenameError, InvalidPathError
 from . import compat
@@ -123,21 +124,6 @@ def browse_sortkey_reverse(prop):
         )
 
 
-def stream_template(template_name, **context):
-    '''
-    Some templates can be huge, this function returns an streaming response,
-    sending the content in chunks and preventing from timeout.
-
-    :param template_name: template
-    :param **context: parameters for templates.
-    :yields: HTML strings
-    '''
-    app.update_template_context(context)
-    template = app.jinja_env.get_template(template_name)
-    stream = template.generate(context)
-    return Response(stream_with_context(stream))
-
-
 @app.context_processor
 def template_globals():
     return {
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index ce7a39c..dd3e7f6 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -12,6 +12,7 @@ from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
                           current_restricted_chars, common_path_separators
 from browsepy.compat import re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
+from browsepy.utils import stream_template
 
 from .exceptions import FileActionsException, \
                         InvalidClipboardItemsError, \
@@ -108,7 +109,7 @@ def selection(path):
             clipboard=clipboard,
             )
 
-    return render_template(
+    return stream_template(
         'selection.file_actions.html',
         file=directory,
         mode=session.get('clipboard:mode'),
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index dcc0f8a..3abb881 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -3,9 +3,9 @@
 from flask import Blueprint, render_template
 from werkzeug.exceptions import NotFound
 
-from browsepy import stream_template, get_cookie_browse_sorting, \
-                     browse_sortkey_reverse
+from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.file import OutsideDirectoryBase
+from browsepy.utils import stream_template
 
 from .playable import PlayableFile, PlayableDirectory, \
                       PlayListFile, detect_playable_mimetype
diff --git a/browsepy/utils.py b/browsepy/utils.py
index 5d84629..979ca21 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -5,6 +5,9 @@ import os.path
 import random
 import functools
 
+import flask
+
+
 ppath = functools.partial(
     os.path.join,
     os.path.dirname(os.path.realpath(__file__)),
@@ -14,3 +17,19 @@ ppath = functools.partial(
 def random_string(size, sample=tuple(map(chr, range(256)))):
     randrange = functools.partial(random.randrange, 0, len(sample))
     return ''.join(sample[randrange()] for i in range(size))
+
+
+def stream_template(template_name, **context):
+    '''
+    Some templates can be huge, this function returns an streaming response,
+    sending the content in chunks and preventing from timeout.
+
+    :param template_name: template
+    :param **context: parameters for templates.
+    :yields: HTML strings
+    '''
+    app = flask.current_app
+    app.update_template_context(context)
+    template = app.jinja_env.get_template(template_name)
+    stream = template.generate(context)
+    return flask.Response(flask.stream_with_context(stream))
-- 
GitLab


From f7aa1e7496a768d6710e1d3cf0edda4f746523d0 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 6 Apr 2019 00:16:35 +0200
Subject: [PATCH 048/171] active app context resolution on Node init

---
 browsepy/file.py                | 11 +++++++----
 browsepy/plugin/player/tests.py |  1 +
 browsepy/utils.py               |  8 +++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/browsepy/file.py b/browsepy/file.py
index 845aa5b..41b3744 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -15,6 +15,8 @@ from werkzeug.utils import cached_property
 
 from . import compat
 from . import manager
+from . import utils
+
 from .compat import range
 from .http import Headers
 from .stream import TarFileStream
@@ -84,6 +86,7 @@ class Node(object):
         Get current app's plugin manager.
 
         :returns: plugin manager instance
+        :type: browsepy.manager.PluginManagerBase
         '''
         return (
             self.app.extensions.get('plugin_manager') or
@@ -259,12 +262,12 @@ class Node(object):
         '''
         :param path: local path
         :type path: str
-        :param path: optional app instance
-        :type path: flask.app
-        :param **defaults: attributes will be set to object
+        :param app: app instance (optional inside application context)
+        :type app: flask.Flask
+        :param **defaults: initial property values
         '''
         self.path = compat.fsdecode(path) if path else None
-        self.app = current_app if app is None else app
+        self.app = utils.solve_local(current_app if app is None else app)
         self.__dict__.update(defaults)  # only for attr and cached_property
 
     def __repr__(self):
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index c40e2e2..68e42aa 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -346,6 +346,7 @@ class TestBlueprint(TestPlayerBase):
         self.file('directory/test.mp3')
         result = self.get('player.directory', path=name)
         self.assertEqual(result.status_code, 200)
+        self.assertIn(b'test.mp3', result.data)
 
     def test_endpoints(self):
         with self.app.app_context():
diff --git a/browsepy/utils.py b/browsepy/utils.py
index 979ca21..cffe00f 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -19,6 +19,12 @@ def random_string(size, sample=tuple(map(chr, range(256)))):
     return ''.join(sample[randrange()] for i in range(size))
 
 
+def solve_local(context_local):
+    if callable(getattr(context_local, '_get_current_object', None)):
+        return context_local._get_current_object()
+    return context_local
+
+
 def stream_template(template_name, **context):
     '''
     Some templates can be huge, this function returns an streaming response,
@@ -28,7 +34,7 @@ def stream_template(template_name, **context):
     :param **context: parameters for templates.
     :yields: HTML strings
     '''
-    app = flask.current_app
+    app = solve_local(context.get('current_app') or flask.current_app)
     app.update_template_context(context)
     template = app.jinja_env.get_template(template_name)
     stream = template.generate(context)
-- 
GitLab


From 5d13bd7f7cef747ac9ad2ea390d901b221c661a7 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Mon, 8 Apr 2019 12:50:14 +0200
Subject: [PATCH 049/171] fix tests

---
 browsepy/plugin/file_actions/tests.py     | 7 +++++--
 browsepy/plugin/player/__init__.py        | 2 +-
 browsepy/plugin/player/tests.py           | 9 ++++++++-
 browsepy/tests/deprecated/test_plugins.py | 9 +++++----
 browsepy/tests/test_file.py               | 2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 0ae0458..1c13497 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -439,9 +439,12 @@ class TestException(unittest.TestCase):
     module = file_actions_exceptions
     node_class = browsepy_file.Node
 
+    def setUp(self):
+        self.app = flask.Flask('browsepy')
+
     def test_invalid_clipboard_items_error(self):
         pair = (
-            self.node_class('/base/asdf'),
+            self.node_class('/base/asdf', app=self.app),
             Exception('Uncaught exception /base/asdf'),
             )
         e = self.module.InvalidClipboardItemsError(
@@ -451,7 +454,7 @@ class TestException(unittest.TestCase):
             issues=[pair]
             )
         e.append(
-            self.node_class('/base/other'),
+            self.node_class('/base/other', app=self.app),
             OSError(2, 'Not found with random message'),
             )
         self.assertIn('Uncaught exception asdf', e.issues[0].message)
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index 3abb881..68a38f8 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -48,7 +48,7 @@ def playlist(path):
     return NotFound()
 
 
-@player.route("/directory", defaults={"path": ""})
+@player.route('/directory', defaults={'path': ''})
 @player.route('/directory/<path:path>')
 def directory(path):
     sort_property = get_cookie_browse_sorting(path, 'text')
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 68e42aa..b903011 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -288,19 +288,26 @@ class TestPlayable(TestIntegrationBase):
 class TestBlueprint(TestPlayerBase):
     def setUp(self):
         super(TestBlueprint, self).setUp()
-        self.app = browsepy.app  # required for our url_for calls
+        self.app = flask.Flask('browsepy')
         self.app.config.update(
             directory_base=tempfile.mkdtemp(),
             SERVER_NAME='test'
             )
         self.app.register_blueprint(self.module.player)
 
+        app = self.app
+        @app.route("/open", defaults={"path": ""})
+        @app.route('/open/<path:path>')
+        def open(path):
+            pass
+
     def tearDown(self):
         shutil.rmtree(self.app.config['directory_base'])
         test_utils.clear_flask_context()
 
     def url_for(self, endpoint, **kwargs):
         with self.app.app_context():
+            print(flask.current_app)
             return flask.url_for(endpoint, _external=False, **kwargs)
 
     def get(self, endpoint, **kwargs):
diff --git a/browsepy/tests/deprecated/test_plugins.py b/browsepy/tests/deprecated/test_plugins.py
index 1328e96..53b03d9 100644
--- a/browsepy/tests/deprecated/test_plugins.py
+++ b/browsepy/tests/deprecated/test_plugins.py
@@ -209,7 +209,7 @@ class TestIntegration(TestIntegrationBase):
         self.assertEqual(actions[5].widget, widget)
 
     def test_register_widget(self):
-        file = self.file_module.Node()
+        file = self.file_module.Node(app=self.app)
         manager = self.manager_module.MimetypeActionPluginManager(self.app)
         widget = self.widget_module.StyleWidget('static', filename='a.css')
         manager.register_widget(widget)
@@ -261,9 +261,10 @@ class TestIntegration(TestIntegrationBase):
         self.assertEqual(file.link.text, 'asdf.txt')
 
     def test_from_file(self):
-        file = self.file_module.File('asdf.txt')
-        widget = self.widget_module.LinkWidget.from_file(file)
-        self.assertEqual(widget.text, 'asdf.txt')
+        with self.app.app_context():
+            file = self.file_module.File('asdf.txt')
+            widget = self.widget_module.LinkWidget.from_file(file)
+            self.assertEqual(widget.text, 'asdf.txt')
 
 
 class TestPlayable(TestIntegrationBase):
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index cd0ace4..d30b74d 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -41,7 +41,7 @@ class TestFile(unittest.TestCase):
 
     def test_repr(self):
         self.assertIsInstance(
-            repr(self.module.Node('a')),
+            repr(self.module.Node('a', app=self.app)),
             browsepy.compat.basestring
             )
 
-- 
GitLab


From e8718cd3a2727d1b41329a5f1981f2ffcce7f9a4 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Mon, 8 Apr 2019 17:43:55 +0200
Subject: [PATCH 050/171] fix a lot of app context issues

---
 .python-version                           |  2 +-
 browsepy/__init__.py                      |  3 +-
 browsepy/compat.py                        |  7 +-
 browsepy/file.py                          | 83 +++++++++++---------
 browsepy/manager.py                       | 36 +--------
 browsepy/plugin/file_actions/__init__.py  |  8 +-
 browsepy/plugin/file_actions/tests.py     |  9 +++
 browsepy/plugin/file_actions/utils.py     |  5 --
 browsepy/plugin/player/__init__.py        |  8 +-
 browsepy/plugin/player/playable.py        | 13 ++--
 browsepy/plugin/player/tests.py           | 40 +++++-----
 browsepy/plugin/player/utils.py           | 10 ---
 browsepy/tests/deprecated/test_plugins.py |  2 +-
 browsepy/tests/meta.py                    |  5 +-
 browsepy/tests/test_file.py               |  4 +-
 browsepy/tests/test_module.py             | 92 ++++++++++++-----------
 browsepy/tests/test_plugins.py            |  4 +-
 browsepy/tests/utils.py                   | 28 -------
 browsepy/utils.py                         | 74 +++++++++++++++++-
 doc/index.rst                             |  2 +-
 doc/tests_utils.rst                       |  2 +-
 setup.cfg                                 |  1 +
 22 files changed, 228 insertions(+), 210 deletions(-)
 delete mode 100644 browsepy/plugin/player/utils.py
 delete mode 100644 browsepy/tests/utils.py

diff --git a/.python-version b/.python-version
index a76ccff..0b2eb36 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.7.1
+3.7.2
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index b5733b9..73b90e2 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -132,7 +132,7 @@ def template_globals():
         }
 
 
-@app.route('/sort/<string:property>', defaults={"path": ""})
+@app.route('/sort/<string:property>', defaults={'path': ''})
 @app.route('/sort/<string:property>/<path:path>')
 def sort(property, path):
     try:
@@ -146,7 +146,6 @@ def sort(property, path):
     if request:
         session['browse:sort'] = \
             [(path, property)] + session.get('browse:sort', [])
-
     return redirect(url_for(".browse", path=directory.urlpath))
 
 
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 669645d..9be65c6 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -14,6 +14,11 @@ FS_ENCODING = sys.getfilesystemencoding()
 PY_LEGACY = sys.version_info < (3, )
 TRUE_VALUES = frozenset(('true', 'yes', '1', 'enable', 'enabled', True, 1))
 
+try:
+    import importlib.resources as res  # to support python >= 3.7
+except ImportError:
+    import importlib_resources as res  # noqa
+
 try:
     from os import scandir, walk  # python 3.5+
 except ImportError:
@@ -32,7 +37,7 @@ except ImportError:
 try:
     from collections.abc import Iterator as BaseIterator  # python 3.3+
 except ImportError:
-    from collections import Iterator as BaseIterator
+    from collections import Iterator as BaseIterator  # noqa
 
 
 def isexec(path):
diff --git a/browsepy/file.py b/browsepy/file.py
index 41b3744..64d2917 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -9,6 +9,7 @@ import string
 import random
 import datetime
 import logging
+import contextlib
 
 from flask import current_app, send_from_directory
 from werkzeug.utils import cached_property
@@ -16,10 +17,11 @@ from werkzeug.utils import cached_property
 from . import compat
 from . import manager
 from . import utils
+from . import stream
 
 from .compat import range
 from .http import Headers
-from .stream import TarFileStream
+
 from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
                         PathTooLongError, FilenameTooLongError
 
@@ -27,11 +29,12 @@ from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
 logger = logging.getLogger(__name__)
 unicode_underscore = '_'.decode('utf-8') if compat.PY_LEGACY else '_'
 underscore_replace = '%s:underscore' % __name__
-codecs.register_error(underscore_replace,
-                      lambda error: (unicode_underscore, error.start + 1)
-                      )
-binary_units = ("B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB")
-standard_units = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
+codecs.register_error(
+    underscore_replace,
+    lambda error: (unicode_underscore, error.start + 1)
+    )
+binary_units = ('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB')
+standard_units = ('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB')
 common_path_separators = '\\/'
 restricted_chars = '/\0'
 nt_restricted_chars = '/\0\\<>:"|?*' + ''.join(map(chr, range(1, 32)))
@@ -139,7 +142,7 @@ class Node(object):
         :returns: True if current node can be removed, False otherwise.
         :rtype: bool
         '''
-        dirbase = self.app.config["directory_remove"]
+        dirbase = self.app.config.get('directory_remove')
         return bool(dirbase and check_under_base(self.path, dirbase))
 
     @cached_property
@@ -171,7 +174,8 @@ class Node(object):
         :returns: parent object if available
         :rtype: Node instance or None
         '''
-        if check_path(self.path, self.app.config['directory_base']):
+        directory_base = self.app.config.get('directory_base', self.path)
+        if check_path(self.path, directory_base):
             return None
         parent = os.path.dirname(self.path) if self.path else None
         return self.directory_class(parent, self.app) if parent else None
@@ -214,7 +218,10 @@ class Node(object):
         :returns: relative-url-like for node's path
         :rtype: str
         '''
-        return abspath_to_urlpath(self.path, self.app.config['directory_base'])
+        return abspath_to_urlpath(
+            self.path,
+            self.app.config.get('directory_base', self.path),
+            )
 
     @property
     def name(self):
@@ -267,7 +274,7 @@ class Node(object):
         :param **defaults: initial property values
         '''
         self.path = compat.fsdecode(path) if path else None
-        self.app = utils.solve_local(current_app if app is None else app)
+        self.app = utils.solve_local(app or current_app)
         self.__dict__.update(defaults)  # only for attr and cached_property
 
     def __repr__(self):
@@ -302,8 +309,8 @@ class Node(object):
         :return: file object pointing to path
         :rtype: File
         '''
-        app = app or current_app
-        base = app.config['directory_base']
+        app = utils.solve_local(app or current_app)
+        base = app.config.get('directory_base', path)
         path = urlpath_to_abspath(path, base)
         if not cls.generic:
             kls = cls
@@ -425,7 +432,7 @@ class File(Node):
         try:
             size, unit = fmt_size(
                 self.stats.st_size,
-                self.app.config['use_binary_multiples'] if self.app else False
+                self.app.config.get('use_binary_multiples', False)
                 )
         except OSError:
             return None
@@ -481,6 +488,8 @@ class Directory(Node):
     * :attr:`generic` is set to False, so static method :meth:`from_urlpath`
       will always return instances of this class.
     '''
+    stream_class = stream.TarFileStream
+
     _listdir_cache = None
     mimetype = 'inode/directory'
     is_file = False
@@ -584,7 +593,7 @@ class Directory(Node):
         :returns: True if downloadable, False otherwise
         :rtype: bool
         '''
-        return self.app.config['directory_downloadable']
+        return self.app.config.get('directory_downloadable', False)
 
     @cached_property
     def can_upload(self):
@@ -595,7 +604,7 @@ class Directory(Node):
         :returns: True if a file can be upload to directory, False otherwise
         :rtype: bool
         '''
-        dirbase = self.app.config["directory_upload"]
+        dirbase = self.app.config.get('directory_upload', False)
         return dirbase and check_base(self.path, dirbase)
 
     @cached_property
@@ -639,9 +648,9 @@ class Directory(Node):
         :returns: Response object
         :rtype: flask.Response
         '''
-        stream = TarFileStream(
+        stream = self.stream_class(
             self.path,
-            self.app.config['directory_tar_buffsize'],
+            self.app.config.get('directory_tar_buffsize', 10240),
             self.plugin_manager.check_excluded,
             )
         return self.app.response_class(
@@ -711,29 +720,31 @@ class Directory(Node):
         Iter unsorted entries on this directory.
 
         :yields: Directory or File instance for each entry in directory
-        :ytype: Node
+        :rtype: Iterator of browsepy.file.Node
         '''
         directory_class = self.directory_class
         file_class = self.file_class
         exclude_fnc = self.plugin_manager.check_excluded
-        for entry in compat.scandir(self.path):
-            if exclude_fnc(entry.path):
-                continue
-            kwargs = {
-                'path': entry.path,
-                'app': self.app,
-                'parent': self,
-                'is_excluded': False
-                }
-            try:
-                if precomputed_stats and not entry.is_symlink():
-                    kwargs['stats'] = entry.stat()
-                if entry.is_dir(follow_symlinks=True):
-                    yield directory_class(**kwargs)
-                else:
-                    yield file_class(**kwargs)
-            except OSError as e:
-                logger.exception(e)
+        with contextlib.closing(compat.scandir(self.path)) as files:
+            for entry in files:
+                if exclude_fnc(entry.path):
+                    continue
+                kwargs = {
+                    'path': entry.path,
+                    'app': self.app,
+                    'parent': self,
+                    'is_excluded': False,
+                    }
+                try:
+                    if precomputed_stats and not entry.is_symlink():
+                        kwargs['stats'] = entry.stat()
+                    yield (
+                        directory_class(**kwargs)
+                        if entry.is_dir(follow_symlinks=True) else
+                        file_class(**kwargs)
+                        )
+                except OSError as e:
+                    logger.exception(e)
 
     def listdir(self, sortkey=None, reverse=False):
         '''
diff --git a/browsepy/manager.py b/browsepy/manager.py
index be2b8fa..a582c2f 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -14,6 +14,7 @@ from cookieman import CookieMan
 from . import mimetype
 from . import compat
 from .compat import deprecated, usedoc
+from .utils import get_module
 
 
 def defaultsnamedtuple(name, fields, defaults=None):
@@ -97,32 +98,6 @@ class PluginManagerBase(object):
         '''
         pass
 
-    def _expected_import_error(self, error, name):
-        '''
-        Check if error could be expected when importing given module by name.
-
-        :param error: exception
-        :type error: BaseException
-        :param name: module name
-        :type name: str
-        :returns: True if error corresponds to module name, False otherwise
-        :rtype: bool
-        '''
-        if error.args:
-            message = error.args[0]
-            components = (
-                name.split('.')
-                if isinstance(error, ImportError) else
-                (name,)
-                )
-            for finish in range(1, len(components) + 1):
-                for start in range(0, finish):
-                    part = '.'.join(components[start:finish])
-                    for fmt in (' \'%s\'', ' "%s"', ' %s'):
-                        if message.endswith(fmt % part):
-                            return True
-        return False
-
     def import_plugin(self, plugin):
         '''
         Import plugin by given name, looking at :attr:`namespaces`.
@@ -144,12 +119,9 @@ class PluginManagerBase(object):
                 return sys.modules[name]
 
         for name in names:
-            try:
-                __import__(name)
-                return sys.modules[name]
-            except (ImportError, KeyError) as e:
-                if not self._expected_import_error(e, name):
-                    raise e
+            module = get_module(name)
+            if module:
+                return module
 
         raise PluginNotFoundError(
             'No plugin module %r found, tried %r' % (plugin, names),
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index dd3e7f6..ddc8c72 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -12,7 +12,7 @@ from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
                           current_restricted_chars, common_path_separators
 from browsepy.compat import re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
-from browsepy.utils import stream_template
+from browsepy.utils import stream_template, ppath
 
 from .exceptions import FileActionsException, \
                         InvalidClipboardItemsError, \
@@ -27,9 +27,9 @@ actions = Blueprint(
     'file_actions',
     __name__,
     url_prefix='/file-actions',
-    template_folder=utils.ppath('templates'),
-    static_folder=utils.ppath('static'),
-    )
+    template_folder=ppath('templates', module=__name__),
+    static_folder=ppath('static', module=__name__),
+)
 
 re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
     re_escape(current_restricted_chars + common_path_separators)
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 1c13497..30a230b 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -12,6 +12,7 @@ import flask
 
 from werkzeug.utils import cached_property
 
+import browsepy.utils as utils
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
 import browsepy.file as browsepy_file
@@ -73,6 +74,9 @@ class TestRegistration(unittest.TestCase):
             exclude_fnc=None,
             )
 
+    def tearDown(self):
+        utils.clear_flask_context()
+
     def test_register_plugin(self):
         self.app.config.update(self.browsepy_module.app.config)
         self.app.config['plugin_namespaces'] = ('browsepy.plugin',)
@@ -130,6 +134,7 @@ class TestIntegration(unittest.TestCase):
         shutil.rmtree(self.base)
         self.app.config['plugin_modules'] = []
         self.manager.clear()
+        utils.clear_flask_context()
 
     def test_detection(self):
         with self.app.test_client() as client:
@@ -244,6 +249,7 @@ class TestAction(unittest.TestCase):
 
     def tearDown(self):
         shutil.rmtree(self.base)
+        utils.clear_flask_context()
 
     def mkdir(self, *path):
         os.mkdir(os.path.join(self.base, *path))
@@ -442,6 +448,9 @@ class TestException(unittest.TestCase):
     def setUp(self):
         self.app = flask.Flask('browsepy')
 
+    def tearDown(self):
+        utils.clear_flask_context()
+
     def test_invalid_clipboard_items_error(self):
         pair = (
             self.node_class('/base/asdf', app=self.app),
diff --git a/browsepy/plugin/file_actions/utils.py b/browsepy/plugin/file_actions/utils.py
index 039e973..8666f2a 100644
--- a/browsepy/plugin/file_actions/utils.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -10,11 +10,6 @@ from browsepy.compat import map
 
 from .exceptions import InvalidClipboardModeError
 
-ppath = functools.partial(
-    os.path.join,
-    os.path.dirname(os.path.realpath(__file__)),
-    )
-
 
 def copy(target, node, join_fnc=os.path.join):
     if node.is_excluded:
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index 68a38f8..0639131 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -5,20 +5,18 @@ from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.file import OutsideDirectoryBase
-from browsepy.utils import stream_template
+from browsepy.utils import stream_template, ppath
 
 from .playable import PlayableFile, PlayableDirectory, \
                       PlayListFile, detect_playable_mimetype
 
-from . import utils
-
 
 player = Blueprint(
     'player',
     __name__,
     url_prefix='/play',
-    template_folder=utils.ppath('templates'),
-    static_folder=utils.ppath('static'),
+    template_folder=ppath('templates', module=__name__),
+    static_folder=ppath('static', module=__name__),
     )
 
 
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 5b96487..acb0fc3 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -64,7 +64,7 @@ class PlayableBase(File):
         'm3u': 'audio/x-mpegurl',
         'm3u8': 'audio/x-mpegurl',
         'pls': 'audio/x-scpls',
-    }
+        }
 
     @classmethod
     def extensions_from_mimetypes(cls, mimetypes):
@@ -137,12 +137,11 @@ class PlayListFile(PlayableBase):
         return None
 
     def _entries(self):
-        return
-        yield  # noqa
+        return ()
 
     def entries(self, sortkey=None, reverse=None):
         for file in self._entries():
-            if PlayableFile.detect(file):
+            if self.playable_class.detect(file):
                 yield file
 
 
@@ -220,20 +219,20 @@ class PlayableDirectory(Directory):
 
     @cached_property
     def parent(self):
-        return Directory(self.path)
+        return self.directory_class(self.path, app=self.app)
 
     @classmethod
     def detect(cls, node):
         if node.is_directory:
             for file in node._listdir():
-                if PlayableFile.detect(file):
+                if cls.file_class.detect(file):
                     return cls.mimetype
         return None
 
     def entries(self, sortkey=None, reverse=None):
         listdir_fnc = super(PlayableDirectory, self).listdir
         for file in listdir_fnc(sortkey=sortkey, reverse=reverse):
-            if PlayableFile.detect(file):
+            if self.file_class.detect(file):
                 yield file
 
 
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index b903011..bda1f59 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -12,11 +12,11 @@ import flask
 from werkzeug.exceptions import NotFound
 
 import browsepy
+import browsepy.utils as utils
 import browsepy.file as browsepy_file
 import browsepy.manager as browsepy_manager
 import browsepy.plugin.player as player
 import browsepy.plugin.player.playable as player_playable
-import browsepy.tests.utils as test_utils
 
 
 class ManagerMock(object):
@@ -61,9 +61,15 @@ class TestPlayerBase(unittest.TestCase):
     def setUp(self):
         self.base = 'c:\\base' if os.name == 'nt' else '/base'
         self.app = flask.Flask(self.__class__.__name__)
-        self.app.config['directory_base'] = self.base
+        self.app.config.update(
+            directory_base=self.base,
+            SERVER_NAME='localhost',
+            )
         self.manager = ManagerMock()
 
+    def tearDown(self):
+        utils.clear_flask_context()
+
 
 class TestPlayer(TestPlayerBase):
     def test_register_plugin(self):
@@ -109,6 +115,9 @@ class TestIntegrationBase(TestPlayerBase):
     browsepy_module = browsepy
     manager_module = browsepy_manager
 
+    def tearDown(self):
+        utils.clear_flask_context()
+
 
 class TestIntegration(TestIntegrationBase):
     non_directory_args = ['--plugin', 'player']
@@ -199,7 +208,7 @@ class TestPlayable(TestIntegrationBase):
         try:
             file = p(tmpdir, 'playable.mp3')
             open(file, 'w').close()
-            node = browsepy_file.Directory(tmpdir)
+            node = browsepy_file.Directory(tmpdir, app=self.app)
             self.assertTrue(self.module.PlayableDirectory.detect(node))
 
             directory = self.module.PlayableDirectory(tmpdir, app=self.app)
@@ -288,27 +297,20 @@ class TestPlayable(TestIntegrationBase):
 class TestBlueprint(TestPlayerBase):
     def setUp(self):
         super(TestBlueprint, self).setUp()
-        self.app = flask.Flask('browsepy')
-        self.app.config.update(
-            directory_base=tempfile.mkdtemp(),
-            SERVER_NAME='test'
-            )
-        self.app.register_blueprint(self.module.player)
-
         app = self.app
-        @app.route("/open", defaults={"path": ""})
-        @app.route('/open/<path:path>')
-        def open(path):
+        app.template_folder = utils.ppath('templates')
+        app.config['directory_base'] = tempfile.mkdtemp()
+        app.register_blueprint(self.module.player)
+
+        @app.route("/browse", defaults={"path": ""}, endpoint='browse')
+        @app.route('/browse/<path:path>', endpoint='browse')
+        @app.route('/open/<path:path>', endpoint='open')
+        def dummy(path):
             pass
 
-    def tearDown(self):
-        shutil.rmtree(self.app.config['directory_base'])
-        test_utils.clear_flask_context()
-
     def url_for(self, endpoint, **kwargs):
         with self.app.app_context():
-            print(flask.current_app)
-            return flask.url_for(endpoint, _external=False, **kwargs)
+            return flask.url_for(endpoint, **kwargs)
 
     def get(self, endpoint, **kwargs):
         with self.app.test_client() as client:
diff --git a/browsepy/plugin/player/utils.py b/browsepy/plugin/player/utils.py
deleted file mode 100644
index 907c240..0000000
--- a/browsepy/plugin/player/utils.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: UTF-8 -*-
-
-import os
-import os.path
-import functools
-
-ppath = functools.partial(
-    os.path.join,
-    os.path.dirname(os.path.realpath(__file__)),
-    )
diff --git a/browsepy/tests/deprecated/test_plugins.py b/browsepy/tests/deprecated/test_plugins.py
index 53b03d9..c6e07f7 100644
--- a/browsepy/tests/deprecated/test_plugins.py
+++ b/browsepy/tests/deprecated/test_plugins.py
@@ -124,7 +124,7 @@ def register_plugin(manager):
 class TestPlayerBase(unittest.TestCase):
     module = player
     scheme = 'test'
-    hostname = 'testing'
+    hostname = 'localhost'
     urlprefix = '%s://%s' % (scheme, hostname)
 
     def assertUrlEqual(self, a, b):
diff --git a/browsepy/tests/meta.py b/browsepy/tests/meta.py
index c929d35..9ed086a 100644
--- a/browsepy/tests/meta.py
+++ b/browsepy/tests/meta.py
@@ -1,7 +1,4 @@
-try:
-    import importlib.resources as res
-except ImportError:  # pragma: no cover
-    import importlib_resources as res  # to support python < 3.7
+from browsepy.compat import res
 
 
 class TestFileMeta(type):
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index d30b74d..7acdde3 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -9,7 +9,7 @@ import stat
 import browsepy
 import browsepy.file
 import browsepy.compat
-import browsepy.tests.utils as test_utils
+import browsepy.utils as utils
 
 
 PY_LEGACY = browsepy.compat.PY_LEGACY
@@ -31,7 +31,7 @@ class TestFile(unittest.TestCase):
 
     def tearDown(self):
         shutil.rmtree(self.workbench)
-        test_utils.clear_flask_context()
+        utils.clear_flask_context()
 
     def textfile(self, name, text):
         tmp_txt = os.path.join(self.workbench, name)
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index 5914c8c..b162e67 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -22,7 +22,7 @@ import browsepy.file
 import browsepy.manager
 import browsepy.__main__
 import browsepy.compat
-import browsepy.tests.utils as test_utils
+import browsepy.utils as utils
 
 PY_LEGACY = browsepy.compat.PY_LEGACY
 range = browsepy.compat.range  # noqa
@@ -200,7 +200,7 @@ class TestApp(unittest.TestCase):
             directory_remove=self.remove,
             directory_upload=self.upload,
             exclude_fnc=exclude_fnc,
-            SERVER_NAME='test',
+            SERVER_NAME='localhost',
             )
 
         self.base_directories = [
@@ -225,7 +225,7 @@ class TestApp(unittest.TestCase):
 
     def tearDown(self):
         shutil.rmtree(self.base)
-        test_utils.clear_flask_context()
+        utils.clear_flask_context()
 
     def get(self, endpoint, **kwargs):
         status_code = kwargs.pop('status_code', 200)
@@ -240,11 +240,11 @@ class TestApp(unittest.TestCase):
             page_class = self.directory_download_class
         else:
             page_class = self.generic_page_class
-        with kwargs.pop('client', None) or self.app.test_client() as client:
-            response = client.get(
+        mclient = kwargs.pop('client', None) or self.app.test_client()
+        try:
+            response = mclient.get(
                 self.url_for(endpoint, **kwargs),
-                follow_redirects=follow_redirects
-                )
+                follow_redirects=follow_redirects)
             if response.status_code != status_code:
                 raise self.page_exceptions.get(
                     response.status_code,
@@ -252,7 +252,9 @@ class TestApp(unittest.TestCase):
                     )(response.status_code)
             result = page_class.from_source(response.data, response)
             response.close()
-        test_utils.clear_flask_context()
+        finally:
+            if mclient == kwargs.get('client'):
+                mclient.close()
         return result
 
     def post(self, endpoint, **kwargs):
@@ -270,7 +272,7 @@ class TestApp(unittest.TestCase):
                     self.page_exceptions[None]
                     )(response.status_code)
             result = self.list_page_class.from_source(response.data, response)
-        test_utils.clear_flask_context()
+        utils.clear_flask_context()
         return result
 
     def url_for(self, endpoint, **kwargs):
@@ -602,44 +604,44 @@ class TestApp(unittest.TestCase):
             with open(path, 'wb') as f:
                 f.write(content.encode('ascii'))
 
-        client = self.app.test_client()
-        page = self.get('browse', client=client)
-        self.assertListEqual(page.files, by_name)
+        with self.app.test_client() as client:
+            page = self.get('browse', client=client)
+            self.assertListEqual(page.files, by_name)
 
-        self.assertRaises(
-            Page302Exception,
-            self.get, 'sort', property='text', client=client
-            )
+            self.assertRaises(
+                Page302Exception,
+                self.get, 'sort', property='text', client=client
+                )
 
-        page = self.get('browse', client=client)
-        self.assertListEqual(page.files, by_name)
+            page = self.get('browse', client=client)
+            self.assertListEqual(page.files, by_name)
 
-        page = self.get('sort', property='-text', client=client,
-                        follow_redirects=True)
-        self.assertListEqual(page.files, by_name_desc)
+            page = self.get('sort', property='-text', client=client,
+                            follow_redirects=True)
+            self.assertListEqual(page.files, by_name_desc)
 
-        page = self.get('sort', property='type', client=client,
-                        follow_redirects=True)
-        self.assertListEqual(page.files, by_type)
+            page = self.get('sort', property='type', client=client,
+                            follow_redirects=True)
+            self.assertListEqual(page.files, by_type)
 
-        page = self.get('sort', property='-type', client=client,
-                        follow_redirects=True)
-        self.assertListEqual(page.files, by_type_desc)
+            page = self.get('sort', property='-type', client=client,
+                            follow_redirects=True)
+            self.assertListEqual(page.files, by_type_desc)
 
-        page = self.get('sort', property='size', client=client,
-                        follow_redirects=True)
-        self.assertListEqual(page.files, by_size)
+            page = self.get('sort', property='size', client=client,
+                            follow_redirects=True)
+            self.assertListEqual(page.files, by_size)
 
-        page = self.get('sort', property='-size', client=client,
-                        follow_redirects=True)
-        self.assertListEqual(page.files, by_size_desc)
+            page = self.get('sort', property='-size', client=client,
+                            follow_redirects=True)
+            self.assertListEqual(page.files, by_size_desc)
 
-        # We're unable to test modified sorting due filesystem time resolution
-        page = self.get('sort', property='modified', client=client,
-                        follow_redirects=True)
+            # Cannot to test modified sorting due filesystem time resolution
+            page = self.get('sort', property='modified', client=client,
+                            follow_redirects=True)
 
-        page = self.get('sort', property='-modified', client=client,
-                        follow_redirects=True)
+            page = self.get('sort', property='-modified', client=client,
+                            follow_redirects=True)
 
     def test_sort_cookie_size(self):
         files = [chr(i) * 150 for i in range(97, 123)]
@@ -647,14 +649,14 @@ class TestApp(unittest.TestCase):
             path = os.path.join(self.base, name)
             os.mkdir(path)
 
-        client = self.app.test_client()
-        for name in files:
-            page = self.get('sort', property='modified', path=name,
-                            client=client, status_code=302)
+        with self.app.test_client() as client:
+            for name in files:
+                page = self.get('sort', property='modified', path=name,
+                                client=client, status_code=302)
 
-            for cookie in page.response.headers.getlist('set-cookie'):
-                if cookie.startswith('browse-sorting='):
-                    self.assertLessEqual(len(cookie), 4000)
+                for cookie in page.response.headers.getlist('set-cookie'):
+                    if cookie.startswith('browse-sorting='):
+                        self.assertLessEqual(len(cookie), 4000)
 
     def test_endpoints(self):
         # test endpoint function for the library use-case
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 8f2f3e1..80d8e18 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -4,7 +4,7 @@ import flask
 
 import browsepy
 import browsepy.manager
-import browsepy.tests.utils as test_utils
+import browsepy.utils as utils
 
 from browsepy.plugin.player.tests import *  # noqa
 from browsepy.plugin.file_actions.tests import *  # noqa
@@ -55,7 +55,7 @@ class TestPlugins(unittest.TestCase):
     def tearDown(self):
         self.app.config['plugin_namespaces'] = self.original_namespaces
         self.manager.clear()
-        test_utils.clear_flask_context()
+        utils.clear_flask_context()
 
     def test_manager(self):
         self.manager.load_plugin(self.plugin_name)
diff --git a/browsepy/tests/utils.py b/browsepy/tests/utils.py
deleted file mode 100644
index e328aa6..0000000
--- a/browsepy/tests/utils.py
+++ /dev/null
@@ -1,28 +0,0 @@
-
-import flask
-
-
-def clear_localstack(stack):
-    '''
-    Clear given werkzeug LocalStack instance.
-
-    :param ctx: local stack instance
-    :type ctx: werkzeug.local.LocalStack
-    '''
-    while stack.pop():
-        pass
-
-
-def clear_flask_context():
-    '''
-    Clear flask current_app and request globals.
-
-    When using :meth:`flask.Flask.test_client`, even as context manager,
-    the flask's globals :attr:`flask.current_app` and :attr:`flask.request`
-    are left dirty, so testing code relying on them will probably fail.
-
-    This function clean said globals, and should be called after testing
-    with :meth:`flask.Flask.test_client`.
-    '''
-    clear_localstack(flask._app_ctx_stack)
-    clear_localstack(flask._request_ctx_stack)
diff --git a/browsepy/utils.py b/browsepy/utils.py
index cffe00f..f02177a 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -1,5 +1,6 @@
 # -*- coding: UTF-8 -*-
 
+import sys
 import os
 import os.path
 import random
@@ -8,18 +9,56 @@ import functools
 import flask
 
 
-ppath = functools.partial(
-    os.path.join,
-    os.path.dirname(os.path.realpath(__file__)),
-    )
+def ppath(*args, module=__name__):
+    '''
+    Get joined file path relative to module location.
+    '''
+    module = get_module(module)
+    path = os.path.realpath(module.__file__)
+    return os.path.join(os.path.dirname(path), *args)
+
+
+def get_module(name):
+    '''
+    Get module object by name
+    '''
+    try:
+        __import__(name)
+        return sys.modules[name]
+    except (ImportError, KeyError) as error:
+        if error.args:
+            message = error.args[0]
+            parts = (name,) if isinstance(error, KeyError) else name.split('.')
+            part = ''
+            for component in parts:
+                part += component
+                for fmt in (' \'%s\'', ' "%s"', ' %s'):
+                    if message.endswith(fmt % part):
+                        return None
+                part += '.'
+        raise
 
 
 def random_string(size, sample=tuple(map(chr, range(256)))):
+    '''
+    Get random string of given size.
+
+    :param size: length of the returned string
+    :type size: int
+    :param sample: character space, defaults to full 8-bit utf-8
+    :type sample: tuple of str
+    :returns: random string of specified size
+    :rtype: str
+    '''
     randrange = functools.partial(random.randrange, 0, len(sample))
     return ''.join(sample[randrange()] for i in range(size))
 
 
 def solve_local(context_local):
+    '''
+    Resolve given context local to its actual value. If given object
+    it's not a context local nothing happens, just returns the same value.
+    '''
     if callable(getattr(context_local, '_get_current_object', None)):
         return context_local._get_current_object()
     return context_local
@@ -33,9 +72,36 @@ def stream_template(template_name, **context):
     :param template_name: template
     :param **context: parameters for templates.
     :yields: HTML strings
+    :rtype: Iterator of str
     '''
     app = solve_local(context.get('current_app') or flask.current_app)
     app.update_template_context(context)
     template = app.jinja_env.get_template(template_name)
     stream = template.generate(context)
     return flask.Response(flask.stream_with_context(stream))
+
+
+def clear_localstack(stack):
+    '''
+    Clear given werkzeug LocalStack instance.
+
+    :param ctx: local stack instance
+    :type ctx: werkzeug.local.LocalStack
+    '''
+    while stack.pop():
+        pass
+
+
+def clear_flask_context():
+    '''
+    Clear flask current_app and request globals.
+
+    When using :meth:`flask.Flask.test_client`, even as context manager,
+    the flask's globals :attr:`flask.current_app` and :attr:`flask.request`
+    are left dirty, so testing code relying on them will probably fail.
+
+    This function clean said globals, and should be called after testing
+    with :meth:`flask.Flask.test_client`.
+    '''
+    clear_localstack(flask._app_ctx_stack)
+    clear_localstack(flask._request_ctx_stack)
diff --git a/doc/index.rst b/doc/index.rst
index e5435e8..1a2dc88 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -53,7 +53,7 @@ Specific information about functions, class or methods.
    stream
    compat
    exceptions
-   tests_utils
+   utils
 
 Indices and tables
 ==================
diff --git a/doc/tests_utils.rst b/doc/tests_utils.rst
index 8816eb7..40d89e5 100644
--- a/doc/tests_utils.rst
+++ b/doc/tests_utils.rst
@@ -5,7 +5,7 @@ Test Utility Module
 
 Convenience functions for unit testing.
 
-.. automodule:: browsepy.tests.utils
+.. automodule:: browsepy.utils
   :show-inheritance:
   :members:
   :inherited-members:
diff --git a/setup.cfg b/setup.cfg
index 9cce8f5..fa4df87 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,3 +32,4 @@ fail_under = 100
 exclude_lines =
     pragma: no cover
     pass
+    noqa
-- 
GitLab


From 5e685008a1bcdde7a9d3c87ffc7ec221ee9be0ff Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 9 Apr 2019 10:39:01 +0200
Subject: [PATCH 051/171] fix travis yml, test PLSFileParser

---
 .travis.yml                        |  3 +--
 browsepy/plugin/player/playable.py |  1 +
 browsepy/plugin/player/tests.py    | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index db92f2e..e6dfabe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,7 @@ script:
     fi
   - |
     if [ "$sphinx" = "yes" ]; then
-      make -C doc html 2>&1 | grep -v \
-		    'WARNING: more than one target found for cross-reference'
+      make -C doc html
     fi
 
 after_success:
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index acb0fc3..7e1b278 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -23,6 +23,7 @@ class PLSFileParser(object):
     '''
     NOT_SET = type('NotSetType', (object,), {})
     option_exceptions = (
+        six.moves.configparser.NoSectionError,
         six.moves.configparser.NoOptionError,
         ValueError,
         )
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index bda1f59..bcf8e4f 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -7,6 +7,7 @@ import shutil
 import tempfile
 
 import six
+import six.moves
 import flask
 
 from werkzeug.exceptions import NotFound
@@ -43,6 +44,29 @@ class ManagerMock(object):
         return self.argument_values.get(name, default)
 
 
+class TestPLSFileParser(unittest.TestCase):
+    module = player_playable
+    exceptions = player_playable.PLSFileParser.option_exceptions
+
+    def get_parser(self, content=''):
+        with tempfile.NamedTemporaryFile(mode='w') as f:
+            f.write(content)
+            f.flush()
+            return self.module.PLSFileParser(f.name)
+
+    def test_getint(self):
+        parser = self.get_parser()
+        self.assertEqual(parser.getint('a', 'a', 2), 2)
+        with self.assertRaises(self.exceptions):
+            parser.getint('a', 'a')
+
+    def test_get(self):
+        parser = self.get_parser()
+        self.assertEqual(parser.get('a', 'a', 2), 2)
+        with self.assertRaises(self.exceptions):
+            parser.get('a', 'a')
+
+
 class TestPlayerBase(unittest.TestCase):
     module = player
 
-- 
GitLab


From 4e70f5e36ef8dd7bc117ce9736d3223c5c811d65 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 9 Apr 2019 11:06:44 +0200
Subject: [PATCH 052/171] make ppath py2-compatible

---
 browsepy/tests/test_utils.py | 24 ++++++++++++++++++++++++
 browsepy/utils.py            | 12 ++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 browsepy/tests/test_utils.py

diff --git a/browsepy/tests/test_utils.py b/browsepy/tests/test_utils.py
new file mode 100644
index 0000000..a8507e4
--- /dev/null
+++ b/browsepy/tests/test_utils.py
@@ -0,0 +1,24 @@
+# -*- coding: UTF-8 -*-
+
+import unittest
+
+import browsepy.utils as utils
+
+
+class TestPPath(unittest.TestCase):
+    def test_bad_kwarg(self):
+        with self.assertRaises(TypeError) as e:
+            utils.ppath('a', 'b', bad=1)
+            self.assertIn('\'bad\'', e.args[0])
+
+    def test_join(self):
+        self.assertTrue(
+            utils
+            .ppath('a', 'b', module=__name__)
+            .endswith('browsepy/tests/a/b')
+            )
+        self.assertTrue(
+            utils
+            .ppath('a', 'b')
+            .endswith('browsepy/a/b')
+            )
diff --git a/browsepy/utils.py b/browsepy/utils.py
index f02177a..7ed40d4 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -9,11 +9,19 @@ import functools
 import flask
 
 
-def ppath(*args, module=__name__):
+def ppath(*args, **kwargs):
     '''
     Get joined file path relative to module location.
+
+    :param module: Module name
+    :type module: str
     '''
-    module = get_module(module)
+    module = get_module(kwargs.pop('module', __name__))
+    if kwargs:
+        raise TypeError(
+            'ppath() got an unexpected keyword argument \'%s\''
+            % next(iter(kwargs))
+            )
     path = os.path.realpath(module.__file__)
     return os.path.join(os.path.dirname(path), *args)
 
-- 
GitLab


From d286734b79c5646c934c61d3dbf4842513f698e6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 9 Apr 2019 11:30:35 +0200
Subject: [PATCH 053/171] backwards-compatible scandir close

---
 browsepy/file.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/browsepy/file.py b/browsepy/file.py
index 64d2917..1dea225 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -9,7 +9,6 @@ import string
 import random
 import datetime
 import logging
-import contextlib
 
 from flask import current_app, send_from_directory
 from werkzeug.utils import cached_property
@@ -725,7 +724,8 @@ class Directory(Node):
         directory_class = self.directory_class
         file_class = self.file_class
         exclude_fnc = self.plugin_manager.check_excluded
-        with contextlib.closing(compat.scandir(self.path)) as files:
+        files = compat.scandir(self.path)
+        try:
             for entry in files:
                 if exclude_fnc(entry.path):
                     continue
@@ -745,6 +745,9 @@ class Directory(Node):
                         )
                 except OSError as e:
                     logger.exception(e)
+        finally:
+            if callable(getattr(files, 'close', None)):
+                files.close()
 
     def listdir(self, sortkey=None, reverse=False):
         '''
-- 
GitLab


From ad86afb3d2894d22e32ddfa4e9a8e316fa58cfd8 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 9 Apr 2019 17:40:49 +0200
Subject: [PATCH 054/171] fix import error detection logic

---
 browsepy/utils.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/browsepy/utils.py b/browsepy/utils.py
index 7ed40d4..86cfac1 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -3,12 +3,16 @@
 import sys
 import os
 import os.path
+import re
 import random
 import functools
 
 import flask
 
 
+RE_WORDS = re.compile(r'\b((?:[._]+|\w)+)\b')
+
+
 def ppath(*args, **kwargs):
     '''
     Get joined file path relative to module location.
@@ -28,22 +32,24 @@ def ppath(*args, **kwargs):
 
 def get_module(name):
     '''
-    Get module object by name
+    Get module object by name.
+
+    :param name: module name
+    :type name: str
+    :return: module or None if not found
+    :rtype: module or None
     '''
     try:
         __import__(name)
         return sys.modules[name]
     except (ImportError, KeyError) as error:
-        if error.args:
-            message = error.args[0]
-            parts = (name,) if isinstance(error, KeyError) else name.split('.')
-            part = ''
-            for component in parts:
-                part += component
-                for fmt in (' \'%s\'', ' "%s"', ' %s'):
-                    if message.endswith(fmt % part):
-                        return None
-                part += '.'
+        if isinstance(error, ImportError):
+            message = error.args[0] if error.args else ''
+            words = frozenset(RE_WORDS.findall(message))
+            parts = name.split('.')
+            for i in range(len(parts) - 1, 0, -1):
+                if '.'.join(parts[i:]) in words:
+                    return None
         raise
 
 
-- 
GitLab


From d306a4e073d2990a7797f499f5514f2e8d3d8fa7 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 9 Apr 2019 17:41:49 +0200
Subject: [PATCH 055/171] fix import error detection logic, again

---
 browsepy/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/utils.py b/browsepy/utils.py
index 86cfac1..caca42c 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -47,7 +47,7 @@ def get_module(name):
             message = error.args[0] if error.args else ''
             words = frozenset(RE_WORDS.findall(message))
             parts = name.split('.')
-            for i in range(len(parts) - 1, 0, -1):
+            for i in range(len(parts) - 1, -1, -1):
                 if '.'.join(parts[i:]) in words:
                     return None
         raise
-- 
GitLab


From 4768130101d25a2aa65059f7c42d98460a9d7a48 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 9 Apr 2019 17:45:24 +0200
Subject: [PATCH 056/171] avoid upgrade pip in py33

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e6dfabe..a9dd839 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ matrix:
   - python: "pypy"
   - python: "pypy3"
   - python: "3.3"
+    env:
+    - legacy=yes
   - python: "3.4"
   - python: "3.5"
   - python: "3.6"
@@ -19,7 +21,10 @@ matrix:
     - sphinx=yes
 
 install:
-  - pip install --upgrade pip
+  - |
+    if [ "$legacy" != "yes" ]; then
+      pip install --upgrade pip
+    fi
   - pip install -r requirements/ci.txt
   - pip install .
   - |
-- 
GitLab


From f04241281aa1faab0b45623c9903a50942b3f89a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 9 Apr 2019 19:52:29 +0200
Subject: [PATCH 057/171] expose default mimetype implementation priority

---
 browsepy/manager.py  |  6 +-----
 browsepy/mimetype.py | 38 +++++++++++++++++++-------------------
 browsepy/utils.py    |  4 ++--
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/browsepy/manager.py b/browsepy/manager.py
index a582c2f..a29583d 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -420,11 +420,7 @@ class MimetypePluginManager(RegistrablePluginManager):
     '''
     Plugin manager for mimetype-function registration.
     '''
-    _default_mimetype_functions = (
-        mimetype.by_python,
-        mimetype.by_file,
-        mimetype.by_default,
-        )
+    _default_mimetype_functions = mimetype.alternatives
 
     def clear(self):
         '''
diff --git a/browsepy/mimetype.py b/browsepy/mimetype.py
index bcdba47..ef681f0 100644
--- a/browsepy/mimetype.py
+++ b/browsepy/mimetype.py
@@ -21,26 +21,26 @@ def by_python(path):
         )
 
 
-if which('file'):
-    def by_file(path):
-        try:
-            output = subprocess.check_output(
-                ("file", "-ib", path),
-                universal_newlines=True
-                ).strip()
-            if (
-              re_mime_validate.match(output) and
-              output not in generic_mimetypes
-              ):
-                # 'file' command can return status zero with invalid output
-                return output
-        except (subprocess.CalledProcessError, FileNotFoundError):
-            pass
-        return None
-else:
-    def by_file(path):
-        return None
+def by_file(path):
+    try:
+        output = subprocess.check_output(
+            ("file", "-ib", path),
+            universal_newlines=True
+            ).strip()
+        if re_mime_validate.match(output) and output not in generic_mimetypes:
+            # 'file' command can return status zero with invalid output
+            return output
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        pass
+    return None
 
 
 def by_default(path):
     return "application/octet-stream"
+
+
+alternatives = (
+    (by_python, by_file, by_default)
+    if which('file') else
+    (by_python, by_default)
+    )
diff --git a/browsepy/utils.py b/browsepy/utils.py
index caca42c..65fd397 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -10,7 +10,7 @@ import functools
 import flask
 
 
-RE_WORDS = re.compile(r'\b((?:[._]+|\w)+)\b')
+re_words = re.compile(r'\b((?:[._]+|\w)+)\b')
 
 
 def ppath(*args, **kwargs):
@@ -45,7 +45,7 @@ def get_module(name):
     except (ImportError, KeyError) as error:
         if isinstance(error, ImportError):
             message = error.args[0] if error.args else ''
-            words = frozenset(RE_WORDS.findall(message))
+            words = frozenset(re_words.findall(message))
             parts = name.split('.')
             for i in range(len(parts) - 1, -1, -1):
                 if '.'.join(parts[i:]) in words:
-- 
GitLab


From 493f5f1a452dc04621d9ae58401dab220ed6d483 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 10 Apr 2019 11:40:46 +0200
Subject: [PATCH 058/171] wip plugin listing

---
 browsepy/manager.py            | 32 ++++++++++++++++++++++++++++++++
 browsepy/tests/test_plugins.py |  5 +++++
 2 files changed, 37 insertions(+)

diff --git a/browsepy/manager.py b/browsepy/manager.py
index a29583d..0a0ec0d 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -65,6 +65,10 @@ class PluginManagerBase(object):
         return self.app.config['plugin_namespaces'] if self.app else []
 
     def __init__(self, app=None):
+        '''
+        :param app: flask application
+        :type app: flask.Flask
+        '''
         if app is None:
             self.clear()
         else:
@@ -73,6 +77,9 @@ class PluginManagerBase(object):
     def init_app(self, app):
         '''
         Initialize this Flask extension for given app.
+
+        :param app: flask application
+        :type app: flask.Flask
         '''
         self.app = app
         if not hasattr(app, 'extensions'):
@@ -98,6 +105,25 @@ class PluginManagerBase(object):
         '''
         pass
 
+    def iter_plugins(self):
+        '''
+        Iterate through all loadable plugins on default import locations
+        '''
+        res = compat.res
+        for base in self.namespaces:
+            for item in res.contents(base):
+                if not res.is_resource(base, item):
+                    submodule = '%s.%s' % (base, item)
+                    module = get_module(submodule)
+                    if module and self.check_plugin(module):
+                        yield submodule
+
+    def check_plugin(self, plugin):
+        '''
+        Check if given object (usually a python module) is a valid plugin
+        '''
+        return True
+
     def import_plugin(self, plugin):
         '''
         Import plugin by given name, looking at :attr:`namespaces`.
@@ -143,6 +169,12 @@ class RegistrablePluginManager(PluginManagerBase):
     Base plugin manager for plugin registration via :func:`register_plugin`
     functions at plugin module level.
     '''
+    def check_plugin(self, plugin):
+        return (
+            super(RegistrablePluginManager, self).check_plugin(plugin) and
+            callable(getattr(plugin, 'register_plugin'))
+            )
+
     def load_plugin(self, plugin):
         '''
         Import plugin (see :meth:`import_plugin`) and load related data.
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 80d8e18..ef128db 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -87,6 +87,11 @@ class TestPlugins(unittest.TestCase):
             self.manager.register_widget
             )
 
+    def test_list(self):
+        names = list(self.manager.iter_plugins())
+        self.assertIn('player', names)
+        self.assertIn('file_actions', names)
+
     def test_namespace_prefix(self):
         self.assertTrue(self.manager.import_plugin(self.plugin_name))
         self.app.config['plugin_namespaces'] = (
-- 
GitLab


From d23e1e80e5ddc40b67ea1f644bbc7a5298a5c7b0 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 11 Apr 2019 22:50:26 +0200
Subject: [PATCH 059/171] add plugin search, argparse workaround

---
 browsepy/__main__.py           |  30 +++++-----
 browsepy/compat.py             |  14 +++++
 browsepy/manager.py            | 103 ++++++++++++++++++++++++---------
 browsepy/tests/test_main.py    |  25 ++++----
 browsepy/tests/test_plugins.py |   5 +-
 setup.cfg                      |   2 +-
 6 files changed, 125 insertions(+), 54 deletions(-)

diff --git a/browsepy/__main__.py b/browsepy/__main__.py
index 948b01a..fdbfc55 100644
--- a/browsepy/__main__.py
+++ b/browsepy/__main__.py
@@ -6,12 +6,11 @@ import sys
 import os
 import os.path
 import argparse
-import warnings
 
 import flask
 
-from . import app
-from .compat import PY_LEGACY, getdebug, get_terminal_size
+from . import app, plugin_manager, __version__
+from .compat import PY_LEGACY, getdebug, get_terminal_size, SafeArgumentParser
 from .transform.glob import translate
 
 
@@ -27,15 +26,8 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
             prog, indent_increment, max_help_position, width)
 
 
-class PluginAction(argparse.Action):
+class CommaSeparatedAction(argparse.Action):
     def __call__(self, parser, namespace, value, option_string=None):
-        warned = '%s_warning' % self.dest
-        if ',' in value and not getattr(namespace, warned, False):
-            setattr(namespace, warned, True)
-            warnings.warn(
-                'Comma-separated --plugin value is deprecated, '
-                'use multiple --plugin options instead.'
-                )
         values = value.split(',')
         prev = getattr(namespace, self.dest, None)
         if isinstance(prev, list):
@@ -43,7 +35,7 @@ class PluginAction(argparse.Action):
         setattr(namespace, self.dest, values)
 
 
-class ArgParse(argparse.ArgumentParser):
+class ArgParse(SafeArgumentParser):
     default_directory = app.config['directory_base']
     default_initial = (
         None
@@ -56,10 +48,14 @@ class ArgParse(argparse.ArgumentParser):
 
     default_host = os.getenv('BROWSEPY_HOST', '127.0.0.1')
     default_port = os.getenv('BROWSEPY_PORT', '8080')
-    plugin_action_class = PluginAction
 
     defaults = {
+        'add_help': True,
         'prog': name,
+        'epilog': 'available plugins:\n%s' % '\n'.join(
+            '  %s, %s' % (short, name) if short else '  %s' % name
+            for name, short in plugin_manager.iter_plugins()
+            ),
         'formatter_class': HelpFormatter,
         'description': 'description: starts a %s web file browser' % name
         }
@@ -74,6 +70,9 @@ class ArgParse(argparse.ArgumentParser):
             'port', nargs='?', type=int,
             default=self.default_port,
             help='port to listen (default: %(default)s)')
+        self.add_argument(
+            '--help-all', action='store_true',
+            help='show help for all available plugins and exit')
         self.add_argument(
             '--directory', metavar='PATH', type=self._directory,
             default=self.default_directory,
@@ -101,9 +100,12 @@ class ArgParse(argparse.ArgumentParser):
             action='append',
             default=[],
             help='exclude paths by pattern file (multiple)')
+        self.add_argument(
+            '--version', action='version',
+            version=__version__)
         self.add_argument(
             '--plugin', metavar='MODULE',
-            action=self.plugin_action_class,
+            action=CommaSeparatedAction,
             default=[],
             help='load plugin module (multiple)')
         self.add_argument(
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 9be65c6..9f3ebbd 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -9,6 +9,7 @@ import functools
 import warnings
 import posixpath
 import ntpath
+import argparse
 
 FS_ENCODING = sys.getfilesystemencoding()
 PY_LEGACY = sys.version_info < (3, )
@@ -40,6 +41,19 @@ except ImportError:
     from collections import Iterator as BaseIterator  # noqa
 
 
+class SafeArgumentParser(argparse.ArgumentParser):
+    allow_abbrev_support = sys.version_info >= (3, 5, 0)
+
+    def _get_option_tuples(self, option_string):
+        return []
+
+    def __init__(self, **kwargs):
+        if self.allow_abbrev_support:
+            kwargs.setdefault('allow_abbrev', False)
+        kwargs.setdefault('add_help', False)
+        super(SafeArgumentParser, self).__init__(**kwargs)
+
+
 def isexec(path):
     '''
     Check if given path points to an executable file.
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 0a0ec0d..588e4c3 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -2,6 +2,7 @@
 
 import re
 import sys
+import pkgutil
 import argparse
 import warnings
 import collections
@@ -13,7 +14,7 @@ from cookieman import CookieMan
 
 from . import mimetype
 from . import compat
-from .compat import deprecated, usedoc
+from .compat import deprecated, usedoc, SafeArgumentParser
 from .utils import get_module
 
 
@@ -69,6 +70,8 @@ class PluginManagerBase(object):
         :param app: flask application
         :type app: flask.Flask
         '''
+        self.plugin_filters = []
+
         if app is None:
             self.clear()
         else:
@@ -105,24 +108,47 @@ class PluginManagerBase(object):
         '''
         pass
 
-    def iter_plugins(self):
+    def _iter_modules(self, prefix):
         '''
-        Iterate through all loadable plugins on default import locations
+        Iterate thru all root modules containing given prefix.
+        '''
+        for info in pkgutil.iter_modules():
+            if info.name.startswith(prefix):
+                yield info.name, None
+
+    def _iter_submodules(self, prefix):
+        '''
+        Iterate thru all submodules which full name contains given prefix.
         '''
         res = compat.res
-        for base in self.namespaces:
-            for item in res.contents(base):
-                if not res.is_resource(base, item):
-                    submodule = '%s.%s' % (base, item)
-                    module = get_module(submodule)
-                    if module and self.check_plugin(module):
-                        yield submodule
+        parent = prefix.rsplit('.', 1)[0]
+        for base in (prefix, parent):
+            try:
+                for item in res.contents(base):
+                    name = '%s.%s' % (base, item)
+                    if name.startswith(prefix) and \
+                       not res.is_resource(base, item):
+                        yield name, item
+                break
+            except ImportError:
+                pass
 
-    def check_plugin(self, plugin):
+    def iter_plugins(self):
         '''
-        Check if given object (usually a python module) is a valid plugin
+        Iterate through all loadable plugins on default import locations
         '''
-        return True
+        for prefix in self.namespaces:
+            names = (
+                self._iter_submodules(prefix)
+                if '.' in prefix else
+                self._iter_modules(prefix)
+                if prefix else
+                ()
+                )
+            for name, short in names:
+                module = get_module(name)
+                if module and any(f(module) for f in self.plugin_filters):
+                    yield name, short
 
     def import_plugin(self, plugin):
         '''
@@ -169,10 +195,10 @@ class RegistrablePluginManager(PluginManagerBase):
     Base plugin manager for plugin registration via :func:`register_plugin`
     functions at plugin module level.
     '''
-    def check_plugin(self, plugin):
-        return (
-            super(RegistrablePluginManager, self).check_plugin(plugin) and
-            callable(getattr(plugin, 'register_plugin'))
+    def __init__(self, app=None):
+        super(RegistrablePluginManager, self).__init__(app)
+        self.plugin_filters.append(
+            lambda o: callable(getattr(o, 'register_plugin', None))
             )
 
     def load_plugin(self, plugin):
@@ -532,6 +558,12 @@ class ArgumentPluginManager(PluginManagerBase):
     _argparse_kwargs = {'add_help': False}
     _argparse_arguments = argparse.Namespace()
 
+    def __init__(self, app=None):
+        super(ArgumentPluginManager, self).__init__(app)
+        self.plugin_filters.append(
+            lambda o: callable(getattr(o, 'register_arguments', None))
+            )
+
     def extract_plugin_arguments(self, plugin):
         '''
         Given a plugin name, extracts its registered_arguments as an
@@ -549,6 +581,13 @@ class ArgumentPluginManager(PluginManagerBase):
             return manager._argparse_argkwargs
         return ()
 
+    @cached_property
+    def _default_argument_parser(self):
+        parser = SafeArgumentParser()
+        parser.add_argument('--plugin', action='append', default=[])
+        parser.add_argument('--help-all', action='store_true')
+        return parser
+
     def load_arguments(self, argv, base=None):
         '''
         Process given argument list based on registered arguments and given
@@ -568,25 +607,37 @@ class ArgumentPluginManager(PluginManagerBase):
                   given by :meth:`argparse.ArgumentParser.parse_args`.
         :rtype: argparse.Namespace
         '''
-        plugin_parser = argparse.ArgumentParser(add_help=False)
-        plugin_parser.add_argument('--plugin', action='append', default=[])
-        parent = base or plugin_parser
-        parser = argparse.ArgumentParser(
-            parents=(parent,),
-            add_help=False,
-            **getattr(parent, 'defaults', {})
+        parser = SafeArgumentParser(
+            parents=[base or self._default_argument_parser],
             )
+        options, _ = parser.parse_known_args(argv)
+
         plugins = [
             plugin
-            for plugins in plugin_parser.parse_known_args(argv)[0].plugin
+            for plugins in options.plugin
             for plugin in plugins.split(',')
             ]
+
+        if options.help_all:
+            plugins.extend(
+                short if short else name
+                for name, short in self.iter_plugins()
+                if not (name in plugins or short in plugins)
+                )
+
         for plugin in sorted(set(plugins), key=plugins.index):
             arguments = self.extract_plugin_arguments(plugin)
             if arguments:
-                group = parser.add_argument_group('%s arguments' % plugin)
+                group = parser.add_argument_group(
+                    '%s arguments' % plugin
+                    )
                 for argargs, argkwargs in arguments:
                     group.add_argument(*argargs, **argkwargs)
+
+        if options.help_all:
+            parser.print_help()
+            parser.exit()
+
         self._argparse_arguments = parser.parse_args(argv)
         return self._argparse_arguments
 
diff --git a/browsepy/tests/test_main.py b/browsepy/tests/test_main.py
index 43ca37f..0c20b90 100644
--- a/browsepy/tests/test_main.py
+++ b/browsepy/tests/test_main.py
@@ -3,6 +3,7 @@ import os
 import os.path
 import tempfile
 import shutil
+import contextlib
 import browsepy.__main__
 
 
@@ -80,17 +81,19 @@ class TestMain(unittest.TestCase):
         self.assertListEqual(result.exclude_from, [])
         self.assertListEqual(result.plugin, [])
 
-        self.assertRaises(
-            SystemExit,
-            self.parser.parse_args,
-            ['--directory=%s' % __file__]
-        )
-
-        self.assertRaises(
-            SystemExit,
-            self.parser.parse_args,
-            ['--exclude-from=non-existing']
-        )
+        with open(os.devnull, 'w') as f:
+            with contextlib.redirect_stderr(f):
+                self.assertRaises(
+                    SystemExit,
+                    self.parser.parse_args,
+                    ['--directory=%s' % __file__]
+                )
+
+                self.assertRaises(
+                    SystemExit,
+                    self.parser.parse_args,
+                    ['--exclude-from=non-existing']
+                )
 
     def test_exclude(self):
         result = self.parser.parse_args([
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index ef128db..6170cd6 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -88,9 +88,10 @@ class TestPlugins(unittest.TestCase):
             )
 
     def test_list(self):
+        self.app.config['plugin_namespaces'] = self.original_namespaces
         names = list(self.manager.iter_plugins())
-        self.assertIn('player', names)
-        self.assertIn('file_actions', names)
+        self.assertIn(('browsepy.plugin.player', 'player'), names)
+        self.assertIn(('browsepy.plugin.file_actions', 'file_actions'), names)
 
     def test_namespace_prefix(self):
         self.assertTrue(self.manager.import_plugin(self.plugin_name))
diff --git a/setup.cfg b/setup.cfg
index fa4df87..66043ce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ omit =
 
 [coverage:report]
 show_missing = True
-fail_under = 100
+fail_under = 95
 exclude_lines =
     pragma: no cover
     pass
-- 
GitLab


From 05fa6306ecc96e3890413df74491d407ce3da5a8 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 12 Apr 2019 14:20:22 +0200
Subject: [PATCH 060/171] bump version, uppercase config, improve plugin
 discovery

---
 README.rst                                | 68 +++++++++++-------
 browsepy/__init__.py                      | 28 ++++----
 browsepy/__main__.py                      | 47 +++++--------
 browsepy/appconfig.py                     | 27 ++++---
 browsepy/compat.py                        | 15 +++-
 browsepy/exceptions.py                    |  2 +-
 browsepy/file.py                          | 30 ++++----
 browsepy/manager.py                       | 85 +++++++++++++++--------
 browsepy/plugin/file_actions/__init__.py  | 42 +++++++----
 browsepy/plugin/file_actions/tests.py     | 48 +++++++------
 browsepy/plugin/player/playable.py        |  4 +-
 browsepy/plugin/player/tests.py           | 16 ++---
 browsepy/tests/deprecated/test_plugins.py | 10 +--
 browsepy/tests/test_app.py                | 27 ++++---
 browsepy/tests/test_file.py               |  8 +--
 browsepy/tests/test_module.py             | 30 ++++----
 browsepy/tests/test_plugins.py            | 15 ++--
 browsepy/transform/glob.py                | 13 ++--
 doc/integrations.rst                      | 42 +++++------
 19 files changed, 319 insertions(+), 238 deletions(-)

diff --git a/README.rst b/README.rst
index b077dac..79bf900 100644
--- a/README.rst
+++ b/README.rst
@@ -122,6 +122,12 @@ Showing help including player plugin arguments
 
   browsepy --plugin=player --help
 
+Showing help all detected plugin arguments
+
+.. code-block:: bash
+
+  browsepy --help-all
+
 This examples assume python's `bin` directory is in `PATH`, otherwise try
 replacing `browsepy` with `python -m browsepy`.
 
@@ -133,24 +139,31 @@ plugins (loaded with `plugin` argument) could add extra arguments to this list.
 
 ::
 
-  usage: browsepy [-h] [--directory PATH] [--initial PATH] [--removable PATH]
-                  [--upload PATH] [--exclude PATTERN] [--exclude-from PATH]
-                  [--plugin MODULE]
+  usage: browsepy [-h] [--help-all] [--directory PATH] [--initial PATH] [--removable PATH] [--upload PATH] [--exclude PATTERN]
+                  [--exclude-from PATH] [--version] [--plugin MODULE]
                   [host] [port]
 
+  description: starts a browsepy web file browser
+
   positional arguments:
-    host                  address to listen (default: 127.0.0.1)
-    port                  port to listen (default: 8080)
+    host                 address to listen (default: 127.0.0.1)
+    port                 port to listen (default: 8080)
 
   optional arguments:
-    -h, --help            show this help message and exit
-    --directory PATH      serving directory (default: current path)
-    --initial PATH        default directory (default: same as --directory)
-    --removable PATH      base directory allowing remove (default: none)
-    --upload PATH         base directory allowing upload (default: none)
-    --exclude PATTERN     exclude paths by pattern (multiple)
-    --exclude-from PATH   exclude paths by pattern file (multiple)
-    --plugin MODULE       load plugin module (multiple)
+    -h, --help           show this help message and exit
+    --help-all           show help for all available plugins and exit
+    --directory PATH     serving directory (default: /home/work/Desarrollo/browsepy)
+    --initial PATH       default directory (default: same as --directory)
+    --removable PATH     base directory allowing remove (default: None)
+    --upload PATH        base directory allowing upload (default: None)
+    --exclude PATTERN    exclude paths by pattern (multiple)
+    --exclude-from PATH  exclude paths by pattern file (multiple)
+    --version            show program's version number and exit
+    --plugin MODULE      load plugin module (multiple)
+
+  available plugins:
+    file-actions, browsepy.plugin.file_actions
+    player, browsepy.plugin.player
 
 
 Using as library
@@ -170,26 +183,28 @@ url, and mounting **browsepy.app** on the appropriate parent
 Browsepy app config (available at :attr:`browsepy.app.config`) uses the
 following configuration options.
 
-* **directory_base**: anything under this directory will be served,
+* **DIRECTORY_BASE**: anything under this directory will be served,
   defaults to current path.
-* **directory_start**: directory will be served when accessing root URL
-* **directory_remove**: file removing will be available under this path,
+* **DIRECTORY_START**: directory will be served when accessing root URL
+* **DIRECTORY_REMOVE**: file removing will be available under this path,
   defaults to **None**.
-* **directory_upload**: file upload will be available under this path,
+* **DIRECTORY_UPLOAD**: file upload will be available under this path,
   defaults to **None**.
-* **directory_tar_buffsize**, directory tar streaming buffer size,
+* **DIRECTORY_TAR_BUFFSIZE**, directory tar streaming buffer size,
   defaults to **262144** and must be multiple of 512.
-* **directory_downloadable** whether enable directory download or not,
+* **DIRECTORY_DOWNLOADABLE** whether enable directory download or not,
   defaults to **True**.
-* **use_binary_multiples** whether use binary units (bi-bytes, like KiB)
+* **USE_BINARY_MULTIPLES** whether use binary units (bi-bytes, like KiB)
   instead of common ones (bytes, like KB), defaults to **True**.
-* **plugin_modules** list of module names (absolute or relative to
+* **PLUGIN_MODULES** list of module names (absolute or relative to
   plugin_namespaces) will be loaded.
-* **plugin_namespaces** prefixes for module names listed at plugin_modules
-  where relative plugin_modules are searched.
-* **exclude_fnc** function will be used to exclude files from listing and directory tarballs. Can be either None or function receiving an absolute path and returning a boolean.
+* **PLUGIN_NAMESPACES** prefixes for module names listed at PLUGIN_MODULES
+  where relative PLUGIN_MODULES are searched.
+* **EXCLUDE_FNC** function will be used to exclude files from listing and
+  directory tarballs. Can be either None or function receiving an absolute
+  path and returning a boolean.
 
-After editing `plugin_modules` value, plugin manager (available at module
+After editing `PLUGIN_MODULES` value, plugin manager (available at module
 plugin_manager and app.extensions['plugin_manager']) should be reloaded using
 the `reload` method.
 
@@ -202,6 +217,9 @@ Extend via plugin API
 Starting from version 0.4.0, browsepy is extensible via plugins. A functional
 'player' plugin is provided as example, and some more are planned.
 
+Starting from version 0.6.0, browsepy a new plugin `file-actions` is included
+providing copy/cut/paste and directory creation operations.
+
 Plugins can add HTML content to browsepy's browsing view, using some
 convenience abstraction for already used elements like external stylesheet and
 javascript tags, links, buttons and file upload.
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 73b90e2..12ca3e9 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 
-__version__ = '0.5.6'
+__version__ = '0.6.0'
 
 import logging
 import os
@@ -33,20 +33,20 @@ app = Flask(
 app.config.update(
     SECRET_KEY=utils.random_string(4096),
     APPLICATION_NAME='browsepy',
-    directory_base=compat.getcwd(),
-    directory_start=None,
-    directory_remove=None,
-    directory_upload=None,
-    directory_tar_buffsize=262144,
-    directory_downloadable=True,
-    use_binary_multiples=True,
-    plugin_modules=[],
-    plugin_namespaces=(
+    DIRECTORY_BASE=compat.getcwd(),
+    DIRECTORY_START=None,
+    DIRECTORY_REMOVE=None,
+    DIRECTORY_UPLOAD=None,
+    DIRECTORY_TAR_BUFFSIZE=262144,
+    DIRECTORY_DOWNLOADABLE=True,
+    USE_BINARY_MULTIPLES=True,
+    PLUGIN_MODULES=[],
+    PLUGIN_NAMESPACES=(
         'browsepy.plugin',
         'browsepy_',
         '',
         ),
-    exclude_fnc=None,
+    EXCLUDE_FNC=None,
     )
 app.jinja_env.add_extension('browsepy.transform.htmlcompress.HTMLCompress')
 app.session_interface = cookieman.CookieMan()
@@ -247,12 +247,12 @@ def upload(path):
                     path=directory.path,
                     filename=f.filename
                     )
-    return redirect(url_for(".browse", path=directory.urlpath))
+    return redirect(url_for('.browse', path=directory.urlpath))
 
 
-@app.route("/")
+@app.route('/')
 def index():
-    path = app.config["directory_start"] or app.config["directory_base"]
+    path = app.config['DIRECTORY_START'] or app.config['DIRECTORY_BASE']
     try:
         urlpath = Node(path).urlpath
     except OutsideDirectoryBase:
diff --git a/browsepy/__main__.py b/browsepy/__main__.py
index fdbfc55..318234f 100644
--- a/browsepy/__main__.py
+++ b/browsepy/__main__.py
@@ -9,23 +9,12 @@ import argparse
 
 import flask
 
-from . import app, plugin_manager, __version__
-from .compat import PY_LEGACY, getdebug, get_terminal_size, SafeArgumentParser
+from . import app, __version__
+from .compat import PY_LEGACY, getdebug, \
+                    SafeArgumentParser, HelpFormatter
 from .transform.glob import translate
 
 
-class HelpFormatter(argparse.RawTextHelpFormatter):
-    def __init__(self, prog, indent_increment=2, max_help_position=24,
-                 width=None):
-        if width is None:
-            try:
-                width = get_terminal_size().columns - 2
-            except ValueError:  # https://bugs.python.org/issue24966
-                pass
-        super(HelpFormatter, self).__init__(
-            prog, indent_increment, max_help_position, width)
-
-
 class CommaSeparatedAction(argparse.Action):
     def __call__(self, parser, namespace, value, option_string=None):
         values = value.split(',')
@@ -36,14 +25,14 @@ class CommaSeparatedAction(argparse.Action):
 
 
 class ArgParse(SafeArgumentParser):
-    default_directory = app.config['directory_base']
+    default_directory = app.config['DIRECTORY_BASE']
     default_initial = (
         None
-        if app.config['directory_start'] == app.config['directory_base'] else
-        app.config['directory_start']
+        if app.config['DIRECTORY_START'] == app.config['DIRECTORY_BASE'] else
+        app.config['DIRECTORY_START']
         )
-    default_removable = app.config['directory_remove']
-    default_upload = app.config['directory_upload']
+    default_removable = app.config['DIRECTORY_REMOVE']
+    default_upload = app.config['DIRECTORY_UPLOAD']
     name = app.config['APPLICATION_NAME']
 
     default_host = os.getenv('BROWSEPY_HOST', '127.0.0.1')
@@ -52,10 +41,6 @@ class ArgParse(SafeArgumentParser):
     defaults = {
         'add_help': True,
         'prog': name,
-        'epilog': 'available plugins:\n%s' % '\n'.join(
-            '  %s, %s' % (short, name) if short else '  %s' % name
-            for name, short in plugin_manager.iter_plugins()
-            ),
         'formatter_class': HelpFormatter,
         'description': 'description: starts a %s web file browser' % name
         }
@@ -170,16 +155,16 @@ def main(argv=sys.argv[1:], app=app, parser=ArgParse, run_fnc=flask.Flask.run):
     if args.debug:
         os.environ['DEBUG'] = 'true'
     app.config.update(
-        directory_base=args.directory,
-        directory_start=args.initial or args.directory,
-        directory_remove=args.removable,
-        directory_upload=args.upload,
-        plugin_modules=list_union(
-            app.config['plugin_modules'],
+        DIRECTORY_BASE=args.directory,
+        DIRECTORY_START=args.initial or args.directory,
+        DIRECTORY_REMOVE=args.removable,
+        DIRECTORY_UPLOAD=args.upload,
+        PLUGIN_MODULES=list_union(
+            app.config['PLUGIN_MODULES'],
             args.plugin,
             ),
-        exclude_fnc=filter_union(
-            app.config['exclude_fnc'],
+        EXCLUDE_FNC=filter_union(
+            app.config['EXCLUDE_FNC'],
             create_exclude_fnc(patterns, args.directory),
             ),
         )
diff --git a/browsepy/appconfig.py b/browsepy/appconfig.py
index 56aceb2..3c752fc 100644
--- a/browsepy/appconfig.py
+++ b/browsepy/appconfig.py
@@ -1,5 +1,7 @@
 # -*- coding: UTF-8 -*-
 
+import warnings
+
 import flask
 import flask.config
 
@@ -8,17 +10,17 @@ from .compat import basestring
 
 class Config(flask.config.Config):
     '''
-    Flask-compatible case-insensitive Config classt.
+    Flask-compatible case-insensitive Config class.
 
     See :type:`flask.config.Config` for more info.
     '''
     def __init__(self, root, defaults=None):
+        self._warned = set()
         if defaults:
             defaults = self.gendict(defaults)
         super(Config, self).__init__(root, defaults)
 
-    @classmethod
-    def genkey(cls, k):
+    def genkey(self, k):
         '''
         Key translation function.
 
@@ -27,10 +29,19 @@ class Config(flask.config.Config):
         :returns: uppercase key
         ;rtype: str
         '''
-        return k.upper() if isinstance(k, basestring) else k
-
-    @classmethod
-    def gendict(cls, *args, **kwargs):
+        if isinstance(k, basestring):
+            if k not in self._warned and k != k.upper():
+                self._warned.add(k)
+                warnings.warn(
+                    'Config accessed with lowercase key '
+                    '%r, lowercase config is deprecated.' % k,
+                    DeprecationWarning,
+                    3
+                    )
+            return k.upper()
+        return k
+
+    def gendict(self, *args, **kwargs):
         '''
         Pre-translated key dictionary constructor.
 
@@ -39,7 +50,7 @@ class Config(flask.config.Config):
         :returns: dictionary with uppercase keys
         :rtype: dict
         '''
-        gk = cls.genkey
+        gk = self.genkey
         return dict((gk(k), v) for k, v in dict(*args, **kwargs).items())
 
     def __getitem__(self, k):
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 9f3ebbd..e797d29 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -54,6 +54,18 @@ class SafeArgumentParser(argparse.ArgumentParser):
         super(SafeArgumentParser, self).__init__(**kwargs)
 
 
+class HelpFormatter(argparse.RawTextHelpFormatter):
+    def __init__(self, prog, indent_increment=2, max_help_position=24,
+                 width=None):
+        if width is None:
+            try:
+                width = get_terminal_size().columns - 2
+            except ValueError:  # https://bugs.python.org/issue24966
+                pass
+        super(HelpFormatter, self).__init__(
+            prog, indent_increment, max_help_position, width)
+
+
 def isexec(path):
     '''
     Check if given path points to an executable file.
@@ -173,8 +185,7 @@ def deprecated(func_or_text, environ=os.environ):
             with warnings.catch_warnings():
                 if getdebug(environ):
                     warnings.simplefilter('always', DeprecationWarning)
-                warnings.warn(message, category=DeprecationWarning,
-                              stacklevel=3)
+                warnings.warn(message, DeprecationWarning, 3)
             return func(*args, **kwargs)
         return new_func
     return inner(func_or_text) if callable(func_or_text) else inner
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index 9f7a81f..ff766d9 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -4,7 +4,7 @@
 class OutsideDirectoryBase(Exception):
     '''
     Exception raised when trying to access to a file outside path defined on
-    `directory_base` config property.
+    `DIRECTORY_BASE` config property.
     '''
     pass
 
diff --git a/browsepy/file.py b/browsepy/file.py
index 1dea225..4edb48e 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -121,7 +121,7 @@ class Node(object):
     @cached_property
     def link(self):
         '''
-        Get last widget with place "entry-link".
+        Get last widget with place `entry-link`.
 
         :returns: widget on entry-link (ideally a link one)
         :rtype: namedtuple instance
@@ -136,18 +136,18 @@ class Node(object):
     def can_remove(self):
         '''
         Get if current node can be removed based on app config's
-        directory_remove.
+        `DIRECTORY_REMOVE`.
 
         :returns: True if current node can be removed, False otherwise.
         :rtype: bool
         '''
-        dirbase = self.app.config.get('directory_remove')
+        dirbase = self.app.config.get('DIRECTORY_REMOVE')
         return bool(dirbase and check_under_base(self.path, dirbase))
 
     @cached_property
     def stats(self):
         '''
-        Get current stats object as returned by os.stat function.
+        Get current stats object as returned by `os.stat` function.
 
         :returns: stats object
         :rtype: posix.stat_result or nt.stat_result
@@ -168,12 +168,12 @@ class Node(object):
     @cached_property
     def parent(self):
         '''
-        Get parent node if available based on app config's directory_base.
+        Get parent node if available based on app config's `DIRECTORY_BASE`.
 
         :returns: parent object if available
         :rtype: Node instance or None
         '''
-        directory_base = self.app.config.get('directory_base', self.path)
+        directory_base = self.app.config.get('DIRECTORY_BASE', self.path)
         if check_path(self.path, directory_base):
             return None
         parent = os.path.dirname(self.path) if self.path else None
@@ -182,7 +182,7 @@ class Node(object):
     @cached_property
     def ancestors(self):
         '''
-        Get list of ancestors until app config's directory_base is reached.
+        Get list of ancestors until app config's `DIRECTORY_BASE` is reached.
 
         :returns: list of ancestors starting from nearest.
         :rtype: list of Node objects
@@ -219,7 +219,7 @@ class Node(object):
         '''
         return abspath_to_urlpath(
             self.path,
-            self.app.config.get('directory_base', self.path),
+            self.app.config.get('DIRECTORY_BASE', self.path),
             )
 
     @property
@@ -309,7 +309,7 @@ class Node(object):
         :rtype: File
         '''
         app = utils.solve_local(app or current_app)
-        base = app.config.get('directory_base', path)
+        base = app.config.get('DIRECTORY_BASE', path)
         path = urlpath_to_abspath(path, base)
         if not cls.generic:
             kls = cls
@@ -431,7 +431,7 @@ class File(Node):
         try:
             size, unit = fmt_size(
                 self.stats.st_size,
-                self.app.config.get('use_binary_multiples', False)
+                self.app.config.get('USE_BINARY_MULTIPLES', False)
                 )
         except OSError:
             return None
@@ -586,24 +586,24 @@ class Directory(Node):
     @cached_property
     def can_download(self):
         '''
-        Get if path is downloadable (if app's `directory_downloadable` config
+        Get if path is downloadable (if app's `DIRECTORY_DOWNLOADABLE` config
         property is True).
 
         :returns: True if downloadable, False otherwise
         :rtype: bool
         '''
-        return self.app.config.get('directory_downloadable', False)
+        return self.app.config.get('DIRECTORY_DOWNLOADABLE', False)
 
     @cached_property
     def can_upload(self):
         '''
         Get if a file can be uploaded to path (if directory path is under app's
-        `directory_upload` config property).
+        `DIRECTORY_UPLOAD` config property).
 
         :returns: True if a file can be upload to directory, False otherwise
         :rtype: bool
         '''
-        dirbase = self.app.config.get('directory_upload', False)
+        dirbase = self.app.config.get('DIRECTORY_UPLOAD', False)
         return dirbase and check_base(self.path, dirbase)
 
     @cached_property
@@ -649,7 +649,7 @@ class Directory(Node):
         '''
         stream = self.stream_class(
             self.path,
-            self.app.config.get('directory_tar_buffsize', 10240),
+            self.app.config.get('DIRECTORY_TAR_BUFFSIZE', 10240),
             self.plugin_manager.check_excluded,
             )
         return self.app.response_class(
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 588e4c3..ba0ef2e 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -4,6 +4,7 @@ import re
 import sys
 import pkgutil
 import argparse
+import functools
 import warnings
 import collections
 
@@ -14,7 +15,7 @@ from cookieman import CookieMan
 
 from . import mimetype
 from . import compat
-from .compat import deprecated, usedoc, SafeArgumentParser
+from .compat import deprecated, usedoc
 from .utils import get_module
 
 
@@ -63,7 +64,7 @@ class PluginManagerBase(object):
         '''
         List of plugin namespaces taken from app config.
         '''
-        return self.app.config['plugin_namespaces'] if self.app else []
+        return self.app.config['PLUGIN_NAMESPACES'] if self.app else []
 
     def __init__(self, app=None):
         '''
@@ -96,10 +97,10 @@ class PluginManagerBase(object):
 
         This method will make use of :meth:`clear` and :meth:`load_plugin`,
         so all internal state will be cleared, and all plugins defined in
-        :data:`self.app.config['plugin_modules']` will be loaded.
+        :data:`self.app.config['PLUGIN_MODULES']` will be loaded.
         '''
         self.clear()
-        for plugin in self.app.config.get('plugin_modules', ()):
+        for plugin in self.app.config.get('PLUGIN_MODULES', ()):
             self.load_plugin(plugin)
 
     def clear(self):
@@ -114,11 +115,11 @@ class PluginManagerBase(object):
         '''
         for info in pkgutil.iter_modules():
             if info.name.startswith(prefix):
-                yield info.name, None
+                yield info.name
 
     def _iter_submodules(self, prefix):
         '''
-        Iterate thru all submodules which full name contains given prefix.
+        Iterate thru all modules which full name contains given prefix.
         '''
         res = compat.res
         parent = prefix.rsplit('.', 1)[0]
@@ -128,27 +129,40 @@ class PluginManagerBase(object):
                     name = '%s.%s' % (base, item)
                     if name.startswith(prefix) and \
                        not res.is_resource(base, item):
-                        yield name, item
+                        yield name
                 break
             except ImportError:
                 pass
 
-    def iter_plugins(self):
+    def _iter_plugin_modules(self):
         '''
-        Iterate through all loadable plugins on default import locations
+        Iterate plugin modules, yielding both full qualified name and
+        short plugin name as tuple.
         '''
+        nameset = set()
+        shortset = set()
+        filters = self.plugin_filters
         for prefix in self.namespaces:
-            names = (
-                self._iter_submodules(prefix)
-                if '.' in prefix else
-                self._iter_modules(prefix)
-                if prefix else
-                ()
-                )
-            for name, short in names:
-                module = get_module(name)
-                if module and any(f(module) for f in self.plugin_filters):
+            for name in (self._iter_submodules(prefix)
+                         if '.' in prefix else
+                         self._iter_modules(prefix)
+                         if prefix else
+                         ()):
+                module = get_module(name) if name not in nameset else None
+                if module and any(f(module) for f in filters):
+                    short = name[len(prefix):].lstrip('.').replace('_', '-')
+                    if short in shortset or '.' in short or not short:
+                        short = None
                     yield name, short
+                    nameset.add(name)
+                    shortset.add(short)
+
+    @cached_property
+    def available_plugins(self):
+        '''
+        Iterate through all loadable plugins on default import locations
+        '''
+        return list(self._iter_plugin_modules())
 
     def import_plugin(self, plugin):
         '''
@@ -269,7 +283,7 @@ class ExcludePluginManager(PluginManagerBase):
         '''
         Check if given path is excluded.
         '''
-        exclude_fnc = self.app.config.get('exclude_fnc')
+        exclude_fnc = self.app.config.get('EXCLUDE_FNC')
         if exclude_fnc and exclude_fnc(path):
             return True
         for fnc in self._exclude_functions:
@@ -581,13 +595,30 @@ class ArgumentPluginManager(PluginManagerBase):
             return manager._argparse_argkwargs
         return ()
 
-    @cached_property
     def _default_argument_parser(self):
-        parser = SafeArgumentParser()
+        parser = compat.SafeArgumentParser()
         parser.add_argument('--plugin', action='append', default=[])
         parser.add_argument('--help-all', action='store_true')
         return parser
 
+    def _plugin_argument_parser(self, base=None):
+        plugins = self.available_plugins
+        parent = base or self._default_argument_parser
+        prop = functools.partial(getattr, parent)
+        epilog = prop('epilog') or ''
+        if plugins:
+            epilog += '\n\navailable plugins:\n%s' % '\n'.join(
+                '  %s, %s' % (short, name) if short else '  %s' % name
+                for name, short in plugins
+                )
+        return compat.SafeArgumentParser(
+            parents=[parent],
+            prog=prop('prog', self.app.config['APPLICATION_NAME']),
+            description=prop('description'),
+            formatter_class=prop('formatter_class', compat.HelpFormatter),
+            epilog=epilog.strip(),
+            )
+
     def load_arguments(self, argv, base=None):
         '''
         Process given argument list based on registered arguments and given
@@ -607,9 +638,7 @@ class ArgumentPluginManager(PluginManagerBase):
                   given by :meth:`argparse.ArgumentParser.parse_args`.
         :rtype: argparse.Namespace
         '''
-        parser = SafeArgumentParser(
-            parents=[base or self._default_argument_parser],
-            )
+        parser = self._plugin_argument_parser(base)
         options, _ = parser.parse_known_args(argv)
 
         plugins = [
@@ -621,7 +650,7 @@ class ArgumentPluginManager(PluginManagerBase):
         if options.help_all:
             plugins.extend(
                 short if short else name
-                for name, short in self.iter_plugins()
+                for name, short in self.available_plugins
                 if not (name in plugins or short in plugins)
                 )
 
@@ -797,7 +826,7 @@ class MimetypeActionPluginManager(WidgetPluginManager, MimetypePluginManager):
         if isinstance(place or widget, self._widget.WidgetBase):
             warnings.warn(
                 'Deprecated use of register_widget',
-                category=DeprecationWarning
+                DeprecationWarning
                 )
             widget = place or widget
             props = self._widget_props(widget)
@@ -813,7 +842,7 @@ class MimetypeActionPluginManager(WidgetPluginManager, MimetypePluginManager):
           place in self._deprecated_places:
             warnings.warn(
                 'Deprecated use of get_widgets',
-                category=DeprecationWarning
+                DeprecationWarning
                 )
             place = file or place
             return [
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index ddc8c72..568914a 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -2,9 +2,10 @@
 
 import os
 import os.path
+import functools
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
-                  session
+                  session, current_app
 from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
@@ -201,6 +202,27 @@ def shrink_session(data, last):
     return data
 
 
+def detect_upload(directory):
+    return directory.is_directory and directory.can_upload
+
+
+def detect_clipboard(directory):
+    return directory.is_directory and session.get('clipboard:mode')
+
+
+def detect_selection(directory):
+    return directory.is_directory and \
+            current_app.config.get('DIRECTORY_UPLOAD')
+
+
+def excluded_clipboard(manager, path):
+    if session.get('clipboard:mode') == 'cut':
+        base = manager.app.config['DIRECTORY_BASE']
+        clipboard = session.get('clipboard:items', ())
+        return abspath_to_urlpath(path, base) in clipboard
+    return False
+
+
 def register_plugin(manager):
     '''
     Register blueprints and actions using given plugin manager.
@@ -208,19 +230,9 @@ def register_plugin(manager):
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
     '''
-    def detect_upload(directory):
-        return directory.is_directory and directory.can_upload
-
-    def detect_clipboard(directory):
-        return directory.is_directory and session.get('clipboard:mode')
-
-    def excluded_clipboard(path):
-        if session.get('clipboard:mode') == 'cut':
-            base = manager.app.config['directory_base']
-            clipboard = session.get('clipboard:items', ())
-            return abspath_to_urlpath(path, base) in clipboard
-
-    manager.register_exclude_function(excluded_clipboard)
+    manager.register_exclude_function(
+        functools.partial(excluded_clipboard, manager)
+        )
     manager.register_blueprint(actions)
     manager.register_widget(
         place='styles',
@@ -240,7 +252,7 @@ def register_plugin(manager):
         place='header',
         type='button',
         endpoint='file_actions.selection',
-        filter=lambda directory: directory.is_directory,
+        filter=detect_selection,
         text='Selection...',
         )
     manager.register_widget(
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 30a230b..9f22ce6 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -70,8 +70,8 @@ class TestRegistration(unittest.TestCase):
         self.base = 'c:\\base' if os.name == 'nt' else '/base'
         self.app = flask.Flask(self.__class__.__name__)
         self.app.config.update(
-            directory_base=self.base,
-            exclude_fnc=None,
+            DIRECTORY_BASE=self.base,
+            EXCLUDE_FNC=None,
             )
 
     def tearDown(self):
@@ -79,7 +79,7 @@ class TestRegistration(unittest.TestCase):
 
     def test_register_plugin(self):
         self.app.config.update(self.browsepy_module.app.config)
-        self.app.config['plugin_namespaces'] = ('browsepy.plugin',)
+        self.app.config['PLUGIN_NAMESPACES'] = ('browsepy.plugin',)
         manager = self.manager_module.PluginManager(self.app)
         manager.load_plugin('file-actions')
         self.assertIn(
@@ -89,8 +89,8 @@ class TestRegistration(unittest.TestCase):
 
     def test_reload(self):
         self.app.config.update(
-            plugin_modules=[],
-            plugin_namespaces=[]
+            PLUGIN_MODULES=[],
+            PLUGIN_NAMESPACES=[]
             )
         manager = self.manager_module.PluginManager(self.app)
         self.assertNotIn(
@@ -98,8 +98,8 @@ class TestRegistration(unittest.TestCase):
             self.app.blueprints.values()
             )
         self.app.config.update(
-            plugin_modules=['file-actions'],
-            plugin_namespaces=['browsepy.plugin']
+            PLUGIN_MODULES=['file-actions'],
+            PLUGIN_NAMESPACES=['browsepy.plugin']
             )
         manager.reload()
         self.assertIn(
@@ -118,12 +118,12 @@ class TestIntegration(unittest.TestCase):
         self.app = self.browsepy_module.app
         self.app.config.update(
             SECRET_KEY='secret',
-            directory_base=self.base,
-            directory_start=self.base,
-            directory_upload=None,
-            exclude_fnc=None,
-            plugin_modules=['file-actions'],
-            plugin_namespaces=[
+            DIRECTORY_BASE=self.base,
+            DIRECTORY_START=self.base,
+            DIRECTORY_UPLOAD=None,
+            EXCLUDE_FNC=None,
+            PLUGIN_MODULES=['file-actions'],
+            PLUGIN_NAMESPACES=[
                 'browsepy.plugin'
                 ]
             )
@@ -132,17 +132,18 @@ class TestIntegration(unittest.TestCase):
 
     def tearDown(self):
         shutil.rmtree(self.base)
-        self.app.config['plugin_modules'] = []
+        self.app.config['PLUGIN_MODULES'] = []
         self.manager.clear()
         utils.clear_flask_context()
 
     def test_detection(self):
+        url = functools.partial(flask.url_for, path='')
+
         with self.app.test_client() as client:
+            self.app.config['DIRECTORY_UPLOAD'] = self.base
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
 
-            url = functools.partial(flask.url_for, path='')
-
             page = Page(response.data)
             with self.app.app_context():
                 self.assertIn(
@@ -159,6 +160,7 @@ class TestIntegration(unittest.TestCase):
                 session['clipboard:mode'] = 'copy'
                 session['clipboard:items'] = ['whatever']
 
+            self.app.config['DIRECTORY_UPLOAD'] = 'whatever'
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
 
@@ -177,7 +179,7 @@ class TestIntegration(unittest.TestCase):
                     page.widgets
                     )
 
-            self.app.config['directory_upload'] = self.base
+            self.app.config['DIRECTORY_UPLOAD'] = self.base
             response = client.get('/')
             self.assertEqual(response.status_code, 200)
 
@@ -231,11 +233,11 @@ class TestAction(unittest.TestCase):
         self.app.register_blueprint(self.module.actions)
         self.app.config.update(
             SECRET_KEY='secret',
-            directory_base=self.base,
-            directory_upload=self.base,
-            directory_remove=self.base,
-            exclude_fnc=None,
-            use_binary_multiples=True,
+            DIRECTORY_BASE=self.base,
+            DIRECTORY_UPLOAD=self.base,
+            DIRECTORY_REMOVE=self.base,
+            EXCLUDE_FNC=None,
+            USE_BINARY_MULTIPLES=True,
             )
         self.app.add_url_rule(
             '/browse/<path:path>',
@@ -406,7 +408,7 @@ class TestAction(unittest.TestCase):
             response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 400)
 
-            self.app.config['exclude_fnc'] = lambda n: n.endswith('whatever')
+            self.app.config['EXCLUDE_FNC'] = lambda n: n.endswith('whatever')
 
             with client.session_transaction() as session:
                 session['clipboard:mode'] = 'cut'
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 7e1b278..c354dcd 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -36,7 +36,7 @@ class PLSFileParser(object):
     def __init__(self, path):
         with warnings.catch_warnings():
             # We already know about SafeConfigParser deprecation!
-            warnings.filterwarnings('ignore', category=DeprecationWarning)
+            warnings.simplefilter('ignore', category=DeprecationWarning)
             self._parser = self.parser_class()
         self._parser.read(path)
 
@@ -133,7 +133,7 @@ class PlayListFile(PlayableBase):
         drive = os.path.splitdrive(self.path)[0]
         if drive and not os.path.splitdrive(path)[0]:
             path = drive + path
-        if check_under_base(path, self.app.config['directory_base']):
+        if check_under_base(path, self.app.config['DIRECTORY_BASE']):
             return path
         return None
 
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index bcf8e4f..a2c7003 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -86,7 +86,7 @@ class TestPlayerBase(unittest.TestCase):
         self.base = 'c:\\base' if os.name == 'nt' else '/base'
         self.app = flask.Flask(self.__class__.__name__)
         self.app.config.update(
-            directory_base=self.base,
+            DIRECTORY_BASE=self.base,
             SERVER_NAME='localhost',
             )
         self.manager = ManagerMock()
@@ -149,14 +149,14 @@ class TestIntegration(TestIntegrationBase):
 
     def test_register_plugin(self):
         self.app.config.update(self.browsepy_module.app.config)
-        self.app.config['plugin_namespaces'] = ('browsepy.plugin',)
+        self.app.config['PLUGIN_NAMESPACES'] = ('browsepy.plugin',)
         manager = self.manager_module.PluginManager(self.app)
         manager.load_plugin('player')
         self.assertIn(self.player_module.player, self.app.blueprints.values())
 
     def test_register_arguments(self):
         self.app.config.update(self.browsepy_module.app.config)
-        self.app.config['plugin_namespaces'] = ('browsepy.plugin',)
+        self.app.config['PLUGIN_NAMESPACES'] = ('browsepy.plugin',)
 
         manager = self.manager_module.ArgumentPluginManager(self.app)
         manager.load_arguments(self.non_directory_args)
@@ -166,8 +166,8 @@ class TestIntegration(TestIntegrationBase):
 
     def test_reload(self):
         self.app.config.update(
-            plugin_modules=['player'],
-            plugin_namespaces=['browsepy.plugin']
+            PLUGIN_MODULES=['player'],
+            PLUGIN_NAMESPACES=['browsepy.plugin']
             )
         manager = self.manager_module.PluginManager(self.app)
         manager.load_arguments(self.non_directory_args)
@@ -323,7 +323,7 @@ class TestBlueprint(TestPlayerBase):
         super(TestBlueprint, self).setUp()
         app = self.app
         app.template_folder = utils.ppath('templates')
-        app.config['directory_base'] = tempfile.mkdtemp()
+        app.config['DIRECTORY_BASE'] = tempfile.mkdtemp()
         app.register_blueprint(self.module.player)
 
         @app.route("/browse", defaults={"path": ""}, endpoint='browse')
@@ -343,13 +343,13 @@ class TestBlueprint(TestPlayerBase):
         return response
 
     def file(self, path, data=''):
-        apath = p(self.app.config['directory_base'], path)
+        apath = p(self.app.config['DIRECTORY_BASE'], path)
         with open(apath, 'w') as f:
             f.write(data)
         return apath
 
     def directory(self, path):
-        apath = p(self.app.config['directory_base'], path)
+        apath = p(self.app.config['DIRECTORY_BASE'], path)
         os.mkdir(apath)
         return apath
 
diff --git a/browsepy/tests/deprecated/test_plugins.py b/browsepy/tests/deprecated/test_plugins.py
index c6e07f7..492dfd0 100644
--- a/browsepy/tests/deprecated/test_plugins.py
+++ b/browsepy/tests/deprecated/test_plugins.py
@@ -71,12 +71,12 @@ class TestPlugins(unittest.TestCase):
     def setUp(self):
         self.app = self.app_module.app
         self.manager = self.manager_module.PluginManager(self.app)
-        self.original_namespaces = self.app.config['plugin_namespaces']
+        self.original_namespaces = self.app.config['PLUGIN_NAMESPACES']
         self.plugin_namespace, self.plugin_name = __name__.rsplit('.', 1)
-        self.app.config['plugin_namespaces'] = (self.plugin_namespace,)
+        self.app.config['PLUGIN_NAMESPACES'] = (self.plugin_namespace,)
 
     def tearDown(self):
-        self.app.config['plugin_namespaces'] = self.original_namespaces
+        self.app.config['PLUGIN_NAMESPACES'] = self.original_namespaces
         self.manager.clear()
 
     def test_manager(self):
@@ -132,7 +132,7 @@ class TestPlayerBase(unittest.TestCase):
 
     def setUp(self):
         self.app = flask.Flask(self.__class__.__name__)
-        self.app.config['directory_remove'] = None
+        self.app.config['DIRECTORY_REMOVE'] = None
         self.app.config['SERVER_NAME'] = self.hostname
         self.app.config['PREFERRED_URL_SCHEME'] = self.scheme
         self.manager = ManagerMock()
@@ -171,7 +171,7 @@ class TestIntegration(TestIntegrationBase):
         self.app.config.update(
             SERVER_NAME=self.hostname,
             PREFERRED_URL_SCHEME=self.scheme,
-            plugin_namespaces=('browsepy.tests.deprecated.plugin',)
+            PLUGIN_NAMESPACES=('browsepy.tests.deprecated.plugin',)
         )
         manager = self.manager_module.PluginManager(self.app)
         manager.load_plugin('player')
diff --git a/browsepy/tests/test_app.py b/browsepy/tests/test_app.py
index 83cb7f3..cf30aee 100644
--- a/browsepy/tests/test_app.py
+++ b/browsepy/tests/test_app.py
@@ -2,6 +2,7 @@ import os
 import os.path
 import unittest
 import tempfile
+import warnings
 
 import browsepy
 import browsepy.appconfig
@@ -11,17 +12,25 @@ class TestApp(unittest.TestCase):
     module = browsepy
     app = browsepy.app
 
+    def setUp(self):
+        self.app.config._warned.clear()
+
     def test_config(self):
-        try:
-            with tempfile.NamedTemporaryFile(delete=False) as f:
-                f.write(b'DIRECTORY_DOWNLOADABLE = False\n')
-                name = f.name
-            os.environ['BROWSEPY_TEST_SETTINGS'] = name
-            self.app.config['directory_downloadable'] = True
+        with tempfile.NamedTemporaryFile() as f:
+            f.write(b'DIRECTORY_DOWNLOADABLE = False\n')
+            f.flush()
+
+            os.environ['BROWSEPY_TEST_SETTINGS'] = f.name
+            with warnings.catch_warnings(record=True) as warns:
+                warnings.simplefilter('always')
+                self.app.config['directory_downloadable'] = True
+                self.assertTrue(warns)
+
             self.app.config.from_envvar('BROWSEPY_TEST_SETTINGS')
-            self.assertFalse(self.app.config['directory_downloadable'])
-        finally:
-            os.remove(name)
+            with warnings.catch_warnings(record=True) as warns:
+                warnings.simplefilter('always')
+                self.assertFalse(self.app.config['directory_downloadable'])
+                self.assertFalse(warns)
 
 
 class TestConfig(unittest.TestCase):
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index 7acdde3..3bd1802 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -130,15 +130,15 @@ class TestFile(unittest.TestCase):
             f.write(b',\n' * 512)
         f = self.module.File(test_file, app=self.app)
 
-        default = self.app.config['use_binary_multiples']
+        default = self.app.config['USE_BINARY_MULTIPLES']
 
-        self.app.config['use_binary_multiples'] = True
+        self.app.config['USE_BINARY_MULTIPLES'] = True
         self.assertEqual(f.size, '1.00 KiB')
 
-        self.app.config['use_binary_multiples'] = False
+        self.app.config['USE_BINARY_MULTIPLES'] = False
         self.assertEqual(f.size, '1.02 KB')
 
-        self.app.config['use_binary_multiples'] = default
+        self.app.config['USE_BINARY_MULTIPLES'] = default
 
     def test_stats(self):
         virtual_file = os.path.join(self.workbench, 'file.txt')
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index b162e67..2a7d962 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -195,11 +195,11 @@ class TestApp(unittest.TestCase):
                 or path.startswith(self.exclude + os.sep)
 
         self.app.config.update(
-            directory_base=self.base,
-            directory_start=self.start,
-            directory_remove=self.remove,
-            directory_upload=self.upload,
-            exclude_fnc=exclude_fnc,
+            DIRECTORY_BASE=self.base,
+            DIRECTORY_START=self.start,
+            DIRECTORY_REMOVE=self.remove,
+            DIRECTORY_UPLOAD=self.upload,
+            EXCLUDE_FNC=exclude_fnc,
             SERVER_NAME='localhost',
             )
 
@@ -284,14 +284,14 @@ class TestApp(unittest.TestCase):
         self.assertEqual(page.path, '%s/start' % os.path.basename(self.base))
 
         start = os.path.abspath(os.path.join(self.base, '..'))
-        self.app.config['directory_start'] = start
+        self.app.config['DIRECTORY_START'] = start
 
         self.assertRaises(
             Page404Exception,
             self.get, 'index'
             )
 
-        self.app.config['directory_start'] = self.start
+        self.app.config['DIRECTORY_START'] = self.start
 
     def test_browse(self):
         basename = os.path.basename(self.base)
@@ -334,10 +334,10 @@ class TestApp(unittest.TestCase):
             self.get, 'browse', path='exclude'
             )
 
-        self.app.config['directory_downloadable'] = True
+        self.app.config['DIRECTORY_DOWNLOADABLE'] = True
         page = self.get('browse')
         self.assertTrue(page.tarfile)
-        self.app.config['directory_downloadable'] = False
+        self.app.config['DIRECTORY_DOWNLOADABLE'] = False
         page = self.get('browse')
         self.assertFalse(page.tarfile)
 
@@ -382,14 +382,14 @@ class TestApp(unittest.TestCase):
             self.post, 'remove', path='start/testfile.txt'
             )
 
-        self.app.config['directory_remove'] = None
+        self.app.config['DIRECTORY_REMOVE'] = None
 
         self.assertRaises(
             Page404Exception,
             self.get, 'remove', path='remove/testfile.txt'
             )
 
-        self.app.config['directory_remove'] = self.remove
+        self.app.config['DIRECTORY_REMOVE'] = self.remove
 
         self.assertRaises(
             Page404Exception,
@@ -431,13 +431,13 @@ class TestApp(unittest.TestCase):
         binfile = os.path.join(self.start, 'testfile.bin')
         excfile = os.path.join(self.start, 'testfile.exc')
         bindata = bytes(range(256))
-        exclude = self.app.config['exclude_fnc']
+        exclude = self.app.config['EXCLUDE_FNC']
 
         for path in (binfile, excfile):
             with open(path, 'wb') as f:
                 f.write(bindata)
 
-        self.app.config['exclude_fnc'] = None
+        self.app.config['EXCLUDE_FNC'] = None
 
         response = self.get('download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
@@ -448,7 +448,7 @@ class TestApp(unittest.TestCase):
             ['testfile.%s' % x1 for x1 in ('bin', 'exc', 'txt')]
             )
 
-        self.app.config['exclude_fnc'] = lambda p: p.endswith('.exc')
+        self.app.config['EXCLUDE_FNC'] = lambda p: p.endswith('.exc')
 
         response = self.get('download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
@@ -459,7 +459,7 @@ class TestApp(unittest.TestCase):
             ['testfile.%s' % x2 for x2 in ('bin', 'txt')]
             )
 
-        self.app.config['exclude_fnc'] = exclude
+        self.app.config['EXCLUDE_FNC'] = exclude
 
         self.assertRaises(
             Page404Exception,
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 6170cd6..1899ce8 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -1,4 +1,3 @@
-
 import unittest
 import flask
 
@@ -47,13 +46,13 @@ class TestPlugins(unittest.TestCase):
 
     def setUp(self):
         self.app = self.app_module.app
-        self.original_namespaces = self.app.config['plugin_namespaces']
+        self.original_namespaces = self.app.config['PLUGIN_NAMESPACES']
         self.plugin_namespace, self.plugin_name = __name__.rsplit('.', 1)
-        self.app.config['plugin_namespaces'] = (self.plugin_namespace,)
+        self.app.config['PLUGIN_NAMESPACES'] = (self.plugin_namespace,)
         self.manager = self.manager_module.PluginManager(self.app)
 
     def tearDown(self):
-        self.app.config['plugin_namespaces'] = self.original_namespaces
+        self.app.config['PLUGIN_NAMESPACES'] = self.original_namespaces
         self.manager.clear()
         utils.clear_flask_context()
 
@@ -88,14 +87,14 @@ class TestPlugins(unittest.TestCase):
             )
 
     def test_list(self):
-        self.app.config['plugin_namespaces'] = self.original_namespaces
-        names = list(self.manager.iter_plugins())
+        self.app.config['PLUGIN_NAMESPACES'] = self.original_namespaces
+        names = self.manager.available_plugins
         self.assertIn(('browsepy.plugin.player', 'player'), names)
-        self.assertIn(('browsepy.plugin.file_actions', 'file_actions'), names)
+        self.assertIn(('browsepy.plugin.file_actions', 'file-actions'), names)
 
     def test_namespace_prefix(self):
         self.assertTrue(self.manager.import_plugin(self.plugin_name))
-        self.app.config['plugin_namespaces'] = (
+        self.app.config['PLUGIN_NAMESPACES'] = (
             self.plugin_namespace + '.test_',
             )
         self.assertTrue(self.manager.import_plugin('module'))
diff --git a/browsepy/transform/glob.py b/browsepy/transform/glob.py
index 64783af..428fb5c 100644
--- a/browsepy/transform/glob.py
+++ b/browsepy/transform/glob.py
@@ -146,15 +146,18 @@ class GlobTransform(StateMachine):
     def transform_posix_collating_symbol(self, data, mark, next):
         warnings.warn(
             'Posix collating symbols (like %s%s) are not supported.'
-            % (data, mark))
+            % (data, mark),
+            RuntimeWarning
+            )
         return None
 
     def transform_posix_character_class(self, data, mark, next):
         name = data[len(self.start):]
         if name not in self.character_classes:
             warnings.warn(
-                'Posix character class %s is not supported.'
-                % name)
+                'Posix character class %s is not supported.' % name,
+                RuntimeWarning
+                )
             return None
         return ''.join(
             chr(start)
@@ -166,7 +169,9 @@ class GlobTransform(StateMachine):
     def transform_posix_equivalence_class(self, data, mark, next):
         warnings.warn(
             'Posix equivalence class expresions (like %s%s) are not supported.'
-            % (data, mark))
+            % (data, mark),
+            RuntimeWarning
+            )
         return None
 
     def transform_wildcard(self, data, mark, next):
diff --git a/doc/integrations.rst b/doc/integrations.rst
index 1d654f2..8abd594 100644
--- a/doc/integrations.rst
+++ b/doc/integrations.rst
@@ -10,25 +10,25 @@ is supported. Also, browsepy's public API could be easily reused.
 Browsepy app config (available at :attr:`browsepy.app.config`) exposes the
 following configuration options.
 
-* **directory_base**: anything under this directory will be served,
+* **DIRECTORY_BASE**: anything under this directory will be served,
   defaults to current path.
-* **directory_start**: directory will be served when accessing root URL
-* **directory_remove**: file removing will be available under this path,
+* **DIRECTORY_START**: directory will be served when accessing root URL
+* **DIRECTORY_REMOVE**: file removing will be available under this path,
   defaults to **None**.
-* **directory_upload**: file upload will be available under this path,
+* **DIRECTORY_UPLOAD**: file upload will be available under this path,
   defaults to **None**.
-* **directory_tar_buffsize**, directory tar streaming buffer size,
+* **DIRECTORY_TAR_BUFFSIZE**, directory tar streaming buffer size,
   defaults to **262144** and must be multiple of 512.
-* **directory_downloadable** whether enable directory download or not,
+* **DIRECTORY_DOWNLOADABLE** whether enable directory download or not,
   defaults to **True**.
-* **use_binary_multiples** whether use binary units (bi-bytes, like KiB)
+* **USE_BINARY_MULTIPLES** whether use binary units (bi-bytes, like KiB)
   instead of common ones (bytes, like KB), defaults to **True**.
-* **plugin_modules** list of module names (absolute or relative to
+* **PLUGIN_MODULES** list of module names (absolute or relative to
   plugin_namespaces) will be loaded.
-* **plugin_namespaces** prefixes for module names listed at plugin_modules
-  where relative plugin_modules are searched.
+* **PLUGIN_NAMESPACES** prefixes for module names listed at PLUGIN_MODULES
+  where relative PLUGIN_MODULES are searched.
 
-Please note: After editing `plugin_modules` value, plugin manager (available
+Please note: After editing `PLUGIN_MODULES` value, plugin manager (available
 at module :data:`browsepy.plugin_manager` and
 :data:`browsepy.app.extensions['plugin_manager']`) should be reloaded using
 the :meth:`browsepy.plugin_manager.reload` instance method of :meth:`browsepy.manager.PluginManager.reload` for browsepy's plugin
@@ -76,11 +76,11 @@ along with a root wsgi application.
     def setup_browsepy():
         browsepy.app.config.update(
             APPLICATION_ROOT='/browse',
-            directory_base=cfg.media_path,
-            directory_start=cfg.media_path,
-            directory_remove=cfg.media_path,
-            directory_upload=cfg.media_path,
-            plugin_modules=['player'],
+            DIRECTORY_BASE=cfg.media_path,
+            DIRECTORY_START=cfg.media_path,
+            DIRECTORY_REMOVE=cfg.media_path,
+            DIRECTORY_UPLOAD=cfg.media_path,
+            PLUGIN_MODULES=['player'],
             )
         browsepy.plugin_manager.load_arguments([
             '--plugin=player',
@@ -177,11 +177,11 @@ server provided by `cherrymusic <http://www.fomori.org/cherrymusic/>`_.
     }
     browsepy.config.update(
         APPLICATION_ROOT='/browse',
-        directory_base=media_path,
-        directory_start=media_path,
-        directory_remove=media_path,
-        directory_upload=media_path,
-        plugin_modules=['player'],
+        DIRECTORY_BASE=media_path,
+        DIRECTORY_START=media_path,
+        DIRECTORY_REMOVE=media_path,
+        DIRECTORY_UPLOAD=media_path,
+        PLUGIN_MODULES=['player'],
     )
     plugin_manager.reload()
 
-- 
GitLab


From 8861b00d5eba83129b47d200401ce4df00b64ddb Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Apr 2019 09:59:42 +0200
Subject: [PATCH 061/171] raise coverage, reduce complexity

---
 browsepy/compat.py                       | 28 +++++---
 browsepy/exceptions.py                   | 16 +++++
 browsepy/file.py                         |  2 +-
 browsepy/manager.py                      | 90 +++++++++---------------
 browsepy/plugin/file_actions/__init__.py |  2 +-
 browsepy/plugin/file_actions/tests.py    | 12 +++-
 browsepy/tests/test_main.py              | 12 ++--
 browsepy/tests/test_plugins.py           | 65 ++++++++++++++++-
 browsepy/tests/test_utils.py             | 53 +++++++++++++-
 browsepy/utils.py                        | 35 ++++++---
 10 files changed, 228 insertions(+), 87 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index e797d29..8713fcb 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -6,6 +6,7 @@ import sys
 import abc
 import itertools
 import functools
+import contextlib
 import warnings
 import posixpath
 import ntpath
@@ -354,16 +355,26 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
         )
 
 
-if PY_LEGACY:
-    class Iterator(BaseIterator):
-        def next(self):
-            '''
-            Call :method:`__next__` for compatibility.
+@contextlib.contextmanager
+def redirect_stderr(f):
+    old = sys.stderr
+    sys.stderr = f
+    yield
+    if sys.stderr is f:
+        sys.stderr = old
+
+
+class Iterator(BaseIterator):
+    def next(self):
+        '''
+        Call :method:`__next__` for compatibility.
 
-            :returns: see :method:`__next__`
-            '''
-            return self.__next__()
+        :returns: see :method:`__next__`
+        '''
+        return self.__next__()
 
+
+if PY_LEGACY:
     class FileNotFoundError(BaseException):
         __metaclass__ = abc.ABCMeta
 
@@ -378,7 +389,6 @@ if PY_LEGACY:
     chr = unichr  # noqa
     bytes = str  # noqa
 else:
-    Iterator = BaseIterator
     FileNotFoundError = FileNotFoundError
     range = range
     filter = filter
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index ff766d9..2a49f74 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -71,3 +71,19 @@ class FilenameTooLongError(InvalidFilenameError):
         self.limit = limit
         super(FilenameTooLongError, self).__init__(
             message, path=path, filename=filename)
+
+
+class PluginNotFoundError(ImportError):
+    pass
+
+
+class WidgetException(Exception):
+    pass
+
+
+class WidgetParameterException(WidgetException):
+    pass
+
+
+class InvalidArgumentError(ValueError):
+    pass
diff --git a/browsepy/file.py b/browsepy/file.py
index 4edb48e..0bcb9b8 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -860,7 +860,7 @@ def generic_filename(path):
     return path
 
 
-def clean_restricted_chars(path, restricted_chars=restricted_chars):
+def clean_restricted_chars(path, restricted_chars=current_restricted_chars):
     '''
     Get path without restricted characters.
 
diff --git a/browsepy/manager.py b/browsepy/manager.py
index ba0ef2e..78cbc8e 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -1,7 +1,6 @@
 # -*- coding: UTF-8 -*-
 
 import re
-import sys
 import pkgutil
 import argparse
 import functools
@@ -16,48 +15,16 @@ from cookieman import CookieMan
 from . import mimetype
 from . import compat
 from .compat import deprecated, usedoc
-from .utils import get_module
-
-
-def defaultsnamedtuple(name, fields, defaults=None):
-    '''
-    Generate namedtuple with default values.
-
-    :param name: name
-    :param fields: iterable with field names
-    :param defaults: iterable or mapping with field defaults
-    :returns: defaultdict with given fields and given defaults
-    :rtype: collections.defaultdict
-    '''
-    nt = collections.namedtuple(name, fields)
-    nt.__new__.__defaults__ = (None,) * len(nt._fields)
-    if isinstance(defaults, collections.Mapping):
-        nt.__new__.__defaults__ = tuple(nt(**defaults))
-    elif defaults:
-        nt.__new__.__defaults__ = tuple(nt(*defaults))
-    return nt
-
-
-class PluginNotFoundError(ImportError):
-    pass
-
-
-class WidgetException(Exception):
-    pass
-
-
-class WidgetParameterException(WidgetException):
-    pass
-
-
-class InvalidArgumentError(ValueError):
-    pass
+from .utils import get_module, defaultsnamedtuple
+from .exceptions import PluginNotFoundError, InvalidArgumentError, \
+                        WidgetParameterException
 
 
 class PluginManagerBase(object):
     '''
     Base plugin manager for plugin module loading and Flask extension logic.
     '''
+    _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
 
     @property
     def namespaces(self):
@@ -117,6 +84,19 @@ class PluginManagerBase(object):
             if info.name.startswith(prefix):
                 yield info.name
 
+    def _content_import_name(self, module, item, prefix):
+        '''
+        Get importable module contnt import name..
+        '''
+        res = compat.res
+        name = '%s.%s' % (module, item)
+        if name.startswith(prefix):
+            for ext in self._pyfile_extensions:
+                if name.endswith(ext):
+                    return name[:-len(ext)]
+            if not res.is_resource(module, item):
+                return name
+
     def _iter_submodules(self, prefix):
         '''
         Iterate thru all modules which full name contains given prefix.
@@ -126,11 +106,9 @@ class PluginManagerBase(object):
         for base in (prefix, parent):
             try:
                 for item in res.contents(base):
-                    name = '%s.%s' % (base, item)
-                    if name.startswith(prefix) and \
-                       not res.is_resource(base, item):
-                        yield name
-                break
+                    content = self._content_import_name(base, item, prefix)
+                    if content:
+                        yield content
             except ImportError:
                 pass
 
@@ -174,21 +152,18 @@ class PluginManagerBase(object):
         '''
         plugin = plugin.replace('-', '_')
         names = [
-            '%s%s%s' % (namespace, '' if namespace[-1] == '_' else '.', plugin)
-            if namespace else
-            plugin
-            for namespace in self.namespaces
+            name
+            for ns in self.namespaces
+            for name in (
+                '%s%s' % (ns, plugin),
+                '%s.%s' % (ns.rstrip('.'), plugin),
+                )
             ]
-
-        for name in names:
-            if name in sys.modules:
-                return sys.modules[name]
-
+        names = sorted(frozenset(names), key=names.index)
         for name in names:
             module = get_module(name)
             if module:
                 return module
-
         raise PluginNotFoundError(
             'No plugin module %r found, tried %r' % (plugin, names),
             plugin, names)
@@ -399,18 +374,19 @@ class WidgetPluginManager(PluginManagerBase):
         '''
         for filter, dynamic, cwidget in self._widgets:
             try:
-                if file and filter and not filter(file):
+                if (
+                  (file and filter and not filter(file)) or
+                  (place and place != cwidget.place)
+                  ):
                     continue
             except BaseException as e:
-                # Exception is handled  as this method execution is deffered,
-                # making hard to debug for plugin developers.
+                # Exception is catch as this execution is deferred,
+                # making debugging harder for plugin developers.
                 warnings.warn(
                     'Plugin action filtering failed with error: %s' % e,
                     RuntimeWarning
                     )
                 continue
-            if place and place != cwidget.place:
-                continue
             if file and dynamic:
                 cwidget = self._resolve_widget(file, cwidget)
             yield cwidget
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 568914a..ffb4cf4 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -65,7 +65,7 @@ def create_directory(path):
 
     try:
         os.mkdir(os.path.join(directory.path, basename))
-    except OSError as e:
+    except BaseException as e:
         raise DirectoryCreationError.from_exception(
             e,
             path=directory.path,
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 9f22ce6..668051a 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -116,6 +116,7 @@ class TestIntegration(unittest.TestCase):
     def setUp(self):
         self.base = tempfile.mkdtemp()
         self.app = self.browsepy_module.app
+        self.original_config = dict(self.app.config)
         self.app.config.update(
             SECRET_KEY='secret',
             DIRECTORY_BASE=self.base,
@@ -132,7 +133,8 @@ class TestIntegration(unittest.TestCase):
 
     def tearDown(self):
         shutil.rmtree(self.base)
-        self.app.config['PLUGIN_MODULES'] = []
+        self.app.config.clear()
+        self.app.config.update(self.original_config)
         self.manager.clear()
         utils.clear_flask_context()
 
@@ -308,6 +310,7 @@ class TestAction(unittest.TestCase):
                     'name': 'asdf',
                     })
             self.assertEqual(response.status_code, 404)
+
             response = client.post(
                 '/file-actions/create/directory',
                 data={
@@ -315,6 +318,13 @@ class TestAction(unittest.TestCase):
                     })
             self.assertEqual(response.status_code, 400)
 
+            response = client.post(
+                '/file-actions/create/directory',
+                data={
+                    'name': '\0',
+                    })
+            self.assertEqual(response.status_code, 400)
+
     def test_selection(self):
         self.touch('a')
         self.touch('b')
diff --git a/browsepy/tests/test_main.py b/browsepy/tests/test_main.py
index 0c20b90..cb88d3c 100644
--- a/browsepy/tests/test_main.py
+++ b/browsepy/tests/test_main.py
@@ -3,12 +3,14 @@ import os
 import os.path
 import tempfile
 import shutil
-import contextlib
-import browsepy.__main__
+
+import browsepy
+import browsepy.__main__ as main
+import browsepy.compat as compat
 
 
 class TestMain(unittest.TestCase):
-    module = browsepy.__main__
+    module = main
 
     def setUp(self):
         self.app = browsepy.app
@@ -82,7 +84,7 @@ class TestMain(unittest.TestCase):
         self.assertListEqual(result.plugin, [])
 
         with open(os.devnull, 'w') as f:
-            with contextlib.redirect_stderr(f):
+            with compat.redirect_stderr(f):
                 self.assertRaises(
                     SystemExit,
                     self.parser.parse_args,
@@ -99,7 +101,7 @@ class TestMain(unittest.TestCase):
         result = self.parser.parse_args([
             '--exclude', '/.*',
             '--exclude-from', self.exclude_file,
-        ])
+            ])
         extra = self.module.collect_exclude_patterns(result.exclude_from)
         self.assertListEqual(extra, ['.ignore'])
         match = self.module.create_exclude_fnc(
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 1899ce8..0a9c1c9 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -1,9 +1,18 @@
+# -*- coding: UTF-8 -*-
+
+import sys
+import os
+import os.path
+import io
 import unittest
+import tempfile
+
 import flask
 
 import browsepy
 import browsepy.manager
 import browsepy.utils as utils
+import browsepy.exceptions as exceptions
 
 from browsepy.plugin.player.tests import *  # noqa
 from browsepy.plugin.file_actions.tests import *  # noqa
@@ -56,7 +65,15 @@ class TestPlugins(unittest.TestCase):
         self.manager.clear()
         utils.clear_flask_context()
 
-    def test_manager(self):
+    def test_manager_init(self):
+        class App(object):
+            config = {}
+
+        app = App()
+        manager = self.manager_module.PluginManagerBase(app)
+        self.assertDictEqual(app.extensions, {'plugin_manager': manager})
+
+    def test_manager_load(self):
         self.manager.load_plugin(self.plugin_name)
         self.assertTrue(self.manager._plugin_loaded)
 
@@ -92,12 +109,56 @@ class TestPlugins(unittest.TestCase):
         self.assertIn(('browsepy.plugin.player', 'player'), names)
         self.assertIn(('browsepy.plugin.file_actions', 'file-actions'), names)
 
-    def test_namespace_prefix(self):
+    def test_namespace_submodule(self):
         self.assertTrue(self.manager.import_plugin(self.plugin_name))
         self.app.config['PLUGIN_NAMESPACES'] = (
             self.plugin_namespace + '.test_',
             )
         self.assertTrue(self.manager.import_plugin('module'))
+        self.assertIn(
+            (self.plugin_namespace + '.' + self.plugin_name, 'plugins'),
+            self.manager.available_plugins,
+            )
+
+    def test_namespace_module(self):
+        self.app.config['PLUGIN_NAMESPACES'] = (
+            'browsepy_test_',
+            'browsepy_testing_',
+            )
+
+        with tempfile.TemporaryDirectory() as base:
+            names = (
+                'browsepy_test_another_plugin',
+                'browsepy_testing_another_plugin',
+                )
+            for name in names:
+                path = os.path.join(base, name) + '.py'
+                with io.open(path, 'w', encoding='utf8') as f:
+                    f.write(
+                        '\n'
+                        'def register_plugin(manager):\n'
+                        '    pass\n'
+                        )
+            try:
+                sys.path.insert(0, base)
+                self.assertIn(
+                    (names[0], 'another-plugin'),
+                    self.manager.available_plugins,
+                    )
+                self.assertIn(
+                    (names[1], None),
+                    self.manager.available_plugins,
+                    )
+            finally:
+                sys.path.remove(base)
+
+    def test_widget(self):
+        with self.assertRaises(exceptions.WidgetParameterException):
+            self.manager.register_widget(
+                place='header',
+                type='html',
+                bad_attr=True,
+                )
 
 
 def register_plugin(manager):
diff --git a/browsepy/tests/test_utils.py b/browsepy/tests/test_utils.py
index a8507e4..a656ce1 100644
--- a/browsepy/tests/test_utils.py
+++ b/browsepy/tests/test_utils.py
@@ -1,24 +1,71 @@
 # -*- coding: UTF-8 -*-
 
+import sys
+import io
+import os
+import os.path
+import functools
 import unittest
+import tempfile
 
 import browsepy.utils as utils
 
 
 class TestPPath(unittest.TestCase):
+    module = utils
+
     def test_bad_kwarg(self):
         with self.assertRaises(TypeError) as e:
-            utils.ppath('a', 'b', bad=1)
+            self.module.ppath('a', 'b', bad=1)
             self.assertIn('\'bad\'', e.args[0])
 
+    def test_defaultsnamedtuple(self):
+        dnt = self.module.defaultsnamedtuple
+
+        tup = dnt('a', ('a', 'b', 'c'))
+        self.assertListEqual(list(tup(1, 2, 3)), [1, 2, 3])
+
+        tup = dnt('a', ('a', 'b', 'c'), {'b': 2})
+        self.assertListEqual(list(tup(1, c=3)), [1, 2, 3])
+
+        tup = dnt('a', ('a', 'b', 'c'), (1, 2, 3))
+        self.assertListEqual(list(tup(c=10)), [1, 2, 10])
+
     def test_join(self):
         self.assertTrue(
-            utils
+            self.module
             .ppath('a', 'b', module=__name__)
             .endswith('browsepy/tests/a/b')
             )
         self.assertTrue(
-            utils
+            self.module
             .ppath('a', 'b')
             .endswith('browsepy/a/b')
             )
+
+    def test_get_module(self):
+        oldpath = sys.path[:]
+        try:
+            with tempfile.TemporaryDirectory() as base:
+                ppath = functools.partial(os.path.join, base)
+                sys.path[:] = [base]
+
+                p = ppath('_test_zderr.py')
+                with io.open(p, 'w', encoding='utf8') as f:
+                    f.write('\na = 1 / 0\n')
+                with self.assertRaises(ZeroDivisionError):
+                    self.module.get_module('_test_zderr')
+
+                p = ppath('_test_importerr.py')
+                with io.open(p, 'w', encoding='utf8') as f:
+                    f.write(
+                        '\n'
+                        'import os\n'
+                        'import _this_module_should_not_exist_ as m\n'
+                        'm.something()\n'
+                        )
+                with self.assertRaises(ImportError):
+                    self.module.get_module('_test_importerr')
+
+        finally:
+            sys.path[:] = oldpath
diff --git a/browsepy/utils.py b/browsepy/utils.py
index 65fd397..f8b352f 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -6,6 +6,7 @@ import os.path
 import re
 import random
 import functools
+import collections
 
 import flask
 
@@ -42,14 +43,13 @@ def get_module(name):
     try:
         __import__(name)
         return sys.modules[name]
-    except (ImportError, KeyError) as error:
-        if isinstance(error, ImportError):
-            message = error.args[0] if error.args else ''
-            words = frozenset(re_words.findall(message))
-            parts = name.split('.')
-            for i in range(len(parts) - 1, -1, -1):
-                if '.'.join(parts[i:]) in words:
-                    return None
+    except ImportError as error:
+        message = error.args[0] if error.args else ''
+        words = frozenset(re_words.findall(message))
+        parts = name.split('.')
+        for i in range(len(parts) - 1, -1, -1):
+            if '.'.join(parts[i:]) in words:
+                return None
         raise
 
 
@@ -119,3 +119,22 @@ def clear_flask_context():
     '''
     clear_localstack(flask._app_ctx_stack)
     clear_localstack(flask._request_ctx_stack)
+
+
+def defaultsnamedtuple(name, fields, defaults=None):
+    '''
+    Generate namedtuple with default values.
+
+    :param name: name
+    :param fields: iterable with field names
+    :param defaults: iterable or mapping with field defaults
+    :returns: defaultdict with given fields and given defaults
+    :rtype: collections.defaultdict
+    '''
+    nt = collections.namedtuple(name, fields)
+    nt.__new__.__defaults__ = (None, ) * len(nt._fields)
+    if isinstance(defaults, collections.Mapping):
+        nt.__new__.__defaults__ = tuple(nt(**defaults))
+    elif defaults:
+        nt.__new__.__defaults__ = tuple(nt(*defaults))
+    return nt
-- 
GitLab


From a67f5dfdf32ad3f6fa3c040047d83c86c4b0f0c6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 25 Apr 2019 22:10:39 +0200
Subject: [PATCH 062/171] raise coverage, fixes

---
 .vscode/settings.json                         |  2 +-
 browsepy/__init__.py                          |  4 +-
 browsepy/file.py                              | 17 ++++---
 browsepy/manager.py                           | 48 +++++++++++--------
 browsepy/plugin/file_actions/__init__.py      | 35 +++++++-------
 browsepy/plugin/file_actions/exceptions.py    | 42 ++++++++++++++++
 .../templates/400.file_actions.html           |  6 +--
 browsepy/plugin/file_actions/tests.py         | 11 ++++-
 browsepy/plugin/file_actions/utils.py         | 16 +++++--
 browsepy/plugin/player/__init__.py            |  3 +-
 browsepy/stream.py                            | 20 ++++++++
 browsepy/utils.py                             | 29 +++++------
 12 files changed, 161 insertions(+), 72 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index cbbcd79..1f7909a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,7 @@
     "files.trimTrailingWhitespace": true,
     "files.insertFinalNewline": true,
     "python.formatting.provider": "yapf",
-    "python.unitTest.unittestEnabled": true,
+    "python.testing.unittestEnabled": true,
     "python.linting.flake8Enabled": true,
     "python.linting.enabled": true,
     "python.linting.pep8Enabled": true,
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 12ca3e9..5dcf37c 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -16,7 +16,7 @@ from werkzeug.exceptions import NotFound
 from .appconfig import Flask
 from .manager import PluginManager
 from .file import Node, secure_filename
-from .utils import stream_template
+from .stream import stream_template
 from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
                         InvalidFilenameError, InvalidPathError
 from . import compat
@@ -149,7 +149,7 @@ def sort(property, path):
     return redirect(url_for(".browse", path=directory.urlpath))
 
 
-@app.route("/browse", defaults={"path": ""})
+@app.route('/browse', defaults={'path': ''})
 @app.route('/browse/<path:path>')
 def browse(path):
     sort_property = get_cookie_browse_sorting(path, 'text')
diff --git a/browsepy/file.py b/browsepy/file.py
index 0bcb9b8..5beb4da 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -9,8 +9,10 @@ import string
 import random
 import datetime
 import logging
+import functools
+
+import flask
 
-from flask import current_app, send_from_directory
 from werkzeug.utils import cached_property
 
 from . import compat
@@ -273,7 +275,7 @@ class Node(object):
         :param **defaults: initial property values
         '''
         self.path = compat.fsdecode(path) if path else None
-        self.app = utils.solve_local(app or current_app)
+        self.app = utils.solve_local(app or flask.current_app)
         self.__dict__.update(defaults)  # only for attr and cached_property
 
     def __repr__(self):
@@ -308,7 +310,7 @@ class Node(object):
         :return: file object pointing to path
         :rtype: File
         '''
-        app = utils.solve_local(app or current_app)
+        app = utils.solve_local(app or flask.current_app)
         base = app.config.get('DIRECTORY_BASE', path)
         path = urlpath_to_abspath(path, base)
         if not cls.generic:
@@ -469,7 +471,7 @@ class File(Node):
         :rtype: flask.Response
         '''
         directory, name = os.path.split(self.path)
-        return send_from_directory(directory, name, as_attachment=True)
+        return flask.send_from_directory(directory, name, as_attachment=True)
 
 
 @Node.register_directory_class
@@ -650,10 +652,13 @@ class Directory(Node):
         stream = self.stream_class(
             self.path,
             self.app.config.get('DIRECTORY_TAR_BUFFSIZE', 10240),
-            self.plugin_manager.check_excluded,
+            functools.partial(
+                self.plugin_manager.check_excluded,
+                request=utils.solve_local(flask.request),
+                )
             )
         return self.app.response_class(
-            stream,
+            flask.stream_with_context(stream),
             direct_passthrough=True,
             headers=Headers(
                 content_type=(
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 78cbc8e..5b1f682 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -7,15 +7,17 @@ import functools
 import warnings
 import collections
 
-from flask import current_app
-from werkzeug.utils import cached_property
+import flask
 
+from werkzeug.utils import cached_property
 from cookieman import CookieMan
 
 from . import mimetype
 from . import compat
+from . import utils
+
 from .compat import deprecated, usedoc
-from .utils import get_module, defaultsnamedtuple
+from .utils import defaultsnamedtuple
 from .exceptions import PluginNotFoundError, InvalidArgumentError, \
                         WidgetParameterException
 
@@ -31,7 +33,7 @@ class PluginManagerBase(object):
         '''
         List of plugin namespaces taken from app config.
         '''
-        return self.app.config['PLUGIN_NAMESPACES'] if self.app else []
+        return self.app.config.get('PLUGIN_NAMESPACES', []) if self.app else []
 
     def __init__(self, app=None):
         '''
@@ -112,7 +114,7 @@ class PluginManagerBase(object):
             except ImportError:
                 pass
 
-    def _iter_plugin_modules(self):
+    def _iter_plugin_modules(self, get_module_fnc=utils.get_module):
         '''
         Iterate plugin modules, yielding both full qualified name and
         short plugin name as tuple.
@@ -120,13 +122,14 @@ class PluginManagerBase(object):
         nameset = set()
         shortset = set()
         filters = self.plugin_filters
-        for prefix in self.namespaces:
-            for name in (self._iter_submodules(prefix)
-                         if '.' in prefix else
-                         self._iter_modules(prefix)
-                         if prefix else
-                         ()):
-                module = get_module(name) if name not in nameset else None
+        for prefix in filter(None, self.namespaces):
+            name_iter_fnc = (
+                self._iter_submodules
+                if '.' in prefix else
+                self._iter_modules
+                )
+            for name in name_iter_fnc(prefix):
+                module = get_module_fnc(name) if name not in nameset else None
                 if module and any(f(module) for f in filters):
                     short = name[len(prefix):].lstrip('.').replace('_', '-')
                     if short in shortset or '.' in short or not short:
@@ -142,7 +145,7 @@ class PluginManagerBase(object):
         '''
         return list(self._iter_plugin_modules())
 
-    def import_plugin(self, plugin):
+    def import_plugin(self, plugin, get_module_fnc=utils.get_module):
         '''
         Import plugin by given name, looking at :attr:`namespaces`.
 
@@ -161,7 +164,7 @@ class PluginManagerBase(object):
             ]
         names = sorted(frozenset(names), key=names.index)
         for name in names:
-            module = get_module(name)
+            module = get_module_fnc(name)
             if module:
                 return module
         raise PluginNotFoundError(
@@ -254,16 +257,19 @@ class ExcludePluginManager(PluginManagerBase):
         '''
         self._exclude_functions.add(exclude_fnc)
 
-    def check_excluded(self, path):
+    def check_excluded(self, path, request=flask.request):
         '''
         Check if given path is excluded.
         '''
-        exclude_fnc = self.app.config.get('EXCLUDE_FNC')
-        if exclude_fnc and exclude_fnc(path):
-            return True
-        for fnc in self._exclude_functions:
-            if fnc(path):
+        if not request:
+            request = utils.dummy_context()
+        with request:
+            exclude_fnc = self.app.config.get('EXCLUDE_FNC')
+            if exclude_fnc and exclude_fnc(path):
                 return True
+            for fnc in self._exclude_functions:
+                if fnc(path):
+                    return True
         return False
 
     def clear(self):
@@ -712,7 +718,7 @@ class MimetypeActionPluginManager(WidgetPluginManager, MimetypePluginManager):
 
     def _widget_attrgetter(self, widget, name):
         def handler(f):
-            app = f.app or self.app or current_app
+            app = f.app or self.app or flask.current_app
             with app.app_context():
                 return getattr(widget.for_file(f), name)
         return handler
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index ffb4cf4..0a1e68a 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -5,7 +5,7 @@ import os.path
 import functools
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
-                  session, current_app
+                  session, current_app, g
 from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
@@ -13,13 +13,15 @@ from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
                           current_restricted_chars, common_path_separators
 from browsepy.compat import re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
-from browsepy.utils import stream_template, ppath
+from browsepy.utils import ppath
+from browsepy.stream import stream_template
 
 from .exceptions import FileActionsException, \
                         InvalidClipboardItemsError, \
                         InvalidClipboardModeError, \
                         InvalidDirnameError, \
-                        DirectoryCreationError
+                        DirectoryCreationError, \
+                        InvalidClipboardSizeError
 
 from . import utils
 
@@ -140,10 +142,8 @@ def clipboard_paste(path):
     mode = session.get('clipboard:mode')
     clipboard = session.get('clipboard:items', ())
 
-    success, issues, nmode = utils.paste(directory, mode, clipboard)
-    if clipboard and mode != nmode:
-        session['mode'] = nmode
-        mode = nmode
+    g.file_actions_paste = True  # disable exclude function
+    success, issues = utils.paste(directory, mode, clipboard)
 
     if issues:
         raise InvalidClipboardItemsError(
@@ -154,7 +154,8 @@ def clipboard_paste(path):
             )
 
     if mode == 'cut':
-        del session['clipboard:paths']
+        session.pop('clipboard:mode', None)
+        session.pop('clipboard:items', None)
 
     return redirect(url_for('browse', path=directory.urlpath))
 
@@ -162,8 +163,8 @@ def clipboard_paste(path):
 @actions.route('/clipboard/clear', defaults={'path': ''})
 @actions.route('/clipboard/clear/<path:path>')
 def clipboard_clear(path):
-    if 'clipboard:paths' in session:
-        del session['clipboard:paths']
+    session.pop('clipboard:mode', None)
+    session.pop('clipboard:items', None)
     return redirect(url_for('browse', path=path))
 
 
@@ -172,8 +173,8 @@ def clipboard_error(e):
     file = Node(e.path) if hasattr(e, 'path') else None
     issues = getattr(e, 'issues', ())
 
-    if session.get('clipboard:items'):
-        clipboard = session['clipboard:mode']
+    clipboard = session.get('clipboard:items')
+    if clipboard and issues:
         for issue in issues:
             if isinstance(issue.error, FileNotFoundError):
                 path = issue.item.urlpath
@@ -196,9 +197,10 @@ def clipboard_error(e):
 
 def shrink_session(data, last):
     if last:
-        # TODO: add warning message
-        del data['clipboard:items']
-        del data['clipboard:mode']
+        raise InvalidClipboardSizeError(
+            mode=data.pop('clipboard:mode', None),
+            clipboard=data.pop('clipboard:items', None),
+            )
     return data
 
 
@@ -216,7 +218,8 @@ def detect_selection(directory):
 
 
 def excluded_clipboard(manager, path):
-    if session.get('clipboard:mode') == 'cut':
+    if not getattr(g, 'file_actions_paste', False) and \
+       session.get('clipboard:mode') == 'cut':
         base = manager.app.config['DIRECTORY_BASE']
         clipboard = session.get('clipboard:items', ())
         return abspath_to_urlpath(path, base) in clipboard
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index 8df75a0..aaa0285 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -7,6 +7,8 @@ import errno
 class FileActionsException(Exception):
     '''
     Base class for file-actions exceptions
+
+    :property path: item path which raised this Exception
     '''
     code = None
     template = 'Unhandled error.'
@@ -21,6 +23,7 @@ class InvalidDirnameError(FileActionsException):
     '''
     Exception raised when a new directory name is invalid.
 
+    :property path: item path which raised this Exception
     :property name: name which raised this Exception
     '''
     code = 'directory-invalid-name'
@@ -35,6 +38,7 @@ class DirectoryCreationError(FileActionsException):
     '''
     Exception raised when a new directory creation fails.
 
+    :property path: item path which raised this Exception
     :property name: name which raised this Exception
     '''
     code = 'directory-mkdir-error'
@@ -64,6 +68,7 @@ class ClipboardException(FileActionsException):
     Base class for clipboard exceptions.
 
     :property path: item path which raised this Exception
+    :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
     '''
     code = 'clipboard-invalid'
@@ -106,6 +111,9 @@ class InvalidClipboardItemsError(ClipboardException):
     Exception raised when a clipboard item is not valid.
 
     :property path: item path which raised this Exception
+    :property mode: mode which raised this Exception
+    :property clipboard: :class Clipboard: instance
+    :property issues: iterable of issues
     '''
     pair_class = ItemIssue
     code = 'clipboard-invalid-items'
@@ -125,7 +133,9 @@ class InvalidClipboardModeError(ClipboardException):
     '''
     Exception raised when a clipboard mode is not valid.
 
+    :property path: item path which raised this Exception
     :property mode: mode which raised this Exception
+    :property clipboard: :class Clipboard: instance
     '''
     code = 'clipboard-invalid-mode'
     template = 'Clipboard mode {0.path!r} is not valid.'
@@ -133,3 +143,35 @@ class InvalidClipboardModeError(ClipboardException):
     def __init__(self, message=None, path=None, mode=None, clipboard=None):
         supa = super(InvalidClipboardModeError, self)
         supa.__init__(message, path, mode, clipboard)
+
+
+class InvalidEmptyClipboardError(ClipboardException):
+    '''
+    Exception raised when an invalid action is requested on an empty clipboard.
+
+    :property path: item path which raised this Exception
+    :property mode: mode which raised this Exception
+    :property clipboard: :class Clipboard: instance
+    '''
+    code = 'clipboard-invalid-empty'
+    template = 'Clipboard action {0.mode!r} cannot be performed without items.'
+
+    def __init__(self, message=None, path=None, mode=None, clipboard=None):
+        supa = super(InvalidEmptyClipboardError, self)
+        supa.__init__(message, path, mode, clipboard)
+
+
+class InvalidClipboardSizeError(ClipboardException):
+    '''
+    Exception raised when session manager evicts clipboard data.
+
+    :property path: item path which raised this Exception
+    :property mode: mode which raised this Exception
+    :property clipboard: :class Clipboard: instance
+    '''
+    code = 'clipboard-invalid-size'
+    template = 'Clipboard evicted due session size limit.'
+
+    def __init__(self, message=None, path=None, mode=None, clipboard=None):
+        supa = super(InvalidClipboardSizeError, self)
+        supa.__init__(message, path, mode, clipboard)
diff --git a/browsepy/plugin/file_actions/templates/400.file_actions.html b/browsepy/plugin/file_actions/templates/400.file_actions.html
index 9ac9b30..969458a 100644
--- a/browsepy/plugin/file_actions/templates/400.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/400.file_actions.html
@@ -48,9 +48,9 @@
       {%- endset %}
     {% elif error.code == 'clipboard-invalid-size' %}
       {% set description -%}
-        <h2>Clipboard size limit exceeded</h2>
-        <p>Clipboard became too big to be effectively stored in your browser cookies.</p>
-        <p>Please try again with fewer items.</p>
+        <h2>Session size limit exceeded, clipboard lost.</h2>
+        <p>Clipboard became too big to be stored in your browser cookies.</p>
+        <p>Please try again with fewer items and avoid other operations in the process.</p>
       {%- endset %}
     {% else %}
       {% set description %}
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 668051a..d1ecf86 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -342,6 +342,9 @@ class TestAction(unittest.TestCase):
             response = client.get('/file-actions/selection/nowhere')
             self.assertEqual(response.status_code, 404)
 
+            response = client.post('/file-actions/selection', data={})
+            self.assertEqual(response.status_code, 400)
+
     def test_paste(self):
         files = ['a', 'b', 'c']
         self.touch('a')
@@ -393,27 +396,31 @@ class TestAction(unittest.TestCase):
 
         with self.app.test_client() as client:
             with client.session_transaction() as session:
-                session['clipboard:mode'] = 'wrong-mode'
                 session['clipboard:items'] = ['whatever']
+                session['clipboard:mode'] = 'wrong-mode'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
             with client.session_transaction() as session:
+                session['clipboard:items'] = ['whatever']
                 session['clipboard:mode'] = 'cut'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 302)  # same location
 
             with client.session_transaction() as session:
+                session['clipboard:items'] = ['whatever']
                 session['clipboard:mode'] = 'cut'
             response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 400)
 
             with client.session_transaction() as session:
+                session['clipboard:items'] = ['whatever']
                 session['clipboard:mode'] = 'copy'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
             with client.session_transaction() as session:
+                session['clipboard:items'] = ['whatever']
                 session['clipboard:mode'] = 'copy'
             response = client.get('/file-actions/clipboard/paste/target')
             self.assertEqual(response.status_code, 400)
@@ -421,11 +428,13 @@ class TestAction(unittest.TestCase):
             self.app.config['EXCLUDE_FNC'] = lambda n: n.endswith('whatever')
 
             with client.session_transaction() as session:
+                session['clipboard:items'] = ['whatever']
                 session['clipboard:mode'] = 'cut'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
 
             with client.session_transaction() as session:
+                session['clipboard:items'] = ['whatever']
                 session['clipboard:mode'] = 'copy'
             response = client.get('/file-actions/clipboard/paste')
             self.assertEqual(response.status_code, 400)
diff --git a/browsepy/plugin/file_actions/utils.py b/browsepy/plugin/file_actions/utils.py
index 8666f2a..28a5772 100644
--- a/browsepy/plugin/file_actions/utils.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -8,20 +8,23 @@ import functools
 from browsepy.file import Node
 from browsepy.compat import map
 
-from .exceptions import InvalidClipboardModeError
+from .exceptions import InvalidClipboardModeError, InvalidEmptyClipboardError
 
 
 def copy(target, node, join_fnc=os.path.join):
     if node.is_excluded:
         raise OSError(2, os.strerror(2))
+
     dest = join_fnc(
         target.path,
         target.choose_filename(node.name)
         )
+
     if node.is_directory:
         shutil.copytree(node.path, dest)
     else:
         shutil.copy2(node.path, dest)
+
     return dest
 
 
@@ -53,12 +56,19 @@ def paste(target, mode, clipboard):
             mode=mode,
             clipboard=clipboard,
             )
+
+    if not clipboard:
+        raise InvalidEmptyClipboardError(
+            path=target.path,
+            mode=mode,
+            clipboard=clipboard,
+            )
+
     success = []
     issues = []
-    mode = 'paste'  # deactivates excluded_clipboard fnc
     for node in map(Node.from_urlpath, clipboard):
         try:
             success.append(paste_fnc(node))
         except BaseException as e:
             issues.append((node, e))
-    return success, issues, mode
+    return success, issues
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index 0639131..fbc5e2d 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -5,7 +5,8 @@ from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.file import OutsideDirectoryBase
-from browsepy.utils import stream_template, ppath
+from browsepy.utils import ppath
+from browsepy.stream import stream_template
 
 from .playable import PlayableFile, PlayableDirectory, \
                       PlayListFile, detect_playable_mimetype
diff --git a/browsepy/stream.py b/browsepy/stream.py
index b834039..f17f131 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -6,6 +6,9 @@ import tarfile
 import threading
 import functools
 
+import flask
+
+from . import utils
 from . import compat
 
 
@@ -233,3 +236,20 @@ class TarFileStream(compat.Iterator):
         Call :method:`TarFileStream.close`.
         '''
         self.close()
+
+
+def stream_template(template_name, **context):
+    '''
+    Some templates can be huge, this function returns an streaming response,
+    sending the content in chunks and preventing from timeout.
+
+    :param template_name: template
+    :param **context: parameters for templates.
+    :yields: HTML strings
+    :rtype: Iterator of str
+    '''
+    app = utils.solve_local(context.get('current_app') or flask.current_app)
+    app.update_template_context(context)
+    template = app.jinja_env.get_template(template_name)
+    stream = template.generate(context)
+    return flask.Response(flask.stream_with_context(stream))
diff --git a/browsepy/utils.py b/browsepy/utils.py
index f8b352f..0609d54 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -6,6 +6,7 @@ import os.path
 import re
 import random
 import functools
+import contextlib
 import collections
 
 import flask
@@ -31,6 +32,15 @@ def ppath(*args, **kwargs):
     return os.path.join(os.path.dirname(path), *args)
 
 
+@contextlib.contextmanager
+def dummy_context():
+    '''
+    Context manager which does nothing besides exposing the context
+    manger interface
+    '''
+    yield
+
+
 def get_module(name):
     '''
     Get module object by name.
@@ -47,7 +57,7 @@ def get_module(name):
         message = error.args[0] if error.args else ''
         words = frozenset(re_words.findall(message))
         parts = name.split('.')
-        for i in range(len(parts) - 1, -1, -1):
+        for i in range(len(parts) - 1):
             if '.'.join(parts[i:]) in words:
                 return None
         raise
@@ -78,23 +88,6 @@ def solve_local(context_local):
     return context_local
 
 
-def stream_template(template_name, **context):
-    '''
-    Some templates can be huge, this function returns an streaming response,
-    sending the content in chunks and preventing from timeout.
-
-    :param template_name: template
-    :param **context: parameters for templates.
-    :yields: HTML strings
-    :rtype: Iterator of str
-    '''
-    app = solve_local(context.get('current_app') or flask.current_app)
-    app.update_template_context(context)
-    template = app.jinja_env.get_template(template_name)
-    stream = template.generate(context)
-    return flask.Response(flask.stream_with_context(stream))
-
-
 def clear_localstack(stack):
     '''
     Clear given werkzeug LocalStack instance.
-- 
GitLab


From dd6ba35407827416d965067f7d1c01cbee639259 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 26 Apr 2019 13:04:10 +0200
Subject: [PATCH 063/171] compatibility fixes

---
 browsepy/compat.py          | 20 ++++++++++++++++++--
 browsepy/file.py            |  7 ++-----
 browsepy/manager.py         |  6 +++---
 browsepy/tests/test_file.py | 11 ++++++-----
 setup.py                    |  8 +++++---
 5 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 8713fcb..afe1709 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -22,9 +22,9 @@ except ImportError:
     import importlib_resources as res  # noqa
 
 try:
-    from os import scandir, walk  # python 3.5+
+    from os import scandir as _scandir, walk  # python 3.5+
 except ImportError:
-    from scandir import scandir, walk  # noqa
+    from scandir import scandir as _scandir, walk  # noqa
 
 try:
     from shutil import get_terminal_size  # python 3.3+
@@ -67,6 +67,22 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
             prog, indent_increment, max_help_position, width)
 
 
+@contextlib.contextmanager
+def scandir(path):
+    '''
+    Backwards-compatible scandir context manager
+
+    :param path: path to iterate
+    :type path: str
+    '''
+    files = _scandir(path)
+    try:
+        yield files
+    finally:
+        if callable(getattr(files, 'close', None)):
+            files.close()
+
+
 def isexec(path):
     '''
     Check if given path points to an executable file.
diff --git a/browsepy/file.py b/browsepy/file.py
index 5beb4da..f214f26 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -729,8 +729,8 @@ class Directory(Node):
         directory_class = self.directory_class
         file_class = self.file_class
         exclude_fnc = self.plugin_manager.check_excluded
-        files = compat.scandir(self.path)
-        try:
+
+        with compat.scandir(self.path) as files:
             for entry in files:
                 if exclude_fnc(entry.path):
                     continue
@@ -750,9 +750,6 @@ class Directory(Node):
                         )
                 except OSError as e:
                     logger.exception(e)
-        finally:
-            if callable(getattr(files, 'close', None)):
-                files.close()
 
     def listdir(self, sortkey=None, reverse=False):
         '''
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 5b1f682..6994626 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -82,9 +82,9 @@ class PluginManagerBase(object):
         '''
         Iterate thru all root modules containing given prefix.
         '''
-        for info in pkgutil.iter_modules():
-            if info.name.startswith(prefix):
-                yield info.name
+        for finder, name, ispkg in pkgutil.iter_modules():
+            if name.startswith(prefix):
+                yield name
 
     def _content_import_name(self, module, item, prefix):
         '''
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index 3bd1802..08ca9cc 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -23,11 +23,12 @@ class TestFile(unittest.TestCase):
         self.workbench = tempfile.mkdtemp()
 
     def clear_workbench(self):
-        for entry in browsepy.compat.scandir(self.workbench):
-            if entry.is_dir():
-                shutil.rmtree(entry.path)
-            else:
-                os.remove(entry.path)
+        with browsepy.compat.scandir(self.workbench) as files:
+            for entry in files:
+                if entry.is_dir():
+                    shutil.rmtree(entry.path)
+                else:
+                    os.remove(entry.path)
 
     def tearDown(self):
         shutil.rmtree(self.workbench)
diff --git a/setup.py b/setup.py
index cf2ed59..7f33865 100644
--- a/setup.py
+++ b/setup.py
@@ -60,9 +60,11 @@ setup(
     install_requires=[
         'flask',
         'unicategories',
-        'scandir',
-        'importlib_resources',
-        'backports.shutil_get_terminal_size'
+        'cookieman',
+        'backports.shutil_get_terminal_size ; python_version<\'3.3\'',
+        'scandir ; python_version<\'3.5\'',
+        'pathlib2 ; python_version<\'3.5\'',
+        'importlib_resources ; python_version<\'3.7\'',
         ],
     extras_require={
         'tests': ['beautifulsoup4', 'pycodestyle'],
-- 
GitLab


From ceb6a9d5caed10efcdb2dd9ada75ab276ec1bcb0 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 26 Apr 2019 13:29:12 +0200
Subject: [PATCH 064/171] add note on readme regarding setuptools, update
 requirements

---
 .travis.yml           | 2 +-
 README.rst            | 4 ++++
 requirements/base.txt | 6 ++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9dd839..10e463b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
 install:
   - |
     if [ "$legacy" != "yes" ]; then
-      pip install --upgrade pip
+      pip install --upgrade pip setuptools
     fi
   - pip install -r requirements/ci.txt
   - pip install .
diff --git a/README.rst b/README.rst
index 79bf900..190fd8a 100644
--- a/README.rst
+++ b/README.rst
@@ -83,6 +83,10 @@ New in 0.5
 Install
 -------
 
+*Note*: with some legacy Python versions shiping outdated libraries, both
+`pip` and `setuptools` library should be upgraded with
+`pip install --upgrade pip setuptools`.
+
 It's on `pypi` so...
 
 .. _pypi: https://pypi.python.org/pypi/browsepy/
diff --git a/requirements/base.txt b/requirements/base.txt
index 4518665..5d1f523 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -18,5 +18,7 @@ unicategories
 
 # compat
 six
-scandir # python < 3.6
-backports.shutil_get_terminal_size # python < 3.3
+backports.shutil_get_terminal_size ; python_version<'3.3'
+scandir ; python_version<'3.5'
+pathlib2 ; python_version<'3.5'
+importlib_resources ; python_version<'3.7'
-- 
GitLab


From 304006a4781d6821fdaf432b33bb0743798803ac Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 26 Apr 2019 13:34:44 +0200
Subject: [PATCH 065/171] retry with distutils upgrade

---
 .appveyor.yml | 2 +-
 .travis.yml   | 2 +-
 README.rst    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index b9408f8..8c32029 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -73,7 +73,7 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - "pip install --disable-pip-version-check --user --upgrade pip setuptools"
+  - "pip install --disable-pip-version-check --user --upgrade pip setuptools distutils"
 
 test_script:
   - "python setup.py test"
diff --git a/.travis.yml b/.travis.yml
index 10e463b..3f5a0b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
 install:
   - |
     if [ "$legacy" != "yes" ]; then
-      pip install --upgrade pip setuptools
+      pip install --upgrade pip setuptools distutils
     fi
   - pip install -r requirements/ci.txt
   - pip install .
diff --git a/README.rst b/README.rst
index 190fd8a..53749a8 100644
--- a/README.rst
+++ b/README.rst
@@ -83,9 +83,9 @@ New in 0.5
 Install
 -------
 
-*Note*: with some legacy Python versions shiping outdated libraries, both
-`pip` and `setuptools` library should be upgraded with
-`pip install --upgrade pip setuptools`.
+*Note*: with some legacy Python versions shipping outdated libraries, all
+`pip`, `setuptools` and `distutils` libraries should be upgraded with
+`pip install --upgrade pip setuptools distutils`.
 
 It's on `pypi` so...
 
-- 
GitLab


From 1bc65cf41e4aabd54d9a8665926bd792bf7a8b1e Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 26 Apr 2019 13:46:56 +0200
Subject: [PATCH 066/171] drop python3.3 for good

---
 .appveyor.yml | 10 +---------
 .travis.yml   |  5 +----
 README.rst    | 23 ++++++++++++++++-------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 8c32029..54f91e3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,14 +8,6 @@ environment:
       PYTHON_VERSION: "2.7.x" # currently 2.7.9
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python33"
-      PYTHON_VERSION: "3.3.x" # currently 3.3.5
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3.x" # currently 3.3.5
-      PYTHON_ARCH: "64"
-
     - PYTHON: "C:\\Python34"
       PYTHON_VERSION: "3.4.x" # currently 3.4.3
       PYTHON_ARCH: "32"
@@ -73,7 +65,7 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - "pip install --disable-pip-version-check --user --upgrade pip setuptools distutils"
+  - "pip install --disable-pip-version-check --user --upgrade pip setuptools"
 
 test_script:
   - "python setup.py test"
diff --git a/.travis.yml b/.travis.yml
index 3f5a0b6..7aa44db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ matrix:
   - python: "2.7"
   - python: "pypy"
   - python: "pypy3"
-  - python: "3.3"
-    env:
-    - legacy=yes
   - python: "3.4"
   - python: "3.5"
   - python: "3.6"
@@ -23,7 +20,7 @@ matrix:
 install:
   - |
     if [ "$legacy" != "yes" ]; then
-      pip install --upgrade pip setuptools distutils
+      pip install --upgrade pip setuptools
     fi
   - pip install -r requirements/ci.txt
   - pip install .
diff --git a/README.rst b/README.rst
index 53749a8..e15e756 100644
--- a/README.rst
+++ b/README.rst
@@ -25,9 +25,9 @@ browsepy
   :target: https://pypi.python.org/pypi/browsepy/
   :alt: Version: 0.5.6
 
-.. image:: https://img.shields.io/badge/python-2.7%2B%2C%203.3%2B-FFC100.svg?style=flat-square
+.. image:: https://img.shields.io/badge/python-2.7%2B%2C%203.4%2B-FFC100.svg?style=flat-square
   :target: https://pypi.python.org/pypi/browsepy/
-  :alt: Python 2.7+, 3.3+
+  :alt: Python 2.7+, 3.4+
 
 The simple web file browser.
 
@@ -56,6 +56,15 @@ Features
 * **Optional upload** for directories under given path.
 * **Player** audio player plugin is provided (without transcoding).
 
+New in 0.6
+----------
+
+* Drop Python 3.3.
+* Plugin discovery.
+* Plugin file-actions providing copy/cut/paste and directory creation.
+* Smarter cookie sessions with session shrinking mechanisms available
+  for plugin implementors.
+
 New in 0.5
 ----------
 
@@ -83,9 +92,9 @@ New in 0.5
 Install
 -------
 
-*Note*: with some legacy Python versions shipping outdated libraries, all
-`pip`, `setuptools` and `distutils` libraries should be upgraded with
-`pip install --upgrade pip setuptools distutils`.
+*Note*: with some legacy Python versions shipping outdated libraries, both
+`pip` and `setuptools` libraries should be upgraded with
+`pip install --upgrade pip setuptools`.
 
 It's on `pypi` so...
 
@@ -156,7 +165,7 @@ plugins (loaded with `plugin` argument) could add extra arguments to this list.
   optional arguments:
     -h, --help           show this help message and exit
     --help-all           show help for all available plugins and exit
-    --directory PATH     serving directory (default: /home/work/Desarrollo/browsepy)
+    --directory PATH     serving directory (default: ...)
     --initial PATH       default directory (default: same as --directory)
     --removable PATH     base directory allowing remove (default: None)
     --upload PATH        base directory allowing upload (default: None)
@@ -166,8 +175,8 @@ plugins (loaded with `plugin` argument) could add extra arguments to this list.
     --plugin MODULE      load plugin module (multiple)
 
   available plugins:
-    file-actions, browsepy.plugin.file_actions
     player, browsepy.plugin.player
+    file-actions, browsepy.plugin.file_actions
 
 
 Using as library
-- 
GitLab


From 4b491be44faf4560a1fab6d0c4f6d3c6d02c8ccf Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 26 Apr 2019 18:34:11 +0200
Subject: [PATCH 067/171] fix get_module importerror detection

---
 browsepy/utils.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/browsepy/utils.py b/browsepy/utils.py
index 0609d54..6e2affb 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -12,7 +12,7 @@ import collections
 import flask
 
 
-re_words = re.compile(r'\b((?:[._]+|\w)+)\b')
+re_words = re.compile(r'\b((?:[._]+|\w+)+)\b')
 
 
 def ppath(*args, **kwargs):
@@ -57,10 +57,8 @@ def get_module(name):
         message = error.args[0] if error.args else ''
         words = frozenset(re_words.findall(message))
         parts = name.split('.')
-        for i in range(len(parts) - 1):
-            if '.'.join(parts[i:]) in words:
-                return None
-        raise
+        if not any('.'.join(parts[i:]) in words for i in range(len(parts))):
+            raise
 
 
 def random_string(size, sample=tuple(map(chr, range(256)))):
-- 
GitLab


From 7d233af4288cec04a924a47718933173efd0196f Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 26 May 2019 18:34:47 +0100
Subject: [PATCH 068/171] improve readability, drop 3.4, add flake8 to ci

---
 .travis.yml                    |  3 ++-
 README.rst                     |  2 +-
 browsepy/compat.py             | 19 +++++++++++++++++-
 browsepy/manager.py            | 33 ++++++++++++++++++++-----------
 browsepy/stream.py             | 36 ++++++++++++++++++++--------------
 browsepy/tests/test_plugins.py |  7 +++----
 browsepy/tests/test_utils.py   | 16 ++++++---------
 browsepy/utils.py              | 15 ++------------
 setup.cfg                      |  2 +-
 9 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7aa44db..3b448c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ matrix:
   - python: "2.7"
   - python: "pypy"
   - python: "pypy3"
-  - python: "3.4"
   - python: "3.5"
   - python: "3.6"
   - python: "3.7"
+    dist: xenial
     env:
     - eslint=yes
     - sphinx=yes
@@ -36,6 +36,7 @@ install:
     fi
 
 script:
+  - flake8 browsepy
   - coverage run setup.py test
   - coverage report
   - |
diff --git a/README.rst b/README.rst
index e15e756..b6b2330 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,7 @@ browsepy
 
 .. image:: https://img.shields.io/badge/python-2.7%2B%2C%203.4%2B-FFC100.svg?style=flat-square
   :target: https://pypi.python.org/pypi/browsepy/
-  :alt: Python 2.7+, 3.4+
+  :alt: Python 2.7+, 3.5+
 
 The simple web file browser.
 
diff --git a/browsepy/compat.py b/browsepy/compat.py
index afe1709..109e83b 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -4,6 +4,8 @@ import os
 import os.path
 import sys
 import abc
+import shutil
+import tempfile
 import itertools
 import functools
 import contextlib
@@ -70,7 +72,7 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
 @contextlib.contextmanager
 def scandir(path):
     '''
-    Backwards-compatible scandir context manager
+    Backwards-compatible :func:`scandir.scandir` context manager
 
     :param path: path to iterate
     :type path: str
@@ -83,6 +85,21 @@ def scandir(path):
             files.close()
 
 
+@contextlib.contextmanager
+def mkdtemp(suffix='', prefix='', dir=None):
+    '''
+    Backwards-compatible :class:`tmpfile.TemporaryDirectory` context manager.
+
+    :param path: path to iterate
+    :type path: str
+    '''
+    path = tempfile.mkdtemp(suffix, prefix, dir)
+    try:
+        yield path
+    finally:
+        shutil.rmtree(path)
+
+
 def isexec(path):
     '''
     Check if given path points to an executable file.
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 6994626..42fc063 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -129,14 +129,24 @@ class PluginManagerBase(object):
                 self._iter_modules
                 )
             for name in name_iter_fnc(prefix):
-                module = get_module_fnc(name) if name not in nameset else None
-                if module and any(f(module) for f in filters):
-                    short = name[len(prefix):].lstrip('.').replace('_', '-')
-                    if short in shortset or '.' in short or not short:
-                        short = None
-                    yield name, short
-                    nameset.add(name)
-                    shortset.add(short)
+                if name in nameset:
+                    continue
+
+                try:
+                    module = get_module_fnc(name)
+                except ImportError:
+                    continue
+
+                if not any(f(module) for f in filters):
+                    continue
+
+                short = name[len(prefix):].lstrip('.').replace('_', '-')
+                yield (
+                    name,
+                    None if short in shortset or '.' in short else short
+                    )
+                nameset.add(name)
+                shortset.add(short)
 
     @cached_property
     def available_plugins(self):
@@ -164,9 +174,10 @@ class PluginManagerBase(object):
             ]
         names = sorted(frozenset(names), key=names.index)
         for name in names:
-            module = get_module_fnc(name)
-            if module:
-                return module
+            try:
+                return get_module_fnc(name)
+            except ImportError:
+                pass
         raise PluginNotFoundError(
             'No plugin module %r found, tried %r' % (plugin, names),
             plugin, names)
diff --git a/browsepy/stream.py b/browsepy/stream.py
index f17f131..20d4878 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -8,7 +8,6 @@ import functools
 
 import flask
 
-from . import utils
 from . import compat
 
 
@@ -90,22 +89,29 @@ class BlockingPipe(object):
         Closes, so any blocked and future writes or retrieves will raise
         :attr:`abort_exception` instances.
         '''
+
+        def blocked():
+            '''
+            NOOP lock release function for non-owned locks.
+            '''
+            pass
+
         if not self.closed:
             self.closed = True
 
-            # release locks
-            reading = not self._rlock.acquire(False)
-            writing = not self._wlock.acquire(False)
+            releasing = writing, reading = [
+                lock.release if lock.acquire(False) else blocked
+                for lock in (self._wlock, self._rlock)
+                ]
+
+            if writing is blocked and reading is not blocked:
+                self._pipe.get()
 
-            if not reading:
-                if writing:
-                    self._pipe.get()
-                self._rlock.release()
+            if reading is blocked and writing is not blocked:
+                self._pipe.put(None)
 
-            if not writing:
-                if reading:
-                    self._pipe.put(None)
-                self._wlock.release()
+            for release in releasing:
+                release()
 
 
 class TarFileStream(compat.Iterator):
@@ -200,11 +206,11 @@ class TarFileStream(compat.Iterator):
 
         try:
             tarfile.add(self.path, "", filter=infofilter if exclude else None)
-            tarfile.close()  # force stream flush
+            tarfile.close()  # force stream flush (may raise)
         except self.abort_exception:
             # expected exception when pipe is closed prematurely
             tarfile.close()  # free fd
-        else:
+        finally:
             self.close()
 
     def __next__(self):
@@ -248,7 +254,7 @@ def stream_template(template_name, **context):
     :yields: HTML strings
     :rtype: Iterator of str
     '''
-    app = utils.solve_local(context.get('current_app') or flask.current_app)
+    app = context.get('current_app', flask.current_app)
     app.update_template_context(context)
     template = app.jinja_env.get_template(template_name)
     stream = template.generate(context)
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 0a9c1c9..cc877c6 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -3,15 +3,14 @@
 import sys
 import os
 import os.path
-import io
 import unittest
-import tempfile
 
 import flask
 
 import browsepy
 import browsepy.manager
 import browsepy.utils as utils
+import browsepy.compat as compat
 import browsepy.exceptions as exceptions
 
 from browsepy.plugin.player.tests import *  # noqa
@@ -126,14 +125,14 @@ class TestPlugins(unittest.TestCase):
             'browsepy_testing_',
             )
 
-        with tempfile.TemporaryDirectory() as base:
+        with compat.mkdtemp() as base:
             names = (
                 'browsepy_test_another_plugin',
                 'browsepy_testing_another_plugin',
                 )
             for name in names:
                 path = os.path.join(base, name) + '.py'
-                with io.open(path, 'w', encoding='utf8') as f:
+                with open(path, 'w') as f:
                     f.write(
                         '\n'
                         'def register_plugin(manager):\n'
diff --git a/browsepy/tests/test_utils.py b/browsepy/tests/test_utils.py
index a656ce1..7be70f6 100644
--- a/browsepy/tests/test_utils.py
+++ b/browsepy/tests/test_utils.py
@@ -1,14 +1,13 @@
 # -*- coding: UTF-8 -*-
 
 import sys
-import io
 import os
 import os.path
 import functools
 import unittest
-import tempfile
 
 import browsepy.utils as utils
+import browsepy.compat as compat
 
 
 class TestPPath(unittest.TestCase):
@@ -46,22 +45,19 @@ class TestPPath(unittest.TestCase):
     def test_get_module(self):
         oldpath = sys.path[:]
         try:
-            with tempfile.TemporaryDirectory() as base:
-                ppath = functools.partial(os.path.join, base)
+            with compat.mkdtemp() as base:
+                p = functools.partial(os.path.join, base)
                 sys.path[:] = [base]
 
-                p = ppath('_test_zderr.py')
-                with io.open(p, 'w', encoding='utf8') as f:
+                with open(p('_test_zderr.py'), 'w') as f:
                     f.write('\na = 1 / 0\n')
                 with self.assertRaises(ZeroDivisionError):
                     self.module.get_module('_test_zderr')
 
-                p = ppath('_test_importerr.py')
-                with io.open(p, 'w', encoding='utf8') as f:
+                with open(p('_test_importerr.py'), 'w') as f:
                     f.write(
                         '\n'
-                        'import os\n'
-                        'import _this_module_should_not_exist_ as m\n'
+                        'import browsepy.tests.test_utils.failing\n'
                         'm.something()\n'
                         )
                 with self.assertRaises(ImportError):
diff --git a/browsepy/utils.py b/browsepy/utils.py
index 6e2affb..d6dd38f 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -3,7 +3,6 @@
 import sys
 import os
 import os.path
-import re
 import random
 import functools
 import contextlib
@@ -12,9 +11,6 @@ import collections
 import flask
 
 
-re_words = re.compile(r'\b((?:[._]+|\w+)+)\b')
-
-
 def ppath(*args, **kwargs):
     '''
     Get joined file path relative to module location.
@@ -50,15 +46,8 @@ def get_module(name):
     :return: module or None if not found
     :rtype: module or None
     '''
-    try:
-        __import__(name)
-        return sys.modules[name]
-    except ImportError as error:
-        message = error.args[0] if error.args else ''
-        words = frozenset(re_words.findall(message))
-        parts = name.split('.')
-        if not any('.'.join(parts[i:]) in words for i in range(len(parts))):
-            raise
+    __import__(name)
+    return sys.modules.get(name, None)
 
 
 def random_string(size, sample=tuple(map(chr, range(256)))):
diff --git a/setup.cfg b/setup.cfg
index 66043ce..73203c0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,7 +12,7 @@ ignore = E123,E126,E121,W504
 
 [flake8]
 ignore = E123,E126,E121,W504
-max-complexity = 5
+max-complexity = 7
 select = F,C
 show-source = True
 
-- 
GitLab


From 65e67eab9c54a8c2a37e2affda6c1571dacbebea Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Mon, 27 May 2019 22:30:46 +0100
Subject: [PATCH 069/171] reduce complexity

---
 browsepy/plugin/file_actions/__init__.py   | 67 ++++++++-------------
 browsepy/plugin/file_actions/exceptions.py |  2 +-
 browsepy/plugin/file_actions/utils.py      | 17 +++++-
 browsepy/transform/htmlcompress.py         | 69 ++++++++++++----------
 4 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 0a1e68a..810aced 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -1,7 +1,5 @@
 # -*- coding: UTF-8 -*-
 
-import os
-import os.path
 import functools
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
@@ -9,8 +7,8 @@ from flask import Blueprint, render_template, request, redirect, url_for, \
 from werkzeug.exceptions import NotFound
 
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
-from browsepy.file import Node, abspath_to_urlpath, secure_filename, \
-                          current_restricted_chars, common_path_separators
+from browsepy.file import Node, abspath_to_urlpath, current_restricted_chars, \
+                          common_path_separators
 from browsepy.compat import re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
 from browsepy.utils import ppath
@@ -19,8 +17,6 @@ from browsepy.stream import stream_template
 from .exceptions import FileActionsException, \
                         InvalidClipboardItemsError, \
                         InvalidClipboardModeError, \
-                        InvalidDirnameError, \
-                        DirectoryCreationError, \
                         InvalidClipboardSizeError
 
 from . import utils
@@ -51,30 +47,15 @@ def create_directory(path):
     if not directory.is_directory or not directory.can_upload:
         return NotFound()
 
-    if request.method == 'GET':
-        return render_template(
-            'create_directory.file_actions.html',
-            file=directory,
-            re_basename=re_basename,
-            )
-
-    basename = request.form['name']
-    if secure_filename(basename) != basename or not basename:
-        raise InvalidDirnameError(
-            path=directory.path,
-            name=basename,
-            )
-
-    try:
-        os.mkdir(os.path.join(directory.path, basename))
-    except BaseException as e:
-        raise DirectoryCreationError.from_exception(
-            e,
-            path=directory.path,
-            name=basename
-            )
+    if request.method == 'POST':
+        utils.mkdir(directory.path, request.form['name'])
+        return redirect(url_for('browse', path=directory.urlpath))
 
-    return redirect(url_for('browse', path=directory.urlpath))
+    return render_template(
+        'create_directory.file_actions.html',
+        file=directory,
+        re_basename=re_basename,
+        )
 
 
 @actions.route('/selection', methods=('GET', 'POST'), defaults={'path': ''})
@@ -92,25 +73,23 @@ def selection(path):
         return NotFound()
 
     if request.method == 'POST':
-        action_fmt = 'action-{}'.format
-        mode = None
-        for action in ('cut', 'copy'):
-            if request.form.get(action_fmt(action)):
-                mode = action
-                break
+        mode = (
+            'cut' if request.form.get('action-cut') else
+            'copy' if request.form.get('action-copy') else
+            None
+            )
 
         clipboard = request.form.getlist('path')
 
-        if mode in ('cut', 'copy'):
-            session['clipboard:mode'] = mode
-            session['clipboard:items'] = clipboard
-            return redirect(url_for('browse', path=directory.urlpath))
+        if mode is None:
+            raise InvalidClipboardModeError(
+                path=directory.path,
+                clipboard=clipboard,
+                )
 
-        raise InvalidClipboardModeError(
-            path=directory.path,
-            mode=mode,
-            clipboard=clipboard,
-            )
+        session['clipboard:mode'] = mode
+        session['clipboard:items'] = clipboard
+        return redirect(url_for('browse', path=directory.urlpath))
 
     return stream_template(
         'selection.file_actions.html',
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index aaa0285..8a00a34 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -138,7 +138,7 @@ class InvalidClipboardModeError(ClipboardException):
     :property clipboard: :class Clipboard: instance
     '''
     code = 'clipboard-invalid-mode'
-    template = 'Clipboard mode {0.path!r} is not valid.'
+    template = 'Clipboard mode {0.mode!r} is not valid.'
 
     def __init__(self, message=None, path=None, mode=None, clipboard=None):
         supa = super(InvalidClipboardModeError, self)
diff --git a/browsepy/plugin/file_actions/utils.py b/browsepy/plugin/file_actions/utils.py
index 28a5772..f7d91c1 100644
--- a/browsepy/plugin/file_actions/utils.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -5,10 +5,13 @@ import os.path
 import shutil
 import functools
 
-from browsepy.file import Node
+from browsepy.file import Node, secure_filename
 from browsepy.compat import map
 
-from .exceptions import InvalidClipboardModeError, InvalidEmptyClipboardError
+from .exceptions import InvalidClipboardModeError, \
+                        InvalidEmptyClipboardError,\
+                        InvalidDirnameError, \
+                        DirectoryCreationError
 
 
 def copy(target, node, join_fnc=os.path.join):
@@ -72,3 +75,13 @@ def paste(target, mode, clipboard):
         except BaseException as e:
             issues.append((node, e))
     return success, issues
+
+
+def mkdir(path, name):
+    if secure_filename(name) != name or not name:
+        raise InvalidDirnameError(path=path, name=name)
+
+    try:
+        os.mkdir(os.path.join(path, name))
+    except BaseException as e:
+        raise DirectoryCreationError.from_exception(e, path=path, name=name)
diff --git a/browsepy/transform/htmlcompress.py b/browsepy/transform/htmlcompress.py
index ccd05de..f737d85 100755
--- a/browsepy/transform/htmlcompress.py
+++ b/browsepy/transform/htmlcompress.py
@@ -7,7 +7,39 @@ import jinja2.lexer
 from . import StateMachine
 
 
-class SGMLCompressContext(StateMachine):
+class CompressContext(StateMachine):
+    token_class = jinja2.lexer.Token
+    block_tokens = {
+        'variable_begin': 'variable_end',
+        'block_begin': 'block_end'
+        }
+    skip_until_token = None
+    lineno = 0
+
+    def feed(self, token):
+        if self.skip_until_token:
+            yield token
+            if token.type == self.skip_until_token:
+                self.skip_until_token = None
+        elif token.type != 'data':
+            for ftoken in self.finish():
+                yield ftoken
+            yield token
+            self.skip_until_token = self.block_tokens.get(token.type)
+        else:
+            if not self.pending:
+                self.lineno = token.lineno
+
+            for data in super(CompressContext, self).feed(token.value):
+                yield self.token_class(self.lineno, 'data', data)
+                self.lineno = token.lineno
+
+    def finish(self):
+        for data in super(CompressContext, self).finish():
+            yield self.token_class(self.lineno, 'data', data)
+
+
+class SGMLCompressContext(CompressContext):
     re_whitespace = re.compile('[ \\t\\r\\n]+')
     block_tags = {}  # block content will be treated as literal text
     jumps = {  # state machine jumps
@@ -70,36 +102,13 @@ class HTMLCompressContext(SGMLCompressContext):
 
 class HTMLCompress(jinja2.ext.Extension):
     context_class = HTMLCompressContext
-    token_class = jinja2.lexer.Token
-    block_tokens = {
-        'variable_begin': 'variable_end',
-        'block_begin': 'block_end'
-        }
 
     def filter_stream(self, stream):
         transform = self.context_class()
-        lineno = 0
-        skip_until_token = None
+
         for token in stream:
-            if skip_until_token:
-                yield token
-                if token.type == skip_until_token:
-                    skip_until_token = None
-                continue
-
-            if token.type != 'data':
-                for data in transform.finish():
-                    yield self.token_class(lineno, 'data', data)
-                yield token
-                skip_until_token = self.block_tokens.get(token.type)
-                continue
-
-            if not transform.pending:
-                lineno = token.lineno
-
-            for data in transform.feed(token.value):
-                yield self.token_class(lineno, 'data', data)
-                lineno = token.lineno
-
-        for data in transform.finish():
-            yield self.token_class(lineno, 'data', data)
+            for compressed in transform.feed(token):
+                yield compressed
+
+        for compressed in transform.finish():
+            yield compressed
-- 
GitLab


From 0b129f1f37bf676c1688eb5507f3971efbd19e79 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 16 Jun 2019 16:52:50 +0200
Subject: [PATCH 070/171] add download folder head button, fix directory stream
 premature retrieve abort

---
 .python-version    |  2 +-
 browsepy/file.py   | 26 ++++++++++++++++++++------
 browsepy/stream.py |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.python-version b/.python-version
index 0b2eb36..c1e43e6 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.7.2
+3.7.3
diff --git a/browsepy/file.py b/browsepy/file.py
index f214f26..70abb3c 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -390,15 +390,22 @@ class File(Node):
                 )
             ]
         if self.can_download:
-            widgets.append(
+            widgets.extend((
                 self.plugin_manager.create_widget(
                     'entry-actions',
                     'button',
                     file=self,
                     css='download',
                     endpoint='download_file'
-                    )
-                )
+                    ),
+                self.plugin_manager.create_widget(
+                    'header',
+                    'button',
+                    file=self,
+                    text='Download file',
+                    endpoint='download_file'
+                    ),
+                ))
         return widgets + super(File, self).widgets
 
     @cached_property
@@ -554,15 +561,22 @@ class Directory(Node):
                     )
                 ))
         if self.can_download:
-            widgets.append(
+            widgets.extend((
                 self.plugin_manager.create_widget(
                     'entry-actions',
                     'button',
                     file=self,
                     css='download',
                     endpoint='download_directory'
-                    )
-                )
+                    ),
+                self.plugin_manager.create_widget(
+                    'header',
+                    'button',
+                    file=self,
+                    text='Download all',
+                    endpoint='download_directory'
+                    ),
+                ))
         return widgets + super(Directory, self).widgets
 
     @cached_property
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 20d4878..c42214e 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -71,7 +71,7 @@ class BlockingPipe(object):
         '''
 
         with self._rlock:
-            if self.closed:
+            if self.closed and self._pipe.empty():
                 raise self.abort_exception()
             data = self._pipe.get()
             if data is None:
-- 
GitLab


From f65688cacbd48a674ad449b03683850670ba9b2d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 16 Jun 2019 20:33:07 +0200
Subject: [PATCH 071/171] reorder download directory header button, fixes

---
 browsepy/file.py                         | 34 ++++++++++++------------
 browsepy/manager.py                      | 16 +++++------
 browsepy/plugin/file_actions/__init__.py | 12 +++++----
 browsepy/plugin/file_actions/utils.py    |  4 ++-
 browsepy/templates/remove.html           |  2 +-
 5 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/browsepy/file.py b/browsepy/file.py
index 70abb3c..d020226 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -536,6 +536,23 @@ class Directory(Node):
                 endpoint='browse'
                 )
             ]
+        if self.can_download:
+            widgets.extend((
+                self.plugin_manager.create_widget(
+                    'entry-actions',
+                    'button',
+                    file=self,
+                    css='download',
+                    endpoint='download_directory'
+                    ),
+                self.plugin_manager.create_widget(
+                    'header',
+                    'button',
+                    file=self,
+                    text='Download all',
+                    endpoint='download_directory'
+                    ),
+                ))
         if self.can_upload:
             widgets.extend((
                 self.plugin_manager.create_widget(
@@ -560,23 +577,6 @@ class Directory(Node):
                     endpoint='upload'
                     )
                 ))
-        if self.can_download:
-            widgets.extend((
-                self.plugin_manager.create_widget(
-                    'entry-actions',
-                    'button',
-                    file=self,
-                    css='download',
-                    endpoint='download_directory'
-                    ),
-                self.plugin_manager.create_widget(
-                    'header',
-                    'button',
-                    file=self,
-                    text='Download all',
-                    endpoint='download_directory'
-                    ),
-                ))
         return widgets + super(Directory, self).widgets
 
     @cached_property
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 42fc063..f35de48 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -271,16 +271,16 @@ class ExcludePluginManager(PluginManagerBase):
     def check_excluded(self, path, request=flask.request):
         '''
         Check if given path is excluded.
+
+        :type path: str
+        :type request: flask.Request
         '''
-        if not request:
-            request = utils.dummy_context()
-        with request:
-            exclude_fnc = self.app.config.get('EXCLUDE_FNC')
-            if exclude_fnc and exclude_fnc(path):
+        exclude_fnc = self.app.config.get('EXCLUDE_FNC')
+        if exclude_fnc and exclude_fnc(path):
+            return True
+        for fnc in self._exclude_functions:
+            if fnc(path):
                 return True
-            for fnc in self._exclude_functions:
-                if fnc(path):
-                    return True
         return False
 
     def clear(self):
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 810aced..fc6ca4f 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -48,8 +48,9 @@ def create_directory(path):
         return NotFound()
 
     if request.method == 'POST':
-        utils.mkdir(directory.path, request.form['name'])
-        return redirect(url_for('browse', path=directory.urlpath))
+        path = utils.mkdir(directory.path, request.form['name'])
+        base = current_app.config['DIRECTORY_BASE']
+        return redirect(url_for('browse', path=abspath_to_urlpath(path, base)))
 
     return render_template(
         'create_directory.file_actions.html',
@@ -196,10 +197,11 @@ def detect_selection(directory):
             current_app.config.get('DIRECTORY_UPLOAD')
 
 
-def excluded_clipboard(manager, path):
+def excluded_clipboard(app, path):
+    # TODO: get this working outside requests (for tarfile streaming)
     if not getattr(g, 'file_actions_paste', False) and \
        session.get('clipboard:mode') == 'cut':
-        base = manager.app.config['DIRECTORY_BASE']
+        base = app.config['DIRECTORY_BASE']
         clipboard = session.get('clipboard:items', ())
         return abspath_to_urlpath(path, base) in clipboard
     return False
@@ -213,7 +215,7 @@ def register_plugin(manager):
     :type manager: browsepy.manager.PluginManager
     '''
     manager.register_exclude_function(
-        functools.partial(excluded_clipboard, manager)
+        functools.partial(excluded_clipboard, manager.app)
         )
     manager.register_blueprint(actions)
     manager.register_widget(
diff --git a/browsepy/plugin/file_actions/utils.py b/browsepy/plugin/file_actions/utils.py
index f7d91c1..694af61 100644
--- a/browsepy/plugin/file_actions/utils.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -82,6 +82,8 @@ def mkdir(path, name):
         raise InvalidDirnameError(path=path, name=name)
 
     try:
-        os.mkdir(os.path.join(path, name))
+        path = os.path.join(path, name)
+        os.mkdir(path)
+        return path
     except BaseException as e:
         raise DirectoryCreationError.from_exception(e, path=path, name=name)
diff --git a/browsepy/templates/remove.html b/browsepy/templates/remove.html
index ee81315..8f953e5 100644
--- a/browsepy/templates/remove.html
+++ b/browsepy/templates/remove.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block content %}
-  <p>Do you really want to remove this file?</p>
+  <p>Do you really want to remove this {% if file.is_directory %}directory{% else %}file{% endif %}?</p>
   <form method="post" class="group">
     <a class="long button text" href="{{ url_for('browse', path=file.parent.urlpath) }}" title="Go back">Cancel</a>
     <input class="long button destructive text" type="submit" value="Yes" />
-- 
GitLab


From 5ff6003d7a950c8374ae71a4e7fc86efe43e1fa7 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 2 Jul 2019 18:37:03 +0100
Subject: [PATCH 072/171] simplify stream logic via custom queue implementation

---
 .vscode/settings.json |  11 ++-
 README.rst            |   2 +-
 browsepy/stream.py    | 162 ++++++++++++++++++++++--------------------
 3 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1f7909a..6b2ba5b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,5 +14,14 @@
     "python.linting.pep8Path": "pycodestyle",
     "python.linting.pylintEnabled": false,
     "python.jediEnabled": true,
-    "python.pythonPath": "env/bin/python"
+    "python.pythonPath": "env/bin/python",
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./browsepy/tests",
+        "-p",
+        "test_*.py"
+    ],
+    "python.testing.pytestEnabled": false,
+    "python.testing.nosetestsEnabled": false
 }
diff --git a/README.rst b/README.rst
index b6b2330..734c610 100644
--- a/README.rst
+++ b/README.rst
@@ -105,7 +105,7 @@ It's on `pypi` so...
    pip install browsepy
 
 
-You can get the development version from our `github repository`.
+You can get the same version from our `github repository`.
 
 .. _github repository: https://github.com/ergoithz/browsepy
 
diff --git a/browsepy/stream.py b/browsepy/stream.py
index c42214e..024b5b0 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -11,36 +11,56 @@ import flask
 from . import compat
 
 
-class BlockingPipeAbort(RuntimeError):
+class ByteQueue(compat.Queue):
     '''
-    Exception used internally by :class:`BlockingPipe`'s default
-    implementation.
+    Small synchronized queue backed with bytearray, with an additional
+    finish method with turns the queue into non-blocking.
+
+    Once bytequeue became finished, all :method:`get` calls return empty bytes,
+    and :method:`put` calls raise an exception.
     '''
-    pass
+    def _init(self, maxsize):
+        self.queue = bytearray()
+        self.finished = False
+
+    def _qsize(self):
+        return -1 if self.finished and not self.queue else len(self.queue)
+
+    def _put(self, item):
+        if self.finished:
+            raise RuntimeError('PUT operation on finished byte queue')
+        self.queue.extend(item)
+
+    def _get(self):
+        num = self.maxsize
+        data, self.queue = bytes(self.queue[:num]), bytearray(self.queue[num:])
+        return data
+
+    def finish(self):
+        if not self.finished:
+            with self.not_full:
+                self.not_full.notify_all()
+
+            with self.not_empty:
+                self.not_empty.notify_all()
+
+            self.finished = True
 
 
 class BlockingPipe(object):
     '''
-    Minimal pipe class with `write`, `retrieve` and `close` blocking methods.
-
-    This class implementation assumes that :attr:`pipe_class` (set as
-    class:`queue.Queue` in current implementation) instances has both `put`
-    and `get blocking methods.
+    Minimal pipe class with `write` and `read` blocking methods.
 
     Due its blocking implementation, this class uses :module:`threading`.
 
     This class exposes :method:`write` for :class:`tarfile.TarFile`
     `fileobj` compatibility.
-    '''''
-    lock_class = threading.Lock
-    pipe_class = functools.partial(compat.Queue, maxsize=1)
-    abort_exception = BlockingPipeAbort
-
-    def __init__(self):
-        self._pipe = self.pipe_class()
-        self._wlock = self.lock_class()
-        self._rlock = self.lock_class()
-        self.closed = False
+    '''
+    pipe_class = ByteQueue
+
+    def __init__(self, buffsize=None):
+        self._pipe = self.pipe_class(buffsize)
+        self._raises = None
 
     def write(self, data):
         '''
@@ -53,14 +73,14 @@ class BlockingPipe(object):
         :rtype: int
         :raises WriteAbort: if already closed or closed while blocking
         '''
+        if self._raises:
+            raise self._raises
+
+        self._pipe.put(data, timeout=1)
 
-        with self._wlock:
-            if self.closed:
-                raise self.abort_exception()
-            self._pipe.put(data)
-            return len(data)
+        return len(data)
 
-    def retrieve(self):
+    def read(self):
         '''
         Get chunk of data from pipe.
         This method blocks if pipe is empty.
@@ -69,49 +89,34 @@ class BlockingPipe(object):
         :rtype: bytes
         :raises WriteAbort: if already closed or closed while blocking
         '''
+        if self._raises:
+            raise self._raises
+        return self._pipe.get()
 
-        with self._rlock:
-            if self.closed and self._pipe.empty():
-                raise self.abort_exception()
-            data = self._pipe.get()
-            if data is None:
-                raise self.abort_exception()
-            return data
-
-    def __del__(self):
+    def finish(self):
         '''
-        Call :method:`BlockingPipe.close`.
+        Notify queue that we're finished, so it became non-blocking returning
+        empty bytes.
         '''
-        self.close()
+        self._pipe.finish()
 
-    def close(self):
+    def abort(self, exception):
         '''
-        Closes, so any blocked and future writes or retrieves will raise
-        :attr:`abort_exception` instances.
-        '''
-
-        def blocked():
-            '''
-            NOOP lock release function for non-owned locks.
-            '''
-            pass
+        Make further writes to raise an exception.
 
-        if not self.closed:
-            self.closed = True
-
-            releasing = writing, reading = [
-                lock.release if lock.acquire(False) else blocked
-                for lock in (self._wlock, self._rlock)
-                ]
-
-            if writing is blocked and reading is not blocked:
-                self._pipe.get()
+        :param exception: exception to raise on write
+        :type exception: Exception
+        '''
+        self._raises = exception
+        self.finish()
 
-            if reading is blocked and writing is not blocked:
-                self._pipe.put(None)
 
-            for release in releasing:
-                release()
+class StreamError(RuntimeError):
+    '''
+    Exception used internally by :class:`TarFileStream`'s default
+    implementation to stop tarfile compression.
+    '''
+    pass
 
 
 class TarFileStream(compat.Iterator):
@@ -129,7 +134,7 @@ class TarFileStream(compat.Iterator):
     '''
 
     pipe_class = BlockingPipe
-    abort_exception = BlockingPipe.abort_exception
+    abort_exception = StreamError
     thread_class = threading.Thread
     tarfile_class = tarfile.open
 
@@ -171,6 +176,7 @@ class TarFileStream(compat.Iterator):
         '''
         self.path = path
         self.exclude = exclude
+        self.closed = False
 
         self._started = False
         self._buffsize = buffsize
@@ -178,7 +184,7 @@ class TarFileStream(compat.Iterator):
         self._compress = compress if compress and buffsize > 15 else None
         self._mode, self._extension = self.compresion_modes[self._compress]
 
-        self._pipe = self.pipe_class()
+        self._pipe = self.pipe_class(buffsize)
         self._th = self.thread_class(target=self._fill)
 
     def _fill(self):
@@ -201,17 +207,17 @@ class TarFileStream(compat.Iterator):
         tarfile = self.tarfile_class(
             fileobj=self._pipe,
             mode='w|{}'.format(self._mode),
-            bufsize=self._buffsize
+            bufsize=self._buffsize,
+            encoding='utf-8',
             )
-
         try:
-            tarfile.add(self.path, "", filter=infofilter if exclude else None)
+            tarfile.add(self.path, '', filter=infofilter if exclude else None)
             tarfile.close()  # force stream flush (may raise)
-        except self.abort_exception:
-            # expected exception when pipe is closed prematurely
+            self._pipe.finish()
+        except self.abort_exception:  # probably closed prematurely
             tarfile.close()  # free fd
-        finally:
-            self.close()
+        except Exception as e:
+            self._pipe.abort(e)
 
     def __next__(self):
         '''
@@ -226,22 +232,20 @@ class TarFileStream(compat.Iterator):
             self._started = True
             self._th.start()
 
-        try:
-            return self._pipe.retrieve()
-        except self.abort_exception:
+        data = self._pipe.read()
+        if not data:
             raise StopIteration()
+        return data
 
     def close(self):
         '''
         Closes tarfile pipe and stops further processing.
         '''
-        self._pipe.close()
-
-    def __del__(self):
-        '''
-        Call :method:`TarFileStream.close`.
-        '''
-        self.close()
+        if not self.closed:
+            self.closed = True
+            if self._started:
+                self._pipe.abort(self.abort_exception())
+                self._th.join()
 
 
 def stream_template(template_name, **context):
-- 
GitLab


From 4fa96f3e7ad6bf8dad7f3bb8f0d507662d772a35 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 2 Jul 2019 22:27:33 +0100
Subject: [PATCH 073/171] simplify tarfile stream implementation

---
 browsepy/stream.py | 160 ++++++++++++++++++++-------------------------
 1 file changed, 70 insertions(+), 90 deletions(-)

diff --git a/browsepy/stream.py b/browsepy/stream.py
index 024b5b0..1eb8749 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -4,7 +4,6 @@ import os
 import os.path
 import tarfile
 import threading
-import functools
 
 import flask
 
@@ -13,105 +12,55 @@ from . import compat
 
 class ByteQueue(compat.Queue):
     '''
-    Small synchronized queue backed with bytearray, with an additional
-    finish method with turns the queue into non-blocking.
+    Small synchronized queue storing bytes, with an additional finish method
+    with turns the queue :method:`get` into non-blocking (returns empty bytes).
 
-    Once bytequeue became finished, all :method:`get` calls return empty bytes,
-    and :method:`put` calls raise an exception.
+    On a finished queue all :method:`put` will raise Full exceptions,
+    regardless of the parameters given.
     '''
     def _init(self, maxsize):
-        self.queue = bytearray()
+        self.queue = []
+        self.bytes = 0
         self.finished = False
+        self.closed = False
 
     def _qsize(self):
-        return -1 if self.finished and not self.queue else len(self.queue)
+        return -1 if self.finished else self.bytes
 
     def _put(self, item):
         if self.finished:
-            raise RuntimeError('PUT operation on finished byte queue')
-        self.queue.extend(item)
+            raise compat.Full
+        self.queue.append(item)
+        self.bytes += len(item)
 
     def _get(self):
-        num = self.maxsize
-        data, self.queue = bytes(self.queue[:num]), bytearray(self.queue[num:])
+        size = self.maxsize
+        data = b''.join(self.queue)
+        data, tail = data[:size], data[size:]
+        self.queue[:] = (tail,)
+        self.bytes = len(tail)
         return data
 
-    def finish(self):
-        if not self.finished:
-            with self.not_full:
-                self.not_full.notify_all()
-
-            with self.not_empty:
-                self.not_empty.notify_all()
-
-            self.finished = True
-
-
-class BlockingPipe(object):
-    '''
-    Minimal pipe class with `write` and `read` blocking methods.
-
-    Due its blocking implementation, this class uses :module:`threading`.
-
-    This class exposes :method:`write` for :class:`tarfile.TarFile`
-    `fileobj` compatibility.
-    '''
-    pipe_class = ByteQueue
-
-    def __init__(self, buffsize=None):
-        self._pipe = self.pipe_class(buffsize)
-        self._raises = None
-
-    def write(self, data):
+    def qsize(self):
         '''
-        Put chunk of data onto pipe.
-        This method blocks if pipe is already full.
-
-        :param data: bytes to write to pipe
-        :type data: bytes
-        :returns: number of bytes written
-        :rtype: int
-        :raises WriteAbort: if already closed or closed while blocking
+        Return the number of bytes in the queue.
         '''
-        if self._raises:
-            raise self._raises
-
-        self._pipe.put(data, timeout=1)
-
-        return len(data)
-
-    def read(self):
-        '''
-        Get chunk of data from pipe.
-        This method blocks if pipe is empty.
-
-        :returns: data chunk
-        :rtype: bytes
-        :raises WriteAbort: if already closed or closed while blocking
-        '''
-        if self._raises:
-            raise self._raises
-        return self._pipe.get()
+        with self.mutex:
+            return self.bytes
 
     def finish(self):
         '''
-        Notify queue that we're finished, so it became non-blocking returning
-        empty bytes.
+        Turn queue into finished mode: :method:`get` becomes non-blocking
+        and returning empty bytes if empty, and :method:`put` raising
+        :class:`queue.Full` exceptions unconditionally.
         '''
-        self._pipe.finish()
+        self.finished = True
 
-    def abort(self, exception):
-        '''
-        Make further writes to raise an exception.
-
-        :param exception: exception to raise on write
-        :type exception: Exception
-        '''
-        self._raises = exception
-        self.finish()
+        with self.not_full:
+            self.not_empty.notify()
 
 
-class StreamError(RuntimeError):
+class WriteAbort(Exception):
     '''
     Exception used internally by :class:`TarFileStream`'s default
     implementation to stop tarfile compression.
@@ -133,8 +82,8 @@ class TarFileStream(compat.Iterator):
     This class uses :module:`threading` for offloading.
     '''
 
-    pipe_class = BlockingPipe
-    abort_exception = StreamError
+    queue_class = ByteQueue
+    abort_exception = WriteAbort
     thread_class = threading.Thread
     tarfile_class = tarfile.open
 
@@ -184,8 +133,9 @@ class TarFileStream(compat.Iterator):
         self._compress = compress if compress and buffsize > 15 else None
         self._mode, self._extension = self.compresion_modes[self._compress]
 
-        self._pipe = self.pipe_class(buffsize)
+        self._queue = self.queue_class(buffsize)
         self._th = self.thread_class(target=self._fill)
+        self._th_exc = None
 
     def _fill(self):
         '''
@@ -205,19 +155,20 @@ class TarFileStream(compat.Iterator):
             return None if exclude(path_join(path, info.name)) else info
 
         tarfile = self.tarfile_class(
-            fileobj=self._pipe,
+            fileobj=self,
             mode='w|{}'.format(self._mode),
             bufsize=self._buffsize,
             encoding='utf-8',
             )
         try:
             tarfile.add(self.path, '', filter=infofilter if exclude else None)
-            tarfile.close()  # force stream flush (may raise)
-            self._pipe.finish()
-        except self.abort_exception:  # probably closed prematurely
-            tarfile.close()  # free fd
+            tarfile.close()
+        except self.abort_exception:
+            tarfile.close()
         except Exception as e:
-            self._pipe.abort(e)
+            self._th_exc = e
+        finally:
+            self._queue.finish()
 
     def __next__(self):
         '''
@@ -228,24 +179,53 @@ class TarFileStream(compat.Iterator):
         :returns: tarfile data as bytes
         :rtype: bytes
         '''
+        if self.closed:
+            raise StopIteration()
+
         if not self._started:
             self._started = True
             self._th.start()
 
-        data = self._pipe.read()
+        data = self._queue.get()
         if not data:
             raise StopIteration()
+
         return data
 
+    def write(self, data):
+        '''
+        Put chunk of data into data queue, used on the tarfile thread.
+
+        This method blocks when pipe is already, applying backpressure to
+        writers.
+
+        :param data: bytes to write to pipe
+        :type data: bytes
+        :returns: number of bytes written
+        :rtype: int
+        :raises WriteAbort: if already closed or closed while blocking
+        '''
+        if self.closed:
+            raise self.abort_exception()
+
+        try:
+            self._queue.put(data)
+        except compat.Full:
+            raise self.abort_exception()
+
+        return len(data)
+
     def close(self):
         '''
         Closes tarfile pipe and stops further processing.
         '''
         if not self.closed:
             self.closed = True
-            if self._started:
-                self._pipe.abort(self.abort_exception())
+            self._queue.finish()
+            if self._started and self._th.is_alive():
                 self._th.join()
+            if self._th_exc:
+                raise self._th_exc
 
 
 def stream_template(template_name, **context):
-- 
GitLab


From 6c0392f747d9a82a1ab17febe660dd3152f228ff Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 2 Jul 2019 22:39:34 +0100
Subject: [PATCH 074/171] pass config to directory stream

---
 browsepy/__init__.py | 2 ++
 browsepy/file.py     | 4 +++-
 browsepy/stream.py   | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 5dcf37c..2f8a6f7 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -38,6 +38,8 @@ app.config.update(
     DIRECTORY_REMOVE=None,
     DIRECTORY_UPLOAD=None,
     DIRECTORY_TAR_BUFFSIZE=262144,
+    DIRECTORY_TAR_COMPRESSION='gzip',
+    DIRECTORY_TAR_COMPRESSLEVEL=1,
     DIRECTORY_DOWNLOADABLE=True,
     USE_BINARY_MULTIPLES=True,
     PLUGIN_MODULES=[],
diff --git a/browsepy/file.py b/browsepy/file.py
index d020226..b465500 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -669,7 +669,9 @@ class Directory(Node):
             functools.partial(
                 self.plugin_manager.check_excluded,
                 request=utils.solve_local(flask.request),
-                )
+                ),
+            self.app.config.get('DIRECTORY_TAR_COMPRESS', 'gzip'),
+            self.app.config.get('DIRECTORY_TAR_COMPRESSLEVEL', 1),
             )
         return self.app.response_class(
             flask.stream_with_context(stream),
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 1eb8749..c2c64ab 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -109,7 +109,8 @@ class TarFileStream(compat.Iterator):
         '''
         return self._compress
 
-    def __init__(self, path, buffsize=10240, exclude=None, compress='gzip'):
+    def __init__(self, path, buffsize=10240, exclude=None, compress='gzip',
+                 compresslevel=1):
         '''
         Initialize thread and class (thread is not started until interated.)
         Note that compress parameter will be ignored if buffsize is below 16.
@@ -122,6 +123,8 @@ class TarFileStream(compat.Iterator):
         :type exclude: callable
         :param compress: compression method ('gz', 'bz2', 'xz' or None)
         :type compress: str or None
+        :param compresslevel: compression level [1-9] defaults to 1 (fastest)
+        :type compresslevel: int
         '''
         self.path = path
         self.exclude = exclude
-- 
GitLab


From b6bd7caf86911680754c87fac6caa70b1b8cce7e Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 3 Jul 2019 17:26:23 +0100
Subject: [PATCH 075/171] better handling of request on tarfile stream

---
 browsepy/__init__.py          |  5 ++--
 browsepy/file.py              |  5 ++--
 browsepy/manager.py           |  6 +++--
 browsepy/stream.py            | 46 +++++++++++++++++++++++------------
 browsepy/tests/test_stream.py | 28 ++++++++++++++++++++-
 5 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 2f8a6f7..c469bb5 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -145,9 +145,8 @@ def sort(property, path):
     if not directory.is_directory or directory.is_excluded:
         return NotFound()
 
-    if request:
-        session['browse:sort'] = \
-            [(path, property)] + session.get('browse:sort', [])
+    session['browse:sort'] = \
+        [(path, property)] + session.get('browse:sort', [])
     return redirect(url_for(".browse", path=directory.urlpath))
 
 
diff --git a/browsepy/file.py b/browsepy/file.py
index b465500..563b49c 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -666,9 +666,8 @@ class Directory(Node):
         stream = self.stream_class(
             self.path,
             self.app.config.get('DIRECTORY_TAR_BUFFSIZE', 10240),
-            functools.partial(
-                self.plugin_manager.check_excluded,
-                request=utils.solve_local(flask.request),
+            flask.copy_current_request_context(
+                self.plugin_manager.check_excluded
                 ),
             self.app.config.get('DIRECTORY_TAR_COMPRESS', 'gzip'),
             self.app.config.get('DIRECTORY_TAR_COMPRESSLEVEL', 1),
diff --git a/browsepy/manager.py b/browsepy/manager.py
index f35de48..d42bcf3 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -268,12 +268,14 @@ class ExcludePluginManager(PluginManagerBase):
         '''
         self._exclude_functions.add(exclude_fnc)
 
-    def check_excluded(self, path, request=flask.request):
+    def check_excluded(self, path):
         '''
         Check if given path is excluded.
 
+        :param path: absolute path to check against config and plugins
         :type path: str
-        :type request: flask.Request
+        :return: wether if path should be excluded or not
+        :rtype: bool
         '''
         exclude_fnc = self.app.config.get('EXCLUDE_FNC')
         if exclude_fnc and exclude_fnc(path):
diff --git a/browsepy/stream.py b/browsepy/stream.py
index c2c64ab..86af22a 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -140,6 +140,28 @@ class TarFileStream(compat.Iterator):
         self._th = self.thread_class(target=self._fill)
         self._th_exc = None
 
+    @property
+    def _infofilter(self):
+        '''
+        TarInfo filtering function based on :attr:`exclude`.
+        '''
+        path = self.path
+        path_join = os.path.join
+        exclude = self.exclude
+
+        def infofilter(info):
+            '''
+            Filter TarInfo objects for TarFile.
+
+            :param info:
+            :type info: tarfile.TarInfo
+            :return: infofile or None if file must be excluded
+            :rtype: tarfile.TarInfo or None
+            '''
+            return None if exclude(path_join(path, info.name)) else info
+
+        return infofilter if exclude else None
+
     def _fill(self):
         '''
         Writes data on internal tarfile instance, which writes to current
@@ -150,24 +172,16 @@ class TarFileStream(compat.Iterator):
         This method is called automatically, on a thread, on initialization,
         so there is little need to call it manually.
         '''
-        exclude = self.exclude
-        path_join = os.path.join
-        path = self.path
-
-        def infofilter(info):
-            return None if exclude(path_join(path, info.name)) else info
-
-        tarfile = self.tarfile_class(
-            fileobj=self,
-            mode='w|{}'.format(self._mode),
-            bufsize=self._buffsize,
-            encoding='utf-8',
-            )
         try:
-            tarfile.add(self.path, '', filter=infofilter if exclude else None)
-            tarfile.close()
+            with self.tarfile_class(
+              fileobj=self,
+              mode='w|{}'.format(self._mode),
+              bufsize=self._buffsize,
+              encoding='utf-8',
+              ) as tarfile:
+                tarfile.add(self.path, '', filter=self._infofilter)
         except self.abort_exception:
-            tarfile.close()
+            pass
         except Exception as e:
             self._th_exc = e
         finally:
diff --git a/browsepy/tests/test_stream.py b/browsepy/tests/test_stream.py
index cbc5f39..3935b00 100644
--- a/browsepy/tests/test_stream.py
+++ b/browsepy/tests/test_stream.py
@@ -5,6 +5,7 @@ import codecs
 import unittest
 import tempfile
 import shutil
+import time
 
 import browsepy.stream
 
@@ -27,12 +28,37 @@ class StreamTest(unittest.TestCase):
         self.randfile()
         self.randfile()
         stream = self.module.TarFileStream(self.base, buffsize=5)
-        self.assertTrue(next(stream))
+
+        self.assertFalse(stream._queue.qsize())  # not yet compressing
+        self.assertEqual(len(next(stream)), 5)
+
+        while not stream._queue.qsize():
+            time.sleep(0.1)
+
+        self.assertGreater(stream._queue.qsize(), 4)
+        self.assertLess(stream._queue.qsize(), 10)
 
         with self.assertRaises(StopIteration):
             while True:
                 next(stream)
 
+    def test_exception(self):
+        class MyException(Exception):
+            pass
+
+        class BrokenQueue(self.module.ByteQueue):
+            def put(self, data):
+                raise MyException()
+
+        stream = self.module.TarFileStream(self.base, buffsize=5)
+        stream._queue = BrokenQueue()
+
+        with self.assertRaises(StopIteration):
+            next(stream)
+
+        with self.assertRaises(MyException):
+            stream.close()
+
     def test_close(self):
         self.randfile()
         stream = self.module.TarFileStream(self.base, buffsize=16)
-- 
GitLab


From dce6bd48ac4e9c1708f558a35331abad0574d551 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 3 Jul 2019 19:05:39 +0100
Subject: [PATCH 076/171] doc updates

---
 browsepy/stream.py | 10 ++++++++--
 doc/conf.py        | 18 ++++++++++++------
 doc/stream.rst     | 14 +++++++++++---
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/browsepy/stream.py b/browsepy/stream.py
index 86af22a..a5a79b3 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -79,7 +79,12 @@ class TarFileStream(compat.Iterator):
     Buffsize can be provided, it should be 512 multiple (the tar block size)
     for and will be used as tarfile block size.
 
-    This class uses :module:`threading` for offloading.
+    This class uses :module:`threading` for offloading, so if your exclude
+    function would not have access to any thread-local specific data.
+
+    If your exclude function requires accessing to :data:`flask.app`,
+    :data:`flask.g`, :data:`flask.request` or any other flask contexts,
+    ensure is wrapped with :func:`flask.copy_current_request_context`
     '''
 
     queue_class = ByteQueue
@@ -112,7 +117,8 @@ class TarFileStream(compat.Iterator):
     def __init__(self, path, buffsize=10240, exclude=None, compress='gzip',
                  compresslevel=1):
         '''
-        Initialize thread and class (thread is not started until interated.)
+        Initialize thread and class (thread is not started until interation).
+
         Note that compress parameter will be ignored if buffsize is below 16.
 
         :param path: local path of directory whose content will be compressed.
diff --git a/doc/conf.py b/doc/conf.py
index 6835895..e565472 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -18,10 +18,16 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+import io
+import re
 import sys
 import time
+
 sys.path.insert(0, os.path.abspath('..'))  # noqa
-import browsepy.__meta__ as meta
+
+with io.open('../browsepy/__init__.py', 'rt', encoding='utf8') as f:
+    app_version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
+    assert isinstance(app_version, str)
 
 # -- General configuration ------------------------------------------------
 
@@ -59,18 +65,18 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = meta.app
-copyright = '%d, %s' % (time.gmtime()[0], meta.author_name)
-author = meta.author_name
+project = 'browsepy'
+copyright = '2019, Felipe A. Hernandez'
+author = 'Felipe A. Hernandez'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '{0}.{0}'.format(*meta.version.split('.'))
+version = '{0}.{0}'.format(*app_version.split('.'))
 # The full version, including alpha/beta/rc tags.
-release = meta.version
+release = app_version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/stream.rst b/doc/stream.rst
index 29c38e0..13c40e0 100644
--- a/doc/stream.rst
+++ b/doc/stream.rst
@@ -5,13 +5,16 @@ Stream Module
 
 .. currentmodule:: browsepy.stream
 
-This module provides a class for streaming directory tarballs. This is used
-by :meth:`browsepy.file.Directory.download` method.
+This module provides a utilities for streaming responses.
 
 .. _tarfilestream-node:
 
 TarFileStream
-----
+-------------
+
+Iterator class for streaming directory tarballs.
+
+This is currently used by :meth:`browsepy.file.Directory.download` method.
 
 .. currentmodule:: browsepy.stream
 
@@ -19,3 +22,8 @@ TarFileStream
   :members:
   :inherited-members:
   :undoc-members:
+
+Utility functions
+-----------------
+
+.. autofunction:: stream_template
-- 
GitLab


From 9e4a2b3ca941b4d22c6e9080d7012baa2b5220be Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 4 Jul 2019 22:26:35 +0100
Subject: [PATCH 077/171] fix docstrings, more documentation

---
 CHANGELOG                                  |  44 ++++
 README.rst                                 | 108 ++++------
 browsepy/__init__.py                       |   8 +-
 browsepy/appconfig.py                      |  16 +-
 browsepy/compat.py                         |  71 +++----
 browsepy/exceptions.py                     |  24 +--
 browsepy/file.py                           | 224 ++++++++++-----------
 browsepy/http.py                           |  12 +-
 browsepy/manager.py                        | 173 ++++++++--------
 browsepy/plugin/file_actions/__init__.py   |  27 ++-
 browsepy/plugin/file_actions/exceptions.py |  36 ++--
 browsepy/plugin/file_actions/utils.py      |   4 +-
 browsepy/plugin/player/__init__.py         |   8 +-
 browsepy/plugin/player/playable.py         |   4 +-
 browsepy/stream.py                         |  60 +++---
 browsepy/tests/deprecated/plugin/player.py |   4 +-
 browsepy/tests/meta.py                     |   4 +-
 browsepy/tests/test_code_quality.py        |   5 +-
 browsepy/tests/test_main.py                |  42 ++--
 browsepy/transform/__init__.py             |  28 +--
 browsepy/utils.py                          |  32 +--
 browsepy/widget.py                         |   4 +-
 doc/plugins.rst                            |  57 +++++-
 doc/quickstart.rst                         |  39 ++--
 24 files changed, 555 insertions(+), 479 deletions(-)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..e38dc75
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,44 @@
+## [0.6.0] - Upcoming
+### Added
+- Plugin discovery.
+- New plugin `file-actions for copy/cut/paste and directory creation.
+- Smart cookie sessions.
+
+### Changes
+- Faster directory tarball streaming with more options.
+
+### Removed
+- Python 3.3 and 3.4 support have been dropped.
+
+## [0.5.6] - 2017-09-09
+### Added
+- Handle filesystem path size limits.
+
+### Changes
+- Player plugin honoring directory ordering.
+- Windows fixes
+
+## [0.5.3] - 2017-05-12
+### Added
+- New "exclude" option (--exclude and --exclude-from), accepting UNIX globs.
+- Windows support.
+
+### Changed
+- Fixes #12 (Windows compatibility)
+
+## [0.5.0] - 2016-11-24
+### Added
+- Protocol for plugin command line argument handling.
+- Player plugin playlist support (m3u, pls) and directory).
+- Customizable browser file sorting.
+- Multiple-file uploads.
+
+### Changed
+- New plugin and widget API, old one have been deprecated.
+- Use of optimized scandir (faster directory listing).
+- Browsepy HTML responses are now minified.
+- Browsepy command script.
+
+## [0.3.8] - 2015-11-05
+### Added
+- First useable release.
diff --git a/README.rst b/README.rst
index 734c610..8a2ef3f 100644
--- a/README.rst
+++ b/README.rst
@@ -38,7 +38,21 @@ Head to http://ergoithz.github.io/browsepy/ for an online version of current
 *master* documentation,
 
 You can also build yourself from sphinx sources using the documentation
-`Makefile` located at `docs` directory.
+`Makefile` located under `docs` directory.
+
+License
+-------
+
+MIT. See `LICENSE`_.
+
+.. _LICENSE: https://raw.githubusercontent.com/ergoithz/browsepy/master/LICENSE
+
+Changelog
+---------
+
+See `CHANGELOG`_.
+
+.. _CHANGELOG: https://raw.githubusercontent.com/ergoithz/browsepy/master/CHANGELOG
 
 Screenshots
 -----------
@@ -54,40 +68,9 @@ Features
 * **Downloadable directories**, streaming directory tarballs on the fly.
 * **Optional remove** for files under given path.
 * **Optional upload** for directories under given path.
-* **Player** audio player plugin is provided (without transcoding).
-
-New in 0.6
-----------
-
-* Drop Python 3.3.
-* Plugin discovery.
-* Plugin file-actions providing copy/cut/paste and directory creation.
-* Smarter cookie sessions with session shrinking mechanisms available
-  for plugin implementors.
-
-New in 0.5
-----------
-
-* File and plugin APIs have been fully reworked making them more complete and
-  extensible, so they can be considered stable now. As a side-effect backward
-  compatibility on some edge cases could be broken (please fill an issue if
-  your code is affected).
-
-  * Old widget API have been deprecated and warnings will be shown if used.
-  * Widget registration in a single call (passing a widget instances is still
-    available though), no more action-widget duality.
-  * Callable-based widget filtering (no longer limited to mimetypes).
-  * A raw HTML widget for maximum flexibility.
-
-* Plugins can register command-line arguments now.
-* Player plugin is now able to load `m3u` and `pls` playlists, and optionally
-  play everything on a directory (adding a command-line argument).
-* Browsing now takes full advantage of `scandir` (already in Python 3.5 and an
-  external dependency for older versions) providing faster directory listing.
-* Custom file ordering while browsing directories.
-* Easy multi-file uploads.
-* Jinja2 template output minification, saving those precious bytes.
-* Setup script now registers a proper `browsepy` command.
+* **Plugins**
+  * **player**, web audio player.
+  * **file-actions**, cut, copy paste and directory creation.
 
 Install
 -------
@@ -96,7 +79,7 @@ Install
 `pip` and `setuptools` libraries should be upgraded with
 `pip install --upgrade pip setuptools`.
 
-It's on `pypi` so...
+It's on `pypi`_ so...
 
 .. _pypi: https://pypi.python.org/pypi/browsepy/
 
@@ -105,7 +88,7 @@ It's on `pypi` so...
    pip install browsepy
 
 
-You can get the same version from our `github repository`.
+You can get the same version from our `github repository`_.
 
 .. _github repository: https://github.com/ergoithz/browsepy
 
@@ -148,11 +131,13 @@ Command-line arguments
 ----------------------
 
 This is what is printed when you run `browsepy --help`, keep in mind that
-plugins (loaded with `plugin` argument) could add extra arguments to this list.
+plugins (loaded with `plugin` argument) could add extra arguments to this list
+(you can see all them running `browsepy --help-all` instead).
 
 ::
 
-  usage: browsepy [-h] [--help-all] [--directory PATH] [--initial PATH] [--removable PATH] [--upload PATH] [--exclude PATTERN]
+  usage: browsepy [-h] [--help-all] [--directory PATH] [--initial PATH]
+                  [--removable PATH] [--upload PATH] [--exclude PATTERN]
                   [--exclude-from PATH] [--version] [--plugin MODULE]
                   [host] [port]
 
@@ -165,7 +150,7 @@ plugins (loaded with `plugin` argument) could add extra arguments to this list.
   optional arguments:
     -h, --help           show this help message and exit
     --help-all           show help for all available plugins and exit
-    --directory PATH     serving directory (default: ...)
+    --directory PATH     serving directory (default: /my/current/path)
     --initial PATH       default directory (default: same as --directory)
     --removable PATH     base directory allowing remove (default: None)
     --upload PATH        base directory allowing upload (default: None)
@@ -175,9 +160,8 @@ plugins (loaded with `plugin` argument) could add extra arguments to this list.
     --plugin MODULE      load plugin module (multiple)
 
   available plugins:
-    player, browsepy.plugin.player
     file-actions, browsepy.plugin.file_actions
-
+    player, browsepy.plugin.player
 
 Using as library
 ----------------
@@ -193,36 +177,16 @@ url, and mounting **browsepy.app** on the appropriate parent
 
 .. _WSGI: https://www.python.org/dev/peps/pep-0333/
 
-Browsepy app config (available at :attr:`browsepy.app.config`) uses the
-following configuration options.
-
-* **DIRECTORY_BASE**: anything under this directory will be served,
-  defaults to current path.
-* **DIRECTORY_START**: directory will be served when accessing root URL
-* **DIRECTORY_REMOVE**: file removing will be available under this path,
-  defaults to **None**.
-* **DIRECTORY_UPLOAD**: file upload will be available under this path,
-  defaults to **None**.
-* **DIRECTORY_TAR_BUFFSIZE**, directory tar streaming buffer size,
-  defaults to **262144** and must be multiple of 512.
-* **DIRECTORY_DOWNLOADABLE** whether enable directory download or not,
-  defaults to **True**.
-* **USE_BINARY_MULTIPLES** whether use binary units (bi-bytes, like KiB)
-  instead of common ones (bytes, like KB), defaults to **True**.
-* **PLUGIN_MODULES** list of module names (absolute or relative to
-  plugin_namespaces) will be loaded.
-* **PLUGIN_NAMESPACES** prefixes for module names listed at PLUGIN_MODULES
-  where relative PLUGIN_MODULES are searched.
-* **EXCLUDE_FNC** function will be used to exclude files from listing and
-  directory tarballs. Can be either None or function receiving an absolute
-  path and returning a boolean.
-
-After editing `PLUGIN_MODULES` value, plugin manager (available at module
-plugin_manager and app.extensions['plugin_manager']) should be reloaded using
-the `reload` method.
-
-The other way of loading a plugin programmatically is calling plugin manager's
-`load_plugin` method.
+Browsepy app config is available at `browsepy.app.config`.
+
+**Note**: After editing `PLUGIN_MODULES` value, plugin manager (available at
+module plugin_manager and app.extensions['plugin_manager']) should be reloaded
+using `plugin_manager.reload` method.
+
+Alternatively, plugins can be loaded programmatically by calling
+`plugin_manager.load_plugin` method.
+
+More information at http://ergoithz.github.io/browsepy/integrations.html
 
 Extend via plugin API
 ---------------------
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index c469bb5..9551097 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -69,12 +69,12 @@ def shrink_browse_sort(data, last):
 
 
 def get_cookie_browse_sorting(path, default):
-    '''
+    """
     Get sorting-cookie data for path of current request.
 
     :returns: sorting property
     :rtype: string
-    '''
+    """
     if request:
         for cpath, cprop in session.get('browse:sort', ()):
             if path == cpath:
@@ -83,7 +83,7 @@ def get_cookie_browse_sorting(path, default):
 
 
 def browse_sortkey_reverse(prop):
-    '''
+    """
     Get sorting function for directory listing based on given attribute
     name, with some caveats:
     * Directories will be first.
@@ -94,7 +94,7 @@ def browse_sortkey_reverse(prop):
     :type prop: str
     :returns: tuple with sorting function and reverse bool
     :rtype: tuple of a dict and a bool
-    '''
+    """
     if prop.startswith('-'):
         prop = prop[1:]
         reverse = True
diff --git a/browsepy/appconfig.py b/browsepy/appconfig.py
index 3c752fc..edacd92 100644
--- a/browsepy/appconfig.py
+++ b/browsepy/appconfig.py
@@ -9,11 +9,11 @@ from .compat import basestring
 
 
 class Config(flask.config.Config):
-    '''
+    """
     Flask-compatible case-insensitive Config class.
 
     See :type:`flask.config.Config` for more info.
-    '''
+    """
     def __init__(self, root, defaults=None):
         self._warned = set()
         if defaults:
@@ -21,14 +21,14 @@ class Config(flask.config.Config):
         super(Config, self).__init__(root, defaults)
 
     def genkey(self, k):
-        '''
+        """
         Key translation function.
 
         :param k: key
         :type k: str
         :returns: uppercase key
         ;rtype: str
-        '''
+        """
         if isinstance(k, basestring):
             if k not in self._warned and k != k.upper():
                 self._warned.add(k)
@@ -42,14 +42,14 @@ class Config(flask.config.Config):
         return k
 
     def gendict(self, *args, **kwargs):
-        '''
+        """
         Pre-translated key dictionary constructor.
 
         See :type:`dict` for more info.
 
         :returns: dictionary with uppercase keys
         :rtype: dict
-        '''
+        """
         gk = self.genkey
         return dict((gk(k), v) for k, v in dict(*args, **kwargs).items())
 
@@ -73,9 +73,9 @@ class Config(flask.config.Config):
 
 
 class Flask(flask.Flask):
-    '''
+    """
     Flask class using case-insensitive :type:`Config` class.
 
     See :type:`flask.Flask` for more info.
-    '''
+    """
     config_class = Config
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 109e83b..1021281 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -71,12 +71,12 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
 
 @contextlib.contextmanager
 def scandir(path):
-    '''
+    """
     Backwards-compatible :func:`scandir.scandir` context manager
 
     :param path: path to iterate
     :type path: str
-    '''
+    """
     files = _scandir(path)
     try:
         yield files
@@ -87,12 +87,12 @@ def scandir(path):
 
 @contextlib.contextmanager
 def mkdtemp(suffix='', prefix='', dir=None):
-    '''
+    """
     Backwards-compatible :class:`tmpfile.TemporaryDirectory` context manager.
 
     :param path: path to iterate
     :type path: str
-    '''
+    """
     path = tempfile.mkdtemp(suffix, prefix, dir)
     try:
         yield path
@@ -101,19 +101,19 @@ def mkdtemp(suffix='', prefix='', dir=None):
 
 
 def isexec(path):
-    '''
+    """
     Check if given path points to an executable file.
 
     :param path: file path
     :type path: str
     :return: True if executable, False otherwise
     :rtype: bool
-    '''
+    """
     return os.path.isfile(path) and os.access(path, os.X_OK)
 
 
 def fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
-    '''
+    """
     Decode given path.
 
     :param path: path will be decoded if using bytes
@@ -124,7 +124,7 @@ def fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
     :type fs_encoding: str
     :return: decoded path
     :rtype: str
-    '''
+    """
     if not isinstance(path, bytes):
         return path
     if not errors:
@@ -134,7 +134,7 @@ def fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
 
 
 def fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
-    '''
+    """
     Encode given path.
 
     :param path: path will be encoded if not using bytes
@@ -145,7 +145,7 @@ def fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
     :type fs_encoding: str
     :return: encoded path
     :rtype: bytes
-    '''
+    """
     if isinstance(path, bytes):
         return path
     if not errors:
@@ -155,7 +155,7 @@ def fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
 
 
 def getcwd(fs_encoding=FS_ENCODING, cwd_fnc=os.getcwd):
-    '''
+    """
     Get current work directory's absolute path.
     Like os.getcwd but garanteed to return an unicode-str object.
 
@@ -165,13 +165,13 @@ def getcwd(fs_encoding=FS_ENCODING, cwd_fnc=os.getcwd):
     :type cwd_fnc: Callable
     :return: path
     :rtype: str
-    '''
+    """
     path = fsdecode(cwd_fnc(), fs_encoding=fs_encoding)
     return os.path.abspath(path)
 
 
 def getdebug(environ=os.environ, true_values=TRUE_VALUES):
-    '''
+    """
     Get if app is expected to be ran in debug mode looking at environment
     variables.
 
@@ -179,12 +179,12 @@ def getdebug(environ=os.environ, true_values=TRUE_VALUES):
     :type environ: collections.abc.Mapping
     :returns: True if debug contains a true-like string, False otherwise
     :rtype: bool
-    '''
+    """
     return environ.get('DEBUG', '').lower() in true_values
 
 
 def deprecated(func_or_text, environ=os.environ):
-    '''
+    """
     Decorator used to mark functions as deprecated. It will result in a
     warning being emmitted hen the function is called.
 
@@ -206,7 +206,7 @@ def deprecated(func_or_text, environ=os.environ):
     :type environ: collections.abc.Mapping
     :returns: nested decorator or new decorated function (depending on params)
     :rtype: callable
-    '''
+    """
     def inner(func):
         message = (
             'Deprecated function {}.'.format(func.__name__)
@@ -226,13 +226,13 @@ def deprecated(func_or_text, environ=os.environ):
 
 
 def usedoc(other):
-    '''
+    """
     Decorator which copies __doc__ of given object into decorated one.
 
     Usage:
 
     >>> def fnc1():
-    ...     """docstring"""
+    ...     \"""docstring\"""
     ...     pass
     >>> @usedoc(fnc1)
     ... def fnc2():
@@ -244,7 +244,7 @@ def usedoc(other):
     :type other: any
     :returns: decorator function
     :rtype: callable
-    '''
+    """
     def inner(fnc):
         fnc.__doc__ = fnc.__doc__ or getattr(other, '__doc__')
         return fnc
@@ -252,7 +252,7 @@ def usedoc(other):
 
 
 def pathsplit(value, sep=os.pathsep):
-    '''
+    """
     Get enviroment PATH elements as list.
 
     This function only cares about spliting across OSes.
@@ -263,7 +263,7 @@ def pathsplit(value, sep=os.pathsep):
     :type sep: str
     :yields: every path
     :ytype: str
-    '''
+    """
     for part in value.split(sep):
         if part[:1] == part[-1:] == '"' or part[:1] == part[-1:] == '\'':
             part = part[1:-1]
@@ -271,7 +271,7 @@ def pathsplit(value, sep=os.pathsep):
 
 
 def pathparse(value, sep=os.pathsep, os_sep=os.sep):
-    '''
+    """
     Get enviroment PATH directories as list.
 
     This function cares about spliting, escapes and normalization of paths
@@ -285,7 +285,7 @@ def pathparse(value, sep=os.pathsep, os_sep=os.sep):
     :type os_sep: str
     :yields: every path
     :ytype: str
-    '''
+    """
     escapes = []
     normpath = ntpath.normpath if os_sep == '\\' else posixpath.normpath
     if '\\' not in (os_sep, sep):
@@ -310,14 +310,14 @@ def pathconf(path,
              isdir_fnc=os.path.isdir,
              pathconf_fnc=getattr(os, 'pathconf', None),
              pathconf_names=getattr(os, 'pathconf_names', ())):
-    '''
+    """
     Get all pathconf variables for given path.
 
     :param path: absolute fs path
     :type path: str
     :returns: dictionary containing pathconf keys and their values (both str)
     :rtype: dict
-    '''
+    """
 
     if pathconf_fnc and pathconf_names:
         return {key: pathconf_fnc(path, key) for key in pathconf_names}
@@ -341,7 +341,7 @@ def which(name,
           is_executable_fnc=isexec,
           path_join_fnc=os.path.join,
           os_name=os.name):
-    '''
+    """
     Get command absolute path.
 
     :param name: name of executable command
@@ -357,7 +357,7 @@ def which(name,
     :type os_name: str
     :return: absolute path
     :rtype: str or None
-    '''
+    """
     for path in env_path:
         for suffix in env_path_ext:
             exe_file = path_join_fnc(path, name) + suffix
@@ -367,7 +367,7 @@ def which(name,
 
 
 def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
-    '''
+    """
     Escape all special regex characters in pattern and converts non-ascii
     characters into unicode escape sequences.
 
@@ -377,7 +377,7 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
     :type patterm: str
     :returns: escaped pattern
     :rtype: str
-    '''
+    """
     chr_escape = '\\{}'.format
     uni_escape = '\\u{:04d}'.format
     return ''.join(
@@ -388,22 +388,13 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
         )
 
 
-@contextlib.contextmanager
-def redirect_stderr(f):
-    old = sys.stderr
-    sys.stderr = f
-    yield
-    if sys.stderr is f:
-        sys.stderr = old
-
-
 class Iterator(BaseIterator):
     def next(self):
-        '''
+        """
         Call :method:`__next__` for compatibility.
 
         :returns: see :method:`__next__`
-        '''
+        """
         return self.__next__()
 
 
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index 2a49f74..e5d362d 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -2,27 +2,27 @@
 
 
 class OutsideDirectoryBase(Exception):
-    '''
+    """
     Exception raised when trying to access to a file outside path defined on
     `DIRECTORY_BASE` config property.
-    '''
+    """
     pass
 
 
 class OutsideRemovableBase(Exception):
-    '''
+    """
     Exception raised when trying to access to a file outside path defined on
     `directory_remove` config property.
-    '''
+    """
     pass
 
 
 class InvalidPathError(ValueError):
-    '''
+    """
     Exception raised when a path is not valid.
 
     :property path: value whose length raised this Exception
-    '''
+    """
     code = 'invalid-path'
     template = 'Path {0.path!r} is not valid.'
 
@@ -33,11 +33,11 @@ class InvalidPathError(ValueError):
 
 
 class InvalidFilenameError(InvalidPathError):
-    '''
+    """
     Exception raised when a filename is not valid.
 
     :property filename: value whose length raised this Exception
-    '''
+    """
     code = 'invalid-filename'
     template = 'Filename {0.filename!r} is not valid.'
 
@@ -47,11 +47,11 @@ class InvalidFilenameError(InvalidPathError):
 
 
 class PathTooLongError(InvalidPathError):
-    '''
+    """
     Exception raised when maximum filesystem path length is reached.
 
     :property limit: value length limit
-    '''
+    """
     code = 'invalid-path-length'
     template = 'Path {0.path!r} is too long, max length is {0.limit}'
 
@@ -61,9 +61,9 @@ class PathTooLongError(InvalidPathError):
 
 
 class FilenameTooLongError(InvalidFilenameError):
-    '''
+    """
     Exception raised when maximum filesystem filename length is reached.
-    '''
+    """
     code = 'invalid-filename-length'
     template = 'Filename {0.filename!r} is too long, max length is {0.limit}'
 
diff --git a/browsepy/file.py b/browsepy/file.py
index 563b49c..eeab4a8 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -52,7 +52,7 @@ fs_safe_characters = string.ascii_uppercase + string.digits
 
 
 class Node(object):
-    '''
+    """
     Abstract filesystem node class.
 
     This represents an unspecified entity with a filesystem's path suitable for
@@ -65,7 +65,7 @@ class Node(object):
       will be created instead of an instance of this class tself.
     * :attr:`directory_class`, class will be used for directory nodes,
     * :attr:`file_class`, class will be used for file nodes.
-    '''
+    """
     generic = True
     directory_class = None  # set later at import time
     file_class = None  # set later at import time
@@ -76,22 +76,22 @@ class Node(object):
 
     @cached_property
     def is_excluded(self):
-        '''
+        """
         Get if current node shouldn't be shown, using :attt:`app` config's
         exclude_fnc.
 
         :returns: True if excluded, False otherwise
-        '''
+        """
         return self.plugin_manager.check_excluded(self.path)
 
     @cached_property
     def plugin_manager(self):
-        '''
+        """
         Get current app's plugin manager.
 
         :returns: plugin manager instance
         :type: browsepy.manager.PluginManagerBase
-        '''
+        """
         return (
             self.app.extensions.get('plugin_manager') or
             manager.PluginManager(self.app)
@@ -99,14 +99,14 @@ class Node(object):
 
     @cached_property
     def widgets(self):
-        '''
+        """
         List widgets with filter return True for this node (or without filter).
 
         Remove button is prepended if :property:can_remove returns true.
 
         :returns: list of widgets
         :rtype: list of namedtuple instances
-        '''
+        """
         widgets = []
         if self.can_remove:
             widgets.append(
@@ -122,12 +122,12 @@ class Node(object):
 
     @cached_property
     def link(self):
-        '''
+        """
         Get last widget with place `entry-link`.
 
         :returns: widget on entry-link (ideally a link one)
         :rtype: namedtuple instance
-        '''
+        """
         link = None
         for widget in self.widgets:
             if widget.place == 'entry-link':
@@ -136,45 +136,45 @@ class Node(object):
 
     @cached_property
     def can_remove(self):
-        '''
+        """
         Get if current node can be removed based on app config's
         `DIRECTORY_REMOVE`.
 
         :returns: True if current node can be removed, False otherwise.
         :rtype: bool
-        '''
+        """
         dirbase = self.app.config.get('DIRECTORY_REMOVE')
         return bool(dirbase and check_under_base(self.path, dirbase))
 
     @cached_property
     def stats(self):
-        '''
+        """
         Get current stats object as returned by `os.stat` function.
 
         :returns: stats object
         :rtype: posix.stat_result or nt.stat_result
-        '''
+        """
         return os.stat(self.path)
 
     @cached_property
     def pathconf(self):
-        '''
+        """
         Get filesystem config for current path.
         See :func:`compat.pathconf`.
 
         :returns: fs config
         :rtype: dict
-        '''
+        """
         return compat.pathconf(self.path)
 
     @cached_property
     def parent(self):
-        '''
+        """
         Get parent node if available based on app config's `DIRECTORY_BASE`.
 
         :returns: parent object if available
         :rtype: Node instance or None
-        '''
+        """
         directory_base = self.app.config.get('DIRECTORY_BASE', self.path)
         if check_path(self.path, directory_base):
             return None
@@ -183,12 +183,12 @@ class Node(object):
 
     @cached_property
     def ancestors(self):
-        '''
+        """
         Get list of ancestors until app config's `DIRECTORY_BASE` is reached.
 
         :returns: list of ancestors starting from nearest.
         :rtype: list of Node objects
-        '''
+        """
         ancestors = []
         parent = self.parent
         while parent:
@@ -198,12 +198,12 @@ class Node(object):
 
     @property
     def modified(self):
-        '''
+        """
         Get human-readable last modification date-time.
 
         :returns: iso9008-like date-time string (without timezone)
         :rtype: str
-        '''
+        """
         try:
             dt = datetime.datetime.fromtimestamp(self.stats.st_mtime)
             return dt.strftime('%Y.%m.%d %H:%M:%S')
@@ -212,13 +212,13 @@ class Node(object):
 
     @property
     def urlpath(self):
-        '''
+        """
         Get the url substring corresponding to this node for those endpoints
         accepting a 'path' parameter, suitable for :meth:`from_urlpath`.
 
         :returns: relative-url-like for node's path
         :rtype: str
-        '''
+        """
         return abspath_to_urlpath(
             self.path,
             self.app.config.get('DIRECTORY_BASE', self.path),
@@ -226,27 +226,27 @@ class Node(object):
 
     @property
     def name(self):
-        '''
+        """
         Get the basename portion of node's path.
 
         :returns: filename
         :rtype: str
-        '''
+        """
         return os.path.basename(self.path)
 
     @property
     def type(self):
-        '''
+        """
         Get the mime portion of node's mimetype (without the encoding part).
 
         :returns: mimetype
         :rtype: str
-        '''
+        """
         return self.mimetype.split(";", 1)[0]
 
     @property
     def category(self):
-        '''
+        """
         Get mimetype category (first portion of mimetype before the slash).
 
         :returns: mimetype category
@@ -263,42 +263,42 @@ class Node(object):
             * multipart
             * text
             * video
-        '''
+        """
         return self.type.split('/', 1)[0]
 
     def __init__(self, path=None, app=None, **defaults):
-        '''
+        """
         :param path: local path
         :type path: str
         :param app: app instance (optional inside application context)
         :type app: flask.Flask
         :param **defaults: initial property values
-        '''
+        """
         self.path = compat.fsdecode(path) if path else None
         self.app = utils.solve_local(app or flask.current_app)
         self.__dict__.update(defaults)  # only for attr and cached_property
 
     def __repr__(self):
-        '''
+        """
         Get str representation of instance.
 
         :returns: instance representation
         :rtype: str
-        '''
+        """
         return '<{0.__class__.__name__}({0.path!r})>'.format(self)
 
     def remove(self):
-        '''
+        """
         Does nothing except raising if can_remove property returns False.
 
         :raises: OutsideRemovableBase if :property:`can_remove` returns false
-        '''
+        """
         if not self.can_remove:
             raise OutsideRemovableBase("File outside removable base")
 
     @classmethod
     def from_urlpath(cls, path, app=None):
-        '''
+        """
         Alternative constructor which accepts a path as taken from URL and uses
         the given app or the current app config to get the real path.
 
@@ -309,7 +309,7 @@ class Node(object):
         :param app: optional, flask application
         :return: file object pointing to path
         :rtype: File
-        '''
+        """
         app = utils.solve_local(app or flask.current_app)
         base = app.config.get('DIRECTORY_BASE', path)
         path = urlpath_to_abspath(path, base)
@@ -323,34 +323,34 @@ class Node(object):
 
     @classmethod
     def register_file_class(cls, kls):
-        '''
+        """
         Convenience method for setting current class file_class property.
 
         :param kls: class to set
         :type kls: type
         :returns: given class (enabling using this as decorator)
         :rtype: type
-        '''
+        """
         cls.file_class = kls
         return kls
 
     @classmethod
     def register_directory_class(cls, kls):
-        '''
+        """
         Convenience method for setting current class directory_class property.
 
         :param kls: class to set
         :type kls: type
         :returns: given class (enabling using this as decorator)
         :rtype: type
-        '''
+        """
         cls.directory_class = kls
         return kls
 
 
 @Node.register_file_class
 class File(Node):
-    '''
+    """
     Filesystem file class.
 
     Some notes:
@@ -363,7 +363,7 @@ class File(Node):
       performed.
     * :attr:`generic` is set to False, so static method :meth:`from_urlpath`
       will always return instances of this class.
-    '''
+    """
     can_download = True
     can_upload = False
     is_directory = False
@@ -371,7 +371,7 @@ class File(Node):
 
     @cached_property
     def widgets(self):
-        '''
+        """
         List widgets with filter return True for this file (or without filter).
 
         Entry link is prepended.
@@ -380,7 +380,7 @@ class File(Node):
 
         :returns: list of widgets
         :rtype: list of namedtuple instances
-        '''
+        """
         widgets = [
             self.plugin_manager.create_widget(
                 'entry-link',
@@ -410,33 +410,33 @@ class File(Node):
 
     @cached_property
     def mimetype(self):
-        '''
+        """
         Get full mimetype, with encoding if available.
 
         :returns: mimetype
         :rtype: str
-        '''
+        """
         return self.plugin_manager.get_mimetype(self.path)
 
     @cached_property
     def is_file(self):
-        '''
+        """
         Get if node is file.
 
         :returns: True if file, False otherwise
         :rtype: bool
-        '''
+        """
         return os.path.isfile(self.path)
 
     @property
     def size(self):
-        '''
+        """
         Get human-readable node size in bytes.
         If directory, this will corresponds with own inode size.
 
         :returns: fuzzy size with unit
         :rtype: str
-        '''
+        """
         try:
             size, unit = fmt_size(
                 self.stats.st_size,
@@ -450,12 +450,12 @@ class File(Node):
 
     @property
     def encoding(self):
-        '''
+        """
         Get encoding part of mimetype, or "default" if not available.
 
         :returns: file conding as returned by mimetype function or "default"
         :rtype: str
-        '''
+        """
         if ";" in self.mimetype:
             match = self.re_charset.search(self.mimetype)
             gdict = match.groupdict() if match else {}
@@ -463,27 +463,27 @@ class File(Node):
         return "default"
 
     def remove(self):
-        '''
+        """
         Remove file.
         :raises OutsideRemovableBase: when not under removable base directory
-        '''
+        """
         super(File, self).remove()
         os.unlink(self.path)
 
     def download(self):
-        '''
+        """
         Get a Flask's send_file Response object pointing to this file.
 
         :returns: Response object as returned by flask's send_file
         :rtype: flask.Response
-        '''
+        """
         directory, name = os.path.split(self.path)
         return flask.send_from_directory(directory, name, as_attachment=True)
 
 
 @Node.register_directory_class
 class Directory(Node):
-    '''
+    """
     Filesystem directory class.
 
     Some notes:
@@ -495,7 +495,7 @@ class Directory(Node):
     * :attr:`encoding` is fixed to 'default'.
     * :attr:`generic` is set to False, so static method :meth:`from_urlpath`
       will always return instances of this class.
-    '''
+    """
     stream_class = stream.TarFileStream
 
     _listdir_cache = None
@@ -507,17 +507,17 @@ class Directory(Node):
 
     @property
     def name(self):
-        '''
+        """
         Get the basename portion of directory's path.
 
         :returns: filename
         :rtype: str
-        '''
+        """
         return super(Directory, self).name or self.path
 
     @cached_property
     def widgets(self):
-        '''
+        """
         List widgets with filter return True for this dir (or without filter).
 
         Entry link is prepended.
@@ -527,7 +527,7 @@ class Directory(Node):
 
         :returns: list of widgets
         :rtype: list of namedtuple instances
-        '''
+        """
         widgets = [
             self.plugin_manager.create_widget(
                 'entry-link',
@@ -581,66 +581,66 @@ class Directory(Node):
 
     @cached_property
     def is_directory(self):
-        '''
+        """
         Get if path points to a real directory.
 
         :returns: True if real directory, False otherwise
         :rtype: bool
-        '''
+        """
         return os.path.isdir(self.path)
 
     @cached_property
     def is_root(self):
-        '''
+        """
         Get if directory is filesystem's root
 
         :returns: True if FS root, False otherwise
         :rtype: bool
-        '''
+        """
         return check_path(os.path.dirname(self.path), self.path)
 
     @cached_property
     def can_download(self):
-        '''
+        """
         Get if path is downloadable (if app's `DIRECTORY_DOWNLOADABLE` config
         property is True).
 
         :returns: True if downloadable, False otherwise
         :rtype: bool
-        '''
+        """
         return self.app.config.get('DIRECTORY_DOWNLOADABLE', False)
 
     @cached_property
     def can_upload(self):
-        '''
+        """
         Get if a file can be uploaded to path (if directory path is under app's
         `DIRECTORY_UPLOAD` config property).
 
         :returns: True if a file can be upload to directory, False otherwise
         :rtype: bool
-        '''
+        """
         dirbase = self.app.config.get('DIRECTORY_UPLOAD', False)
         return dirbase and check_base(self.path, dirbase)
 
     @cached_property
     def can_remove(self):
-        '''
+        """
         Get if current node can be removed based on app config's
         directory_remove.
 
         :returns: True if current node can be removed, False otherwise.
         :rtype: bool
-        '''
+        """
         return self.parent and super(Directory, self).can_remove
 
     @cached_property
     def is_empty(self):
-        '''
+        """
         Get if directory is empty (based on :meth:`_listdir`).
 
         :returns: True if this directory has no entries, False otherwise.
         :rtype: bool
-        '''
+        """
         if self._listdir_cache is not None:
             return not bool(self._listdir_cache)
         for entry in self._listdir():
@@ -648,21 +648,21 @@ class Directory(Node):
         return True
 
     def remove(self):
-        '''
+        """
         Remove directory tree.
 
         :raises OutsideRemovableBase: when not under removable base directory
-        '''
+        """
         super(Directory, self).remove()
         shutil.rmtree(self.path)
 
     def download(self):
-        '''
+        """
         Get a Flask Response object streaming a tarball of this directory.
 
         :returns: Response object
         :rtype: flask.Response
-        '''
+        """
         stream = self.stream_class(
             self.path,
             self.app.config.get('DIRECTORY_TAR_BUFFSIZE', 10240),
@@ -688,18 +688,18 @@ class Directory(Node):
             )
 
     def contains(self, filename):
-        '''
+        """
         Check if directory contains an entry with given filename.
 
         :param filename: filename will be check
         :type filename: str
         :returns: True if exists, False otherwise.
         :rtype: bool
-        '''
+        """
         return os.path.exists(os.path.join(self.path, filename))
 
     def choose_filename(self, filename, attempts=999):
-        '''
+        """
         Get a new filename which does not colide with any entry on directory,
         based on given filename.
 
@@ -712,7 +712,7 @@ class Directory(Node):
 
         :raises FilenameTooLong: when filesystem filename size limit is reached
         :raises PathTooLong: when OS or filesystem path size limit is reached
-        '''
+        """
         new_filename = filename
         for attempt in range(2, attempts + 1):
             if not self.contains(new_filename):
@@ -735,12 +735,12 @@ class Directory(Node):
         return new_filename
 
     def _listdir(self, precomputed_stats=(os.name == 'nt')):
-        '''
+        """
         Iter unsorted entries on this directory.
 
         :yields: Directory or File instance for each entry in directory
         :rtype: Iterator of browsepy.file.Node
-        '''
+        """
         directory_class = self.directory_class
         file_class = self.file_class
         exclude_fnc = self.plugin_manager.check_excluded
@@ -767,12 +767,12 @@ class Directory(Node):
                     logger.exception(e)
 
     def listdir(self, sortkey=None, reverse=False):
-        '''
+        """
         Get sorted list (by given sortkey and reverse params) of File objects.
 
         :return: sorted list of File instances
         :rtype: list of File instances
-        '''
+        """
         if self._listdir_cache is None:
             self._listdir_cache = tuple(self._listdir())
         if sortkey:
@@ -784,7 +784,7 @@ class Directory(Node):
 
 
 def fmt_size(size, binary=True):
-    '''
+    """
     Get size and unit.
 
     :param size: size in bytes
@@ -793,7 +793,7 @@ def fmt_size(size, binary=True):
     :type binary: bool
     :return: size and unit
     :rtype: tuple of int and unit as str
-    '''
+    """
     if binary:
         fmt_sizes = binary_units
         fmt_divider = 1024.
@@ -808,7 +808,7 @@ def fmt_size(size, binary=True):
 
 
 def relativize_path(path, base, os_sep=os.sep):
-    '''
+    """
     Make absolute path relative to an absolute base.
 
     :param path: absolute path
@@ -820,7 +820,7 @@ def relativize_path(path, base, os_sep=os.sep):
     :return: relative path
     :rtype: str or unicode
     :raises OutsideDirectoryBase: if path is not below base
-    '''
+    """
     if not check_base(path, base, os_sep):
         raise OutsideDirectoryBase("%r is not under %r" % (path, base))
     prefix_len = len(base)
@@ -830,7 +830,7 @@ def relativize_path(path, base, os_sep=os.sep):
 
 
 def abspath_to_urlpath(path, base, os_sep=os.sep):
-    '''
+    """
     Make filesystem absolute path uri relative using given absolute base path.
 
     :param path: absolute path
@@ -839,12 +839,12 @@ def abspath_to_urlpath(path, base, os_sep=os.sep):
     :return: relative uri
     :rtype: str or unicode
     :raises OutsideDirectoryBase: if resulting path is not below base
-    '''
+    """
     return relativize_path(path, base, os_sep).replace(os_sep, '/')
 
 
 def urlpath_to_abspath(path, base, os_sep=os.sep):
-    '''
+    """
     Make uri relative path fs absolute using a given absolute base path.
 
     :param path: relative path
@@ -853,7 +853,7 @@ def urlpath_to_abspath(path, base, os_sep=os.sep):
     :return: absolute path
     :rtype: str or unicode
     :raises OutsideDirectoryBase: if resulting path is not below base
-    '''
+    """
     prefix = base if base.endswith(os_sep) else base + os_sep
     realpath = os.path.abspath(prefix + path.replace('/', os_sep))
     if check_path(base, realpath) or check_under_base(realpath, base):
@@ -862,14 +862,14 @@ def urlpath_to_abspath(path, base, os_sep=os.sep):
 
 
 def generic_filename(path):
-    '''
+    """
     Extract filename of given path os-indepently, taking care of known path
     separators.
 
     :param path: path
     :return: filename
     :rtype: str or unicode (depending on given path)
-    '''
+    """
 
     for sep in common_path_separators:
         if sep in path:
@@ -878,13 +878,13 @@ def generic_filename(path):
 
 
 def clean_restricted_chars(path, restricted_chars=current_restricted_chars):
-    '''
+    """
     Get path without restricted characters.
 
     :param path: path
     :return: path without restricted characters
     :rtype: str or unicode (depending on given path)
-    '''
+    """
     for character in restricted_chars:
         path = path.replace(character, '_')
     return path
@@ -893,7 +893,7 @@ def clean_restricted_chars(path, restricted_chars=current_restricted_chars):
 def check_forbidden_filename(filename,
                              destiny_os=os.name,
                              restricted_names=restricted_names):
-    '''
+    """
     Get if given filename is forbidden for current OS or filesystem.
 
     :param filename:
@@ -901,7 +901,7 @@ def check_forbidden_filename(filename,
     :param fs_encoding: destination filesystem filename encoding
     :return: wether is forbidden on given OS (or filesystem) or not
     :rtype: bool
-    '''
+    """
     return (
       filename in restricted_names or
       destiny_os == 'nt' and
@@ -910,7 +910,7 @@ def check_forbidden_filename(filename,
 
 
 def check_path(path, base, os_sep=os.sep):
-    '''
+    """
     Check if both given paths are equal.
 
     :param path: absolute path
@@ -921,13 +921,13 @@ def check_path(path, base, os_sep=os.sep):
     :type base: str
     :return: wether two path are equal or not
     :rtype: bool
-    '''
+    """
     base = base[:-len(os_sep)] if base.endswith(os_sep) else base
     return os.path.normcase(path) == os.path.normcase(base)
 
 
 def check_base(path, base, os_sep=os.sep):
-    '''
+    """
     Check if given absolute path is under or given base.
 
     :param path: absolute path
@@ -937,7 +937,7 @@ def check_base(path, base, os_sep=os.sep):
     :param os_sep: path separator, defaults to os.sep
     :return: wether path is under given base or not
     :rtype: bool
-    '''
+    """
     return (
         check_path(path, base, os_sep) or
         check_under_base(path, base, os_sep)
@@ -945,7 +945,7 @@ def check_base(path, base, os_sep=os.sep):
 
 
 def check_under_base(path, base, os_sep=os.sep):
-    '''
+    """
     Check if given absolute path is under given base.
 
     :param path: absolute path
@@ -955,13 +955,13 @@ def check_under_base(path, base, os_sep=os.sep):
     :param os_sep: path separator, defaults to os.sep
     :return: wether file is under given base or not
     :rtype: bool
-    '''
+    """
     prefix = base if base.endswith(os_sep) else base + os_sep
     return os.path.normcase(path).startswith(os.path.normcase(prefix))
 
 
 def secure_filename(path, destiny_os=os.name, fs_encoding=compat.FS_ENCODING):
-    '''
+    """
     Get rid of parent path components and special filenames.
 
     If path is invalid or protected, return empty string.
@@ -974,7 +974,7 @@ def secure_filename(path, destiny_os=os.name, fs_encoding=compat.FS_ENCODING):
     :type fs_encoding: str
     :return: filename or empty string
     :rtype: str
-    '''
+    """
     path = generic_filename(path)
     path = clean_restricted_chars(
         path,
@@ -1004,7 +1004,7 @@ def secure_filename(path, destiny_os=os.name, fs_encoding=compat.FS_ENCODING):
 
 
 def alternative_filename(filename, attempt=None):
-    '''
+    """
     Generates an alternative version of given filename.
 
     If an number attempt parameter is given, will be used on the alternative
@@ -1014,7 +1014,7 @@ def alternative_filename(filename, attempt=None):
     :param attempt: optional attempt number, defaults to null
     :return: new filename
     :rtype: str or unicode
-    '''
+    """
     filename_parts = filename.rsplit(u'.', 2)
     name = filename_parts[0]
     ext = ''.join(u'.%s' % ext for ext in filename_parts[1:])
diff --git a/browsepy/http.py b/browsepy/http.py
index cb73cfa..94ad19c 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -11,18 +11,18 @@ logger = logging.getLogger(__name__)
 
 
 class Headers(BaseHeaders):
-    '''
+    """
     A wrapper around :class:`werkzeug.datastructures.Headers`, allowing
     to specify headers with options on initialization.
 
     Headers are provided as keyword arguments while values can be either
     :type:`str` (no options) or tuple of :type:`str` and :type:`dict`.
-    '''
+    """
     snake_replace = staticmethod(re.compile(r'(^|-)[a-z]').sub)
 
     @classmethod
     def genpair(cls, key, value):
-        '''
+        """
         Extract value and options from values dict based on given key and
         options-key.
 
@@ -32,7 +32,7 @@ class Headers(BaseHeaders):
         :type value: str or pair of (str, dict)
         :returns: tuple with key and value
         :rtype: tuple of (str, str)
-        '''
+        """
         rkey = cls.snake_replace(
             lambda x: x.group(0).upper(),
             key.replace('_', '-')
@@ -45,10 +45,10 @@ class Headers(BaseHeaders):
         return rkey, rvalue
 
     def __init__(self, **kwargs):
-        '''
+        """
         :param **kwargs: header and values as keyword arguments
         :type **kwargs: str or (str, dict)
-        '''
+        """
         items = [
             self.genpair(key, value)
             for key, value in kwargs.items()
diff --git a/browsepy/manager.py b/browsepy/manager.py
index d42bcf3..edecafe 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -23,23 +23,26 @@ from .exceptions import PluginNotFoundError, InvalidArgumentError, \
 
 
 class PluginManagerBase(object):
-    '''
+    """
     Base plugin manager for plugin module loading and Flask extension logic.
-    '''
+    """
     _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
 
     @property
     def namespaces(self):
-        '''
+        """
         List of plugin namespaces taken from app config.
-        '''
+
+        :returns: list of plugin namespaces
+        :rtype: typing.List[str]
+        """
         return self.app.config.get('PLUGIN_NAMESPACES', []) if self.app else []
 
     def __init__(self, app=None):
-        '''
+        """
         :param app: flask application
         :type app: flask.Flask
-        '''
+        """
         self.plugin_filters = []
 
         if app is None:
@@ -48,12 +51,12 @@ class PluginManagerBase(object):
             self.init_app(app)
 
     def init_app(self, app):
-        '''
+        """
         Initialize this Flask extension for given app.
 
         :param app: flask application
         :type app: flask.Flask
-        '''
+        """
         self.app = app
         if not hasattr(app, 'extensions'):
             app.extensions = {}
@@ -61,35 +64,35 @@ class PluginManagerBase(object):
         self.reload()
 
     def reload(self):
-        '''
+        """
         Clear plugin manager state and reload plugins.
 
         This method will make use of :meth:`clear` and :meth:`load_plugin`,
         so all internal state will be cleared, and all plugins defined in
         :data:`self.app.config['PLUGIN_MODULES']` will be loaded.
-        '''
+        """
         self.clear()
         for plugin in self.app.config.get('PLUGIN_MODULES', ()):
             self.load_plugin(plugin)
 
     def clear(self):
-        '''
+        """
         Clear plugin manager state.
-        '''
+        """
         pass
 
     def _iter_modules(self, prefix):
-        '''
+        """
         Iterate thru all root modules containing given prefix.
-        '''
+        """
         for finder, name, ispkg in pkgutil.iter_modules():
             if name.startswith(prefix):
                 yield name
 
     def _content_import_name(self, module, item, prefix):
-        '''
+        """
         Get importable module contnt import name..
-        '''
+        """
         res = compat.res
         name = '%s.%s' % (module, item)
         if name.startswith(prefix):
@@ -100,9 +103,9 @@ class PluginManagerBase(object):
                 return name
 
     def _iter_submodules(self, prefix):
-        '''
+        """
         Iterate thru all modules which full name contains given prefix.
-        '''
+        """
         res = compat.res
         parent = prefix.rsplit('.', 1)[0]
         for base in (prefix, parent):
@@ -115,10 +118,10 @@ class PluginManagerBase(object):
                 pass
 
     def _iter_plugin_modules(self, get_module_fnc=utils.get_module):
-        '''
+        """
         Iterate plugin modules, yielding both full qualified name and
         short plugin name as tuple.
-        '''
+        """
         nameset = set()
         shortset = set()
         filters = self.plugin_filters
@@ -150,19 +153,19 @@ class PluginManagerBase(object):
 
     @cached_property
     def available_plugins(self):
-        '''
+        """
         Iterate through all loadable plugins on default import locations
-        '''
+        """
         return list(self._iter_plugin_modules())
 
     def import_plugin(self, plugin, get_module_fnc=utils.get_module):
-        '''
+        """
         Import plugin by given name, looking at :attr:`namespaces`.
 
         :param plugin: plugin module name
         :type plugin: str
         :raises PluginNotFoundError: if not found on any namespace
-        '''
+        """
         plugin = plugin.replace('-', '_')
         names = [
             name
@@ -183,21 +186,21 @@ class PluginManagerBase(object):
             plugin, names)
 
     def load_plugin(self, plugin):
-        '''
+        """
         Import plugin (see :meth:`import_plugin`) and load related data.
 
         :param plugin: plugin module name
         :type plugin: str
         :raises PluginNotFoundError: if not found on any namespace
-        '''
+        """
         return self.import_plugin(plugin)
 
 
 class RegistrablePluginManager(PluginManagerBase):
-    '''
+    """
     Base plugin manager for plugin registration via :func:`register_plugin`
     functions at plugin module level.
-    '''
+    """
     def __init__(self, app=None):
         super(RegistrablePluginManager, self).__init__(app)
         self.plugin_filters.append(
@@ -205,7 +208,7 @@ class RegistrablePluginManager(PluginManagerBase):
             )
 
     def load_plugin(self, plugin):
-        '''
+        """
         Import plugin (see :meth:`import_plugin`) and load related data.
 
         If available, plugin's module-level :func:`register_plugin` function
@@ -214,7 +217,7 @@ class RegistrablePluginManager(PluginManagerBase):
         :param plugin: plugin module name
         :type plugin: str
         :raises PluginNotFoundError: if not found on any namespace
-        '''
+        """
         module = super(RegistrablePluginManager, self).load_plugin(plugin)
         if hasattr(module, 'register_plugin'):
             module.register_plugin(self)
@@ -222,18 +225,18 @@ class RegistrablePluginManager(PluginManagerBase):
 
 
 class BlueprintPluginManager(PluginManagerBase):
-    '''
+    """
     Manager for blueprint registration via :meth:`register_plugin` calls.
 
     Note: blueprints are not removed on `clear` nor reloaded on `reload`
     as flask does not allow it.
-    '''
+    """
     def __init__(self, app=None):
         self._blueprint_known = set()
         super(BlueprintPluginManager, self).__init__(app=app)
 
     def register_blueprint(self, blueprint):
-        '''
+        """
         Register given blueprint on curren app.
 
         This method is intended to be used on plugin's module-level
@@ -241,23 +244,23 @@ class BlueprintPluginManager(PluginManagerBase):
 
         :param blueprint: blueprint object with plugin endpoints
         :type blueprint: flask.Blueprint
-        '''
+        """
         if blueprint not in self._blueprint_known:
             self.app.register_blueprint(blueprint)
             self._blueprint_known.add(blueprint)
 
 
 class ExcludePluginManager(PluginManagerBase):
-    '''
+    """
     Manager for exclude-function registration via :meth:`register_exclude_fnc`
     calls.
-    '''
+    """
     def __init__(self, app=None):
         self._exclude_functions = set()
         super(ExcludePluginManager, self).__init__(app=app)
 
     def register_exclude_function(self, exclude_fnc):
-        '''
+        """
         Register given exclude-function on curren app.
 
         This method is intended to be used on plugin's module-level
@@ -265,18 +268,18 @@ class ExcludePluginManager(PluginManagerBase):
 
         :param blueprint: blueprint object with plugin endpoints
         :type blueprint: flask.Blueprint
-        '''
+        """
         self._exclude_functions.add(exclude_fnc)
 
     def check_excluded(self, path):
-        '''
+        """
         Check if given path is excluded.
 
         :param path: absolute path to check against config and plugins
         :type path: str
         :return: wether if path should be excluded or not
         :rtype: bool
-        '''
+        """
         exclude_fnc = self.app.config.get('EXCLUDE_FNC')
         if exclude_fnc and exclude_fnc(path):
             return True
@@ -286,17 +289,17 @@ class ExcludePluginManager(PluginManagerBase):
         return False
 
     def clear(self):
-        '''
+        """
         Clear plugin manager state.
 
         Registered exclude functions will be disposed.
-        '''
+        """
         self._exclude_functions.clear()
         super(ExcludePluginManager, self).clear()
 
 
 class WidgetPluginManager(PluginManagerBase):
-    '''
+    """
     Plugin manager for widget registration.
 
     This class provides a dictionary of widget types at its
@@ -304,7 +307,7 @@ class WidgetPluginManager(PluginManagerBase):
     both :meth:`create_widget` and :meth:`register_widget` methods' `type`
     parameter, or instantiated directly and passed to :meth:`register_widget`
     via `widget` parameter.
-    '''
+    """
     widget_types = {
         'base': defaultsnamedtuple(
             'Widget',
@@ -340,16 +343,16 @@ class WidgetPluginManager(PluginManagerBase):
         }
 
     def clear(self):
-        '''
+        """
         Clear plugin manager state.
 
         Registered widgets will be disposed after calling this method.
-        '''
+        """
         self._widgets = []
         super(WidgetPluginManager, self).clear()
 
     def get_widgets(self, file=None, place=None):
-        '''
+        """
         List registered widgets, optionally matching given criteria.
 
         :param file: optional file object will be passed to widgets' filter
@@ -359,12 +362,12 @@ class WidgetPluginManager(PluginManagerBase):
         :type place: str
         :returns: list of widget instances
         :rtype: list of objects
-        '''
+        """
         return list(self.iter_widgets(file, place))
 
     @classmethod
     def _resolve_widget(cls, file, widget):
-        '''
+        """
         Resolve widget callable properties into static ones.
 
         :param file: file will be used to resolve callable properties.
@@ -373,14 +376,14 @@ class WidgetPluginManager(PluginManagerBase):
         :type widget: object
         :returns: a new widget instance of the same type as widget parameter
         :rtype: object
-        '''
+        """
         return widget.__class__(*[
             value(file) if callable(value) else value
             for value in widget
             ])
 
     def iter_widgets(self, file=None, place=None):
-        '''
+        """
         Iterate registered widgets, optionally matching given criteria.
 
         :param file: optional file object will be passed to widgets' filter
@@ -390,7 +393,7 @@ class WidgetPluginManager(PluginManagerBase):
         :type place: str
         :yields: widget instances
         :ytype: object
-        '''
+        """
         for filter, dynamic, cwidget in self._widgets:
             try:
                 if (
@@ -411,7 +414,7 @@ class WidgetPluginManager(PluginManagerBase):
             yield cwidget
 
     def create_widget(self, place, type, file=None, **kwargs):
-        '''
+        """
         Create a widget object based on given arguments.
 
         If file object is provided, callable arguments will be resolved:
@@ -429,7 +432,7 @@ class WidgetPluginManager(PluginManagerBase):
         :type type: browsepy.files.Node or None
         :returns: widget instance
         :rtype: object
-        '''
+        """
         widget_class = self.widget_types.get(type, self.widget_types['base'])
         kwargs.update(place=place, type=type)
         try:
@@ -451,7 +454,7 @@ class WidgetPluginManager(PluginManagerBase):
 
     def register_widget(self, place=None, type=None, widget=None, filter=None,
                         **kwargs):
-        '''
+        """
         Create (see :meth:`create_widget`) or use provided widget and register
         it.
 
@@ -472,7 +475,7 @@ class WidgetPluginManager(PluginManagerBase):
                            the same time (they're mutually exclusive).
         :returns: created or given widget object
         :rtype: object
-        '''
+        """
         if bool(widget) == bool(place or type):
             raise InvalidArgumentError(
                 'register_widget takes either place and type or widget'
@@ -484,23 +487,23 @@ class WidgetPluginManager(PluginManagerBase):
 
 
 class MimetypePluginManager(RegistrablePluginManager):
-    '''
+    """
     Plugin manager for mimetype-function registration.
-    '''
+    """
     _default_mimetype_functions = mimetype.alternatives
 
     def clear(self):
-        '''
+        """
         Clear plugin manager state.
 
         Registered mimetype functions will be disposed after calling this
         method.
-        '''
+        """
         self._mimetype_functions = list(self._default_mimetype_functions)
         super(MimetypePluginManager, self).clear()
 
     def get_mimetype(self, path):
-        '''
+        """
         Get mimetype of given path calling all registered mime functions (and
         default ones).
 
@@ -508,7 +511,7 @@ class MimetypePluginManager(RegistrablePluginManager):
         :type path: str
         :returns: mimetype
         :rtype: str
-        '''
+        """
         for fnc in self._mimetype_functions:
             mime = fnc(path)
             if mime:
@@ -516,7 +519,7 @@ class MimetypePluginManager(RegistrablePluginManager):
         return mimetype.by_default(path)
 
     def register_mimetype_function(self, fnc):
-        '''
+        """
         Register mimetype function.
 
         Given function must accept a filesystem path as string and return
@@ -524,13 +527,13 @@ class MimetypePluginManager(RegistrablePluginManager):
 
         :param fnc: callable accepting a path string
         :type fnc: callable
-        '''
+        """
         self._mimetype_functions.insert(0, fnc)
 
 
 class SessionPluginManager(PluginManagerBase):
     def register_session(self, key_or_keys, shrink_fnc=None):
-        '''
+        """
         Register session shrink function for specific session key or
         keys. Can be used as decorator.
 
@@ -546,7 +549,7 @@ class SessionPluginManager(PluginManagerBase):
         :type shrink_fnc: cookieman.abc.ShrinkFunction
         :returns: either original given shrink_fnc or decorator
         :rtype: cookieman.abc.ShrinkFunction
-        '''
+        """
         interface = self.app.session_interface
         if isinstance(interface, CookieMan):
             return interface.register(key_or_keys, shrink_fnc)
@@ -554,7 +557,7 @@ class SessionPluginManager(PluginManagerBase):
 
 
 class ArgumentPluginManager(PluginManagerBase):
-    '''
+    """
     Plugin manager for command-line argument registration.
 
     This function is used by browsepy's :mod:`__main__` module in order
@@ -563,7 +566,7 @@ class ArgumentPluginManager(PluginManagerBase):
     This is done by :meth:`load_arguments` which imports all plugin modules
     and calls their respective :func:`register_arguments` module-level
     function.
-    '''
+    """
     _argparse_kwargs = {'add_help': False}
     _argparse_arguments = argparse.Namespace()
 
@@ -574,7 +577,7 @@ class ArgumentPluginManager(PluginManagerBase):
             )
 
     def extract_plugin_arguments(self, plugin):
-        '''
+        """
         Given a plugin name, extracts its registered_arguments as an
         iterable of (args, kwargs) tuples.
 
@@ -582,7 +585,7 @@ class ArgumentPluginManager(PluginManagerBase):
         :type plugin: str
         :returns: iterable if (args, kwargs) tuples.
         :rtype: iterable
-        '''
+        """
         module = self.import_plugin(plugin)
         if hasattr(module, 'register_arguments'):
             manager = ArgumentPluginManager()
@@ -615,7 +618,7 @@ class ArgumentPluginManager(PluginManagerBase):
             )
 
     def load_arguments(self, argv, base=None):
-        '''
+        """
         Process given argument list based on registered arguments and given
         optional base :class:`argparse.ArgumentParser` instance.
 
@@ -632,7 +635,7 @@ class ArgumentPluginManager(PluginManagerBase):
         :returns: argparse.Namespace instance with processed arguments as
                   given by :meth:`argparse.ArgumentParser.parse_args`.
         :rtype: argparse.Namespace
-        '''
+        """
         parser = self._plugin_argument_parser(base)
         options, _ = parser.parse_known_args(argv)
 
@@ -666,17 +669,17 @@ class ArgumentPluginManager(PluginManagerBase):
         return self._argparse_arguments
 
     def clear(self):
-        '''
+        """
         Clear plugin manager state.
 
         Registered command-line arguments will be disposed after calling this
         method.
-        '''
+        """
         self._argparse_argkwargs = []
         super(ArgumentPluginManager, self).clear()
 
     def register_argument(self, *args, **kwargs):
-        '''
+        """
         Register command-line argument.
 
         All given arguments will be passed directly to
@@ -685,11 +688,11 @@ class ArgumentPluginManager(PluginManagerBase):
 
         See :meth:`argparse.ArgumentParser.add_argument` documentation for
         further information.
-        '''
+        """
         self._argparse_argkwargs.append((args, kwargs))
 
     def get_argument(self, name, default=None):
-        '''
+        """
         Get argument value from last :meth:`load_arguments` call.
 
         Keep in mind :meth:`argparse.ArgumentParser.parse_args` generates
@@ -700,14 +703,14 @@ class ArgumentPluginManager(PluginManagerBase):
         :type name: str
         :param default: default value if parameter is not found
         :returns: command-line argument or default value
-        '''
+        """
         return getattr(self._argparse_arguments, name, default)
 
 
 class MimetypeActionPluginManager(WidgetPluginManager, MimetypePluginManager):
-    '''
+    """
     Deprecated plugin API
-    '''
+    """
 
     _deprecated_places = {
         'javascript': 'scripts',
@@ -856,8 +859,8 @@ class PluginManager(MimetypeActionPluginManager,
                     MimetypePluginManager,
                     SessionPluginManager,
                     ArgumentPluginManager):
-    '''
-    Main plugin manager
+    """
+    Main plugin manager.
 
     Provides:
         * Plugin module loading and Flask extension logic.
@@ -878,9 +881,9 @@ class PluginManager(MimetypeActionPluginManager,
     both :meth:`create_widget` and :meth:`register_widget` methods' `type`
     parameter, or instantiated directly and passed to :meth:`register_widget`
     via `widget` parameter.
-    '''
+    """
     def clear(self):
-        '''
+        """
         Clear plugin manager state.
 
         Registered widgets will be disposed after calling this method.
@@ -890,5 +893,5 @@ class PluginManager(MimetypeActionPluginManager,
 
         Registered command-line arguments will be disposed after calling this
         method.
-        '''
+        """
         super(PluginManager, self).clear()
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index fc6ca4f..c896133 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -197,26 +197,33 @@ def detect_selection(directory):
             current_app.config.get('DIRECTORY_UPLOAD')
 
 
-def excluded_clipboard(app, path):
-    # TODO: get this working outside requests (for tarfile streaming)
-    if not getattr(g, 'file_actions_paste', False) and \
-       session.get('clipboard:mode') == 'cut':
-        base = app.config['DIRECTORY_BASE']
+def excluded_clipboard(path):
+    """
+    Exclusion function for files in clipboard.
+
+    :param path: path to check
+    :type path: str
+    :return: wether path should be excluded or not
+    :rtype: str
+    """
+    if (
+      not getattr(g, 'file_actions_paste', False) and
+      session.get('clipboard:mode') == 'cut'
+      ):
+        base = current_app.config['DIRECTORY_BASE']
         clipboard = session.get('clipboard:items', ())
         return abspath_to_urlpath(path, base) in clipboard
     return False
 
 
 def register_plugin(manager):
-    '''
+    """
     Register blueprints and actions using given plugin manager.
 
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
-    '''
-    manager.register_exclude_function(
-        functools.partial(excluded_clipboard, manager.app)
-        )
+    """
+    manager.register_exclude_function(excluded_clipboard)
     manager.register_blueprint(actions)
     manager.register_widget(
         place='styles',
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index 8a00a34..d2f0db4 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -5,11 +5,11 @@ import errno
 
 
 class FileActionsException(Exception):
-    '''
+    """
     Base class for file-actions exceptions
 
     :property path: item path which raised this Exception
-    '''
+    """
     code = None
     template = 'Unhandled error.'
 
@@ -20,12 +20,12 @@ class FileActionsException(Exception):
 
 
 class InvalidDirnameError(FileActionsException):
-    '''
+    """
     Exception raised when a new directory name is invalid.
 
     :property path: item path which raised this Exception
     :property name: name which raised this Exception
-    '''
+    """
     code = 'directory-invalid-name'
     template = 'Clipboard item {0.name!r} is not valid.'
 
@@ -35,12 +35,12 @@ class InvalidDirnameError(FileActionsException):
 
 
 class DirectoryCreationError(FileActionsException):
-    '''
+    """
     Exception raised when a new directory creation fails.
 
     :property path: item path which raised this Exception
     :property name: name which raised this Exception
-    '''
+    """
     code = 'directory-mkdir-error'
     template = 'Clipboard item {0.name!r} is not valid.'
 
@@ -64,13 +64,13 @@ class DirectoryCreationError(FileActionsException):
 
 
 class ClipboardException(FileActionsException):
-    '''
+    """
     Base class for clipboard exceptions.
 
     :property path: item path which raised this Exception
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
-    '''
+    """
     code = 'clipboard-invalid'
     template = 'Clipboard is invalid.'
 
@@ -81,9 +81,9 @@ class ClipboardException(FileActionsException):
 
 
 class ItemIssue(tuple):
-    '''
+    """
     Item/error issue
-    '''
+    """
     @property
     def item(self):
         return self[0]
@@ -107,14 +107,14 @@ class ItemIssue(tuple):
 
 
 class InvalidClipboardItemsError(ClipboardException):
-    '''
+    """
     Exception raised when a clipboard item is not valid.
 
     :property path: item path which raised this Exception
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
     :property issues: iterable of issues
-    '''
+    """
     pair_class = ItemIssue
     code = 'clipboard-invalid-items'
     template = 'Clipboard has invalid items.'
@@ -130,13 +130,13 @@ class InvalidClipboardItemsError(ClipboardException):
 
 
 class InvalidClipboardModeError(ClipboardException):
-    '''
+    """
     Exception raised when a clipboard mode is not valid.
 
     :property path: item path which raised this Exception
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
-    '''
+    """
     code = 'clipboard-invalid-mode'
     template = 'Clipboard mode {0.mode!r} is not valid.'
 
@@ -146,13 +146,13 @@ class InvalidClipboardModeError(ClipboardException):
 
 
 class InvalidEmptyClipboardError(ClipboardException):
-    '''
+    """
     Exception raised when an invalid action is requested on an empty clipboard.
 
     :property path: item path which raised this Exception
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
-    '''
+    """
     code = 'clipboard-invalid-empty'
     template = 'Clipboard action {0.mode!r} cannot be performed without items.'
 
@@ -162,13 +162,13 @@ class InvalidEmptyClipboardError(ClipboardException):
 
 
 class InvalidClipboardSizeError(ClipboardException):
-    '''
+    """
     Exception raised when session manager evicts clipboard data.
 
     :property path: item path which raised this Exception
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
-    '''
+    """
     code = 'clipboard-invalid-size'
     template = 'Clipboard evicted due session size limit.'
 
diff --git a/browsepy/plugin/file_actions/utils.py b/browsepy/plugin/file_actions/utils.py
index 694af61..2979c64 100644
--- a/browsepy/plugin/file_actions/utils.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -46,9 +46,9 @@ def move(target, node, join_fnc=os.path.join):
 
 
 def paste(target, mode, clipboard):
-    '''
+    """
     Get pasting function for given directory and keyboard.
-    '''
+    """
     if mode == 'cut':
         paste_fnc = functools.partial(move, target)
     elif mode == 'copy':
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index fbc5e2d..b24625f 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -69,14 +69,14 @@ def directory(path):
 
 
 def register_arguments(manager):
-    '''
+    """
     Register arguments using given plugin manager.
 
     This method is called before `register_plugin`.
 
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
-    '''
+    """
 
     # Arguments are forwarded to argparse:ArgumentParser.add_argument,
     # https://docs.python.org/3.7/library/argparse.html#the-add-argument-method
@@ -87,12 +87,12 @@ def register_arguments(manager):
 
 
 def register_plugin(manager):
-    '''
+    """
     Register blueprints and actions using given plugin manager.
 
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
-    '''
+    """
     manager.register_blueprint(player)
     manager.register_mimetype_function(detect_playable_mimetype)
 
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index c354dcd..1536a02 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -16,11 +16,11 @@ from browsepy.file import Node, File, Directory, \
 
 
 class PLSFileParser(object):
-    '''
+    """
     ConfigParser wrapper accepting fallback on get for convenience.
 
     This wraps instead of inheriting due ConfigParse being classobj on python2.
-    '''
+    """
     NOT_SET = type('NotSetType', (object,), {})
     option_exceptions = (
         six.moves.configparser.NoSectionError,
diff --git a/browsepy/stream.py b/browsepy/stream.py
index a5a79b3..50c918a 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -11,13 +11,13 @@ from . import compat
 
 
 class ByteQueue(compat.Queue):
-    '''
+    """
     Small synchronized queue storing bytes, with an additional finish method
     with turns the queue :method:`get` into non-blocking (returns empty bytes).
 
     On a finished queue all :method:`put` will raise Full exceptions,
     regardless of the parameters given.
-    '''
+    """
     def _init(self, maxsize):
         self.queue = []
         self.bytes = 0
@@ -42,18 +42,18 @@ class ByteQueue(compat.Queue):
         return data
 
     def qsize(self):
-        '''
+        """
         Return the number of bytes in the queue.
-        '''
+        """
         with self.mutex:
             return self.bytes
 
     def finish(self):
-        '''
+        """
         Turn queue into finished mode: :method:`get` becomes non-blocking
         and returning empty bytes if empty, and :method:`put` raising
         :class:`queue.Full` exceptions unconditionally.
-        '''
+        """
         self.finished = True
 
         with self.not_full:
@@ -61,15 +61,15 @@ class ByteQueue(compat.Queue):
 
 
 class WriteAbort(Exception):
-    '''
+    """
     Exception used internally by :class:`TarFileStream`'s default
     implementation to stop tarfile compression.
-    '''
+    """
     pass
 
 
 class TarFileStream(compat.Iterator):
-    '''
+    """
     Iterator class which yields tarfile chunks for streaming.
 
     This class implements :class:`collections.abc.Iterator` interface
@@ -85,7 +85,7 @@ class TarFileStream(compat.Iterator):
     If your exclude function requires accessing to :data:`flask.app`,
     :data:`flask.g`, :data:`flask.request` or any other flask contexts,
     ensure is wrapped with :func:`flask.copy_current_request_context`
-    '''
+    """
 
     queue_class = ByteQueue
     abort_exception = WriteAbort
@@ -102,21 +102,21 @@ class TarFileStream(compat.Iterator):
 
     @property
     def name(self):
-        '''
+        """
         Filename generated from given path and compression method.
-        '''
+        """
         return '%s.%s' % (os.path.basename(self.path), self._extension)
 
     @property
     def encoding(self):
-        '''
+        """
         Mimetype parameters (such as encoding).
-        '''
+        """
         return self._compress
 
     def __init__(self, path, buffsize=10240, exclude=None, compress='gzip',
                  compresslevel=1):
-        '''
+        """
         Initialize thread and class (thread is not started until interation).
 
         Note that compress parameter will be ignored if buffsize is below 16.
@@ -131,7 +131,7 @@ class TarFileStream(compat.Iterator):
         :type compress: str or None
         :param compresslevel: compression level [1-9] defaults to 1 (fastest)
         :type compresslevel: int
-        '''
+        """
         self.path = path
         self.exclude = exclude
         self.closed = False
@@ -148,28 +148,28 @@ class TarFileStream(compat.Iterator):
 
     @property
     def _infofilter(self):
-        '''
+        """
         TarInfo filtering function based on :attr:`exclude`.
-        '''
+        """
         path = self.path
         path_join = os.path.join
         exclude = self.exclude
 
         def infofilter(info):
-            '''
+            """
             Filter TarInfo objects for TarFile.
 
             :param info:
             :type info: tarfile.TarInfo
             :return: infofile or None if file must be excluded
             :rtype: tarfile.TarInfo or None
-            '''
+            """
             return None if exclude(path_join(path, info.name)) else info
 
         return infofilter if exclude else None
 
     def _fill(self):
-        '''
+        """
         Writes data on internal tarfile instance, which writes to current
         object, using :meth:`write`.
 
@@ -177,7 +177,7 @@ class TarFileStream(compat.Iterator):
 
         This method is called automatically, on a thread, on initialization,
         so there is little need to call it manually.
-        '''
+        """
         try:
             with self.tarfile_class(
               fileobj=self,
@@ -194,14 +194,14 @@ class TarFileStream(compat.Iterator):
             self._queue.finish()
 
     def __next__(self):
-        '''
+        """
         Pulls chunk from tarfile (which is processed on its own thread).
 
         :param want: number bytes to read, defaults to 0 (all available)
         :type want: int
         :returns: tarfile data as bytes
         :rtype: bytes
-        '''
+        """
         if self.closed:
             raise StopIteration()
 
@@ -216,7 +216,7 @@ class TarFileStream(compat.Iterator):
         return data
 
     def write(self, data):
-        '''
+        """
         Put chunk of data into data queue, used on the tarfile thread.
 
         This method blocks when pipe is already, applying backpressure to
@@ -227,7 +227,7 @@ class TarFileStream(compat.Iterator):
         :returns: number of bytes written
         :rtype: int
         :raises WriteAbort: if already closed or closed while blocking
-        '''
+        """
         if self.closed:
             raise self.abort_exception()
 
@@ -239,9 +239,9 @@ class TarFileStream(compat.Iterator):
         return len(data)
 
     def close(self):
-        '''
+        """
         Closes tarfile pipe and stops further processing.
-        '''
+        """
         if not self.closed:
             self.closed = True
             self._queue.finish()
@@ -252,7 +252,7 @@ class TarFileStream(compat.Iterator):
 
 
 def stream_template(template_name, **context):
-    '''
+    """
     Some templates can be huge, this function returns an streaming response,
     sending the content in chunks and preventing from timeout.
 
@@ -260,7 +260,7 @@ def stream_template(template_name, **context):
     :param **context: parameters for templates.
     :yields: HTML strings
     :rtype: Iterator of str
-    '''
+    """
     app = context.get('current_app', flask.current_app)
     app.update_template_context(context)
     template = app.jinja_env.get_template(template_name)
diff --git a/browsepy/tests/deprecated/plugin/player.py b/browsepy/tests/deprecated/plugin/player.py
index be30474..07e7ab1 100644
--- a/browsepy/tests/deprecated/plugin/player.py
+++ b/browsepy/tests/deprecated/plugin/player.py
@@ -64,12 +64,12 @@ def detect_playable_mimetype(path, os_sep=os.sep):
 
 
 def register_plugin(manager):
-    '''
+    """
     Register blueprints and actions using given plugin manager.
 
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
-    '''
+    """
     manager.register_blueprint(player)
     manager.register_mimetype_function(detect_playable_mimetype)
 
diff --git a/browsepy/tests/meta.py b/browsepy/tests/meta.py
index 9ed086a..c9ee86e 100644
--- a/browsepy/tests/meta.py
+++ b/browsepy/tests/meta.py
@@ -2,7 +2,7 @@ from browsepy.compat import res
 
 
 class TestFileMeta(type):
-    '''
+    """
     This metaclass generates test methods for every file matching given
     rules (as class properties).
 
@@ -17,7 +17,7 @@ class TestFileMeta(type):
     - meta_module: module to inspect for files
     - meta_file_extensions: filename extensions will result on test injection.
     - meta_prefix: prefix added to injected tests (defaults to `file`)
-    '''
+    """
 
     resource_methods = (
         'contents',
diff --git a/browsepy/tests/test_code_quality.py b/browsepy/tests/test_code_quality.py
index a0b0b35..f5b3900 100644
--- a/browsepy/tests/test_code_quality.py
+++ b/browsepy/tests/test_code_quality.py
@@ -7,9 +7,8 @@ from . import meta
 
 
 class TestCodeFormat(six.with_metaclass(meta.TestFileMeta, unittest.TestCase)):
-    '''
-    pycodestyle unit test
-    '''
+    """pycodestyle unit test"""
+
     meta_module = 'browsepy'
     meta_prefix = 'code'
     meta_file_extensions = ('.py',)
diff --git a/browsepy/tests/test_main.py b/browsepy/tests/test_main.py
index cb88d3c..ed747b3 100644
--- a/browsepy/tests/test_main.py
+++ b/browsepy/tests/test_main.py
@@ -1,12 +1,15 @@
-import unittest
+
+import io
 import os
+import sys
 import os.path
+import unittest
 import tempfile
 import shutil
+import contextlib
 
 import browsepy
 import browsepy.__main__ as main
-import browsepy.compat as compat
 
 
 class TestMain(unittest.TestCase):
@@ -23,6 +26,16 @@ class TestMain(unittest.TestCase):
     def tearDown(self):
         shutil.rmtree(self.base)
 
+    @staticmethod
+    @contextlib.contextmanager
+    def stderr_ctx():
+        with io.StringIO() as f:
+            sys_sderr = sys.stderr
+            sys.stderr = f
+            yield f
+            if sys.stderr is f:
+                sys.stderr = sys_sderr
+
     def test_defaults(self):
         result = self.parser.parse_args([])
         self.assertEqual(result.host, '127.0.0.1')
@@ -83,19 +96,18 @@ class TestMain(unittest.TestCase):
         self.assertListEqual(result.exclude_from, [])
         self.assertListEqual(result.plugin, [])
 
-        with open(os.devnull, 'w') as f:
-            with compat.redirect_stderr(f):
-                self.assertRaises(
-                    SystemExit,
-                    self.parser.parse_args,
-                    ['--directory=%s' % __file__]
-                )
-
-                self.assertRaises(
-                    SystemExit,
-                    self.parser.parse_args,
-                    ['--exclude-from=non-existing']
-                )
+        with self.stderr_ctx():
+            self.assertRaises(
+                SystemExit,
+                self.parser.parse_args,
+                ['--directory=%s' % __file__]
+            )
+
+            self.assertRaises(
+                SystemExit,
+                self.parser.parse_args,
+                ['--exclude-from=non-existing']
+            )
 
     def test_exclude(self):
         result = self.parser.parse_args([
diff --git a/browsepy/transform/__init__.py b/browsepy/transform/__init__.py
index ec8af0b..409542d 100755
--- a/browsepy/transform/__init__.py
+++ b/browsepy/transform/__init__.py
@@ -1,7 +1,7 @@
 
 
 class StateMachine(object):
-    '''
+    """
     Abstract character-driven finite state machine implementation, used to
     chop down and transform strings.
 
@@ -9,7 +9,7 @@ class StateMachine(object):
 
     Important: when implementing this class, you must set the :attr:`current`
     attribute to a key defined in :attr:`jumps` dict.
-    '''
+    """
     jumps = {}  # finite state machine jumps
     start = ''  # character which started current state
     current = ''  # current state (an initial value must be set)
@@ -18,7 +18,7 @@ class StateMachine(object):
 
     @property
     def nearest(self):
-        '''
+        """
         Get the next state jump.
 
         The next jump is calculated looking at :attr:`current` state
@@ -29,7 +29,7 @@ class StateMachine(object):
 
         :returns: tuple with index, substring and next state label
         :rtype: tuple
-        '''
+        """
         try:
             options = self.jumps[self.current]
         except KeyError:
@@ -55,14 +55,14 @@ class StateMachine(object):
         return result
 
     def __init__(self, data=''):
-        '''
+        """
         :param data: content will be added to pending data
         :type data: str
-        '''
+        """
         self.pending += data
 
     def __iter__(self):
-        '''
+        """
         Yield over result chunks, consuming :attr:`pending` data.
 
         On :attr:`streaming` mode, yield only finished states.
@@ -72,7 +72,7 @@ class StateMachine(object):
 
         :yields: transformation result chunka
         :ytype: str
-        '''
+        """
         index, mark, next = self.nearest
         while next is not None:
             data = self.transform(self.pending[:index], mark, next)
@@ -90,7 +90,7 @@ class StateMachine(object):
                 yield data
 
     def transform(self, data, mark, next):
-        '''
+        """
         Apply the appropriate transformation function on current state data,
         which is supposed to end at this point.
 
@@ -107,31 +107,31 @@ class StateMachine(object):
 
         :returns: transformed data
         :rtype: str
-        '''
+        """
         method = getattr(self, 'transform_%s' % self.current, None)
         return method(data, mark, next) if method else data
 
     def feed(self, data=''):
-        '''
+        """
         Optionally add pending data, switch into streaming mode, and yield
         result chunks.
 
         :yields: result chunks
         :ytype: str
-        '''
+        """
         self.streaming = True
         self.pending += data
         for i in self:
             yield i
 
     def finish(self, data=''):
-        '''
+        """
         Optionally add pending data, turn off streaming mode, and yield
         result chunks, which implies all pending data will be consumed.
 
         :yields: result chunks
         :ytype: str
-        '''
+        """
         self.pending += data
         self.streaming = False
         for i in self:
diff --git a/browsepy/utils.py b/browsepy/utils.py
index d6dd38f..f7ffa2b 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -12,12 +12,12 @@ import flask
 
 
 def ppath(*args, **kwargs):
-    '''
+    """
     Get joined file path relative to module location.
 
     :param module: Module name
     :type module: str
-    '''
+    """
     module = get_module(kwargs.pop('module', __name__))
     if kwargs:
         raise TypeError(
@@ -30,28 +30,28 @@ def ppath(*args, **kwargs):
 
 @contextlib.contextmanager
 def dummy_context():
-    '''
+    """
     Context manager which does nothing besides exposing the context
     manger interface
-    '''
+    """
     yield
 
 
 def get_module(name):
-    '''
+    """
     Get module object by name.
 
     :param name: module name
     :type name: str
     :return: module or None if not found
     :rtype: module or None
-    '''
+    """
     __import__(name)
     return sys.modules.get(name, None)
 
 
 def random_string(size, sample=tuple(map(chr, range(256)))):
-    '''
+    """
     Get random string of given size.
 
     :param size: length of the returned string
@@ -60,34 +60,34 @@ def random_string(size, sample=tuple(map(chr, range(256)))):
     :type sample: tuple of str
     :returns: random string of specified size
     :rtype: str
-    '''
+    """
     randrange = functools.partial(random.randrange, 0, len(sample))
     return ''.join(sample[randrange()] for i in range(size))
 
 
 def solve_local(context_local):
-    '''
+    """
     Resolve given context local to its actual value. If given object
     it's not a context local nothing happens, just returns the same value.
-    '''
+    """
     if callable(getattr(context_local, '_get_current_object', None)):
         return context_local._get_current_object()
     return context_local
 
 
 def clear_localstack(stack):
-    '''
+    """
     Clear given werkzeug LocalStack instance.
 
     :param ctx: local stack instance
     :type ctx: werkzeug.local.LocalStack
-    '''
+    """
     while stack.pop():
         pass
 
 
 def clear_flask_context():
-    '''
+    """
     Clear flask current_app and request globals.
 
     When using :meth:`flask.Flask.test_client`, even as context manager,
@@ -96,13 +96,13 @@ def clear_flask_context():
 
     This function clean said globals, and should be called after testing
     with :meth:`flask.Flask.test_client`.
-    '''
+    """
     clear_localstack(flask._app_ctx_stack)
     clear_localstack(flask._request_ctx_stack)
 
 
 def defaultsnamedtuple(name, fields, defaults=None):
-    '''
+    """
     Generate namedtuple with default values.
 
     :param name: name
@@ -110,7 +110,7 @@ def defaultsnamedtuple(name, fields, defaults=None):
     :param defaults: iterable or mapping with field defaults
     :returns: defaultdict with given fields and given defaults
     :rtype: collections.defaultdict
-    '''
+    """
     nt = collections.namedtuple(name, fields)
     nt.__new__.__defaults__ = (None, ) * len(nt._fields)
     if isinstance(defaults, collections.Mapping):
diff --git a/browsepy/widget.py b/browsepy/widget.py
index 0ced542..bb43f42 100644
--- a/browsepy/widget.py
+++ b/browsepy/widget.py
@@ -1,10 +1,10 @@
 # -*- coding: UTF-8 -*-
-'''
+"""
 WARNING: deprecated module.
 
 API defined in this module has been deprecated in version 0.5 and it will be
 removed at 0.6.
-'''
+"""
 
 import warnings
 
diff --git a/doc/plugins.rst b/doc/plugins.rst
index ffa34de..7541d40 100644
--- a/doc/plugins.rst
+++ b/doc/plugins.rst
@@ -74,17 +74,17 @@ manager itself (type :class:`PluginManager`) as first parameter.
 Plugin manager exposes several methods to register widgets and mimetype
 detection functions.
 
-A *sregister_plugin*s function looks like this (taken from player plugin):
+A *sregister_plugin* function looks like this (taken from player plugin):
 
 .. code-block:: python
 
   def register_plugin(manager):
-      '''
+      """
       Register blueprints and actions using given plugin manager.
 
       :param manager: plugin manager
       :type manager: browsepy.manager.PluginManager
-      '''
+      """
       manager.register_blueprint(player)
       manager.register_mimetype_function(detect_playable_mimetype)
 
@@ -148,14 +148,14 @@ A simple `register_arguments` example (from player plugin):
 .. code-block:: python
 
   def register_arguments(manager):
-      '''
+      """
       Register arguments using given plugin manager.
 
       This method is called before `register_plugin`.
 
       :param manager: plugin manager
       :type manager: browsepy.manager.PluginManager
-      '''
+      """
 
       # Arguments are forwarded to argparse:ArgumentParser.add_argument,
       # https://docs.python.org/3.7/library/argparse.html#the-add-argument-method
@@ -191,7 +191,7 @@ Here is the "widget_types" for reference.
 .. code-block:: python
 
   class WidgetPluginManager(RegistrablePluginManager):
-      ''' ... '''
+      # ...
       widget_types = {
           'base': defaultsnamedtuple(
               'Widget',
@@ -219,6 +219,7 @@ Here is the "widget_types" for reference.
               'Html',
               ('place', 'type', 'html')),
       }
+      # ...
 
 Function :func:`browsepy.file.defaultsnamedtuple` is a
 :func:`collections.namedtuple` which uses a third argument dictionary
@@ -244,6 +245,50 @@ former case it is recommended to use
 :meth:`browsepy.file.Node.from_urlpath` static method to create the
 appropriate file/directory object (see :mod:`browsepy.file`).
 
+.. _plugins-exclude:
+
+File exclusions
+---------------
+
+Plugins can define their own file listing exclusion functions, so they can
+effectively control what it hidden when browsing, and excluded from
+directory tarballs.
+
+This is useful as plugins can now define hidden-file behaviors for user
+operations or disk-backed configuration files.
+
+
+.. code-block:: python
+
+    import os.path
+
+
+    def excluded_files(path):
+        """
+        Exclusion function for files in clipboard.
+
+        :param path: path to check
+        :type path: str
+        :return: wether path should be excluded or not
+        :rtype: str
+        """
+        return os.path.basename(path) == '.my-hidden-file':
+
+
+    def register_plugin(manager):
+        """
+        Register blueprints and actions using given plugin manager.
+
+        :param manager: plugin manager
+        :type manager: browsepy.manager.PluginManager
+        """
+        manager.register_exclude_function(excluded_files)
+
+
+Be careful when saving global state from an exclusion function using
+:module:`flask` contexts, as the request context is garanteed to be available
+to the function but not to be processed at this point.
+
 .. _plugins-considerations:
 
 Considerations
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index df20c96..7aed4ef 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -56,10 +56,9 @@ this list.
 
 ::
 
-  usage: browsepy [-h] [--directory PATH] [--initial PATH]
-                  [--removable PATH] [--upload PATH]
-                  [--exclude PATTERN] [--exclude-from PATH]
-                  [--plugin MODULE]
+  usage: browsepy [-h] [--help-all] [--directory PATH] [--initial PATH]
+                  [--removable PATH] [--upload PATH] [--exclude PATTERN]
+                  [--exclude-from PATH] [--version] [--plugin MODULE]
                   [host] [port]
 
   description: starts a browsepy web file browser
@@ -70,14 +69,20 @@ this list.
 
   optional arguments:
     -h, --help           show this help message and exit
-    --directory PATH     serving directory (default: current path)
+    --help-all           show help for all available plugins and exit
+    --directory PATH     serving directory (default: /my/current/path)
     --initial PATH       default directory (default: same as --directory)
-    --removable PATH     base directory allowing remove (default: none)
-    --upload PATH        base directory allowing upload (default: none)
+    --removable PATH     base directory allowing remove (default: None)
+    --upload PATH        base directory allowing upload (default: None)
     --exclude PATTERN    exclude paths by pattern (multiple)
     --exclude-from PATH  exclude paths by pattern file (multiple)
+    --version            show program's version number and exit
     --plugin MODULE      load plugin module (multiple)
 
+  available plugins:
+    file-actions, browsepy.plugin.file_actions
+    player, browsepy.plugin.player
+
 Showing help including player plugin arguments:
 
 .. code-block:: bash
@@ -89,10 +94,10 @@ Please note the extra parameters below `player arguments`.
 
 ::
 
-  usage: browsepy [-h] [--directory PATH] [--initial PATH]
-                  [--removable PATH] [--upload PATH]
-                  [--exclude PATTERN] [--exclude-from PATH]
-                  [--plugin MODULE] [--player-directory-play]
+  usage: browsepy [-h] [--help-all] [--directory PATH] [--initial PATH]
+                  [--removable PATH] [--upload PATH] [--exclude PATTERN]
+                  [--exclude-from PATH] [--version] [--plugin MODULE]
+                  [--player-directory-play]
                   [host] [port]
 
   description: starts a browsepy web file browser
@@ -103,14 +108,20 @@ Please note the extra parameters below `player arguments`.
 
   optional arguments:
     -h, --help            show this help message and exit
-    --directory PATH      serving directory (default: current path)
+    --help-all            show help for all available plugins and exit
+    --directory PATH     serving directory (default: /my/current/path)
     --initial PATH        default directory (default: same as --directory)
-    --removable PATH      base directory allowing remove (default: none)
-    --upload PATH         base directory allowing upload (default: none)
+    --removable PATH      base directory allowing remove (default: None)
+    --upload PATH         base directory allowing upload (default: None)
     --exclude PATTERN     exclude paths by pattern (multiple)
     --exclude-from PATH   exclude paths by pattern file (multiple)
+    --version             show program's version number and exit
     --plugin MODULE       load plugin module (multiple)
 
   player arguments:
     --player-directory-play
                           enable directories as playlist
+
+  available plugins:
+    file-actions, browsepy.plugin.file_actions
+    player, browsepy.plugin.player
-- 
GitLab


From 2679ab2122948b13b24b882ff4bef5a9917041f6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 4 Jul 2019 22:39:29 +0100
Subject: [PATCH 078/171] more cleanup

---
 .travis.yml             |  4 ----
 browsepy/compat.py      | 22 +++++++++++-----------
 doc/builtin_plugins.rst | 12 ++++++------
 doc/conf.py             |  1 -
 doc/index.rst           |  8 ++++----
 5 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3b448c3..868ec41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,6 @@ matrix:
     - sphinx=yes
 
 install:
-  - |
-    if [ "$legacy" != "yes" ]; then
-      pip install --upgrade pip setuptools
-    fi
   - pip install -r requirements/ci.txt
   - pip install .
   - |
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 1021281..f7a7f63 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -19,7 +19,7 @@ PY_LEGACY = sys.version_info < (3, )
 TRUE_VALUES = frozenset(('true', 'yes', '1', 'enable', 'enabled', True, 1))
 
 try:
-    import importlib.resources as res  # to support python >= 3.7
+    import importlib.resources as res  # python 3.7+
 except ImportError:
     import importlib_resources as res  # noqa
 
@@ -388,16 +388,6 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
         )
 
 
-class Iterator(BaseIterator):
-    def next(self):
-        """
-        Call :method:`__next__` for compatibility.
-
-        :returns: see :method:`__next__`
-        """
-        return self.__next__()
-
-
 if PY_LEGACY:
     class FileNotFoundError(BaseException):
         __metaclass__ = abc.ABCMeta
@@ -405,6 +395,15 @@ if PY_LEGACY:
     FileNotFoundError.register(OSError)
     FileNotFoundError.register(IOError)
 
+    class Iterator(BaseIterator):
+        def next(self):
+            """
+            Call :method:`__next__` for compatibility.
+
+            :returns: see :method:`__next__`
+            """
+            return self.__next__()
+
     range = xrange  # noqa
     filter = itertools.ifilter
     map = itertools.imap
@@ -414,6 +413,7 @@ if PY_LEGACY:
     bytes = str  # noqa
 else:
     FileNotFoundError = FileNotFoundError
+    Iterator = BaseIterator
     range = range
     filter = filter
     map = map
diff --git a/doc/builtin_plugins.rst b/doc/builtin_plugins.rst
index f5f2224..9ccdd8d 100644
--- a/doc/builtin_plugins.rst
+++ b/doc/builtin_plugins.rst
@@ -29,16 +29,16 @@ Sources are available at browsepy's `plugin.player`_ submodule.
 Contributing Builtin Plugins
 ----------------------------
 
-Browsepy's team is open to contributions of any kind, even about adding
-built-in plugins, as long as they comply with the following requirements:
+Browsepy's team is open to contributions of any kind, including built-in
+plugins, as long as they comply with the following requirements:
 
 * Plugins must be sufficiently covered by tests to avoid lowering browsepy's
-  overall test coverage.
-* Plugins must not add external requirements to browsepy, optional
-  requirements are allowed if plugin can work without them, even with
+  global test coverage.
+* Plugins must not add external requirements to browsepy, but optional
+  requirements will be allowed if plugin can work without them, even with
   limited functionality.
 * Plugins should avoid adding specific logic on browsepy itself, but extending
-  browsepy's itself (specially via plugin interface) in a generic and useful
+  browsepy itself (specially on the plugin interface) in a generic and useful
   way is definitely welcome.
 
 Said that, feel free to fork, code great stuff and fill pull requests at
diff --git a/doc/conf.py b/doc/conf.py
index e565472..4781e48 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -21,7 +21,6 @@ import os
 import io
 import re
 import sys
-import time
 
 sys.path.insert(0, os.path.abspath('..'))  # noqa
 
diff --git a/doc/index.rst b/doc/index.rst
index 1a2dc88..2bf57db 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -11,8 +11,8 @@ Welcome to browsepy's documentation. It's recommended to start reading both
 detailed tutorials about integrating :mod:`browsepy` as module or plugin
 development are also available.
 
-Browsepy has few dependencies: `Flask`_ and `Scandir`_. `Flask`_ is an awesome
-web microframework while `Scandir`_ is a directory listing library which `was
+Browsepy has few dependencies: `Flask`_ and `scandir`_. `Flask`_ is an awesome
+web microframework while `scandir`_ is a directory listing library which `was
 included <https://www.python.org/dev/peps/pep-0471/>`_ in Python 3.5's
 standard library.
 
@@ -26,11 +26,11 @@ If you want to dive into their documentation, check out the following links:
   <https://docs.python.org/3.5/library/os.html#os.scandir>`_
 
 .. _Flask: http://jinja.pocoo.org/
-.. _Scandir: http://werkzeug.pocoo.org/
+.. _scandir: http://werkzeug.pocoo.org/
 
 User's Guide
 ============
-Instructions for users, implementers and developers.
+Instructions for users, implementors and developers.
 
 .. toctree::
    :maxdepth: 2
-- 
GitLab


From 2a5e9a3c8204f8bd67e9391209513ce416fbfbe4 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 4 Jul 2019 22:48:01 +0100
Subject: [PATCH 079/171] small README changes

---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 8a2ef3f..a4768b7 100644
--- a/README.rst
+++ b/README.rst
@@ -25,7 +25,7 @@ browsepy
   :target: https://pypi.python.org/pypi/browsepy/
   :alt: Version: 0.5.6
 
-.. image:: https://img.shields.io/badge/python-2.7%2B%2C%203.4%2B-FFC100.svg?style=flat-square
+.. image:: https://img.shields.io/badge/python-2.7%2B%2C%203.5%2B-FFC100.svg?style=flat-square
   :target: https://pypi.python.org/pypi/browsepy/
   :alt: Python 2.7+, 3.5+
 
@@ -43,7 +43,7 @@ You can also build yourself from sphinx sources using the documentation
 License
 -------
 
-MIT. See `LICENSE`_.
+MIT License. See `LICENSE`_.
 
 .. _LICENSE: https://raw.githubusercontent.com/ergoithz/browsepy/master/LICENSE
 
@@ -198,7 +198,7 @@ Starting from version 0.6.0, browsepy a new plugin `file-actions` is included
 providing copy/cut/paste and directory creation operations.
 
 Plugins can add HTML content to browsepy's browsing view, using some
-convenience abstraction for already used elements like external stylesheet and
-javascript tags, links, buttons and file upload.
+convenience abstraction for frequently used elements like external stylesheets,
+javascript, links, buttons and file upload.
 
 More information at http://ergoithz.github.io/browsepy/plugins.html
-- 
GitLab


From fdcf2bc2f9f2980b96f8cf4be487f08bf6485a76 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 11:44:41 +0100
Subject: [PATCH 080/171] add gitlab-ci

---
 .gitlab-ci.yml | 160 +++++++++++++++++++++++++++++++++++++++++++++++++
 .travis.yml    |  68 ---------------------
 MANIFEST.in    |   5 ++
 Makefile       |  10 ----
 4 files changed, 165 insertions(+), 78 deletions(-)
 create mode 100644 .gitlab-ci.yml
 delete mode 100644 .travis.yml
 delete mode 100644 Makefile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..4193316
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,160 @@
+.test-base:
+  stage: test
+  variables:
+    PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
+    COVERAGE_FILE: "${CI_PROJECT_DIR}/.coverage.${CI_JOB_NAME}"
+  cache:
+    paths:
+    - .cache/pip
+  artifacts:
+    when: on_success
+    expire_in: 1h
+    paths:
+    - .coverage.*
+  before_script:
+  - apk add --no-cache build-base python3-dev
+  - pip install coverage
+  script:
+  - flake8 browsepy
+  - coverage run -p setup.py test
+
+.after-base:
+  image: python:3.7-alpine
+  variables:
+    PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
+  cache:
+    paths:
+    - .cache/pip
+
+.github-base:
+  image: alpine/git
+  before_script:
+  - mkdir -p ~/.ssh
+  - echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
+  - chmod 600 ~/.ssh/id_rsa
+  - ssh-keyscan -H $ssh_port "$ssh_host" >> ~/.ssh/known_hosts
+  - git config user.name "${GITLAB_USER_LOGIN}"
+  - git config user.email "${GITLAB_USER_EMAIL}"
+
+stages:
+- test
+- report
+- publish
+
+python27:
+  extends: .test-base
+  image: python:2.7-alpine
+  before_script:
+  - apk add --no-cache build-base python2-dev
+  - pip install coverage
+
+python35:
+  extends: .test-base
+  image: python:3.5-alpine
+
+python36:
+  extends: .test-base
+  image: python:3.6-alpine
+
+python37:
+  extends: .test-base
+  image: python:3.7-alpine
+
+node:
+  image: node:alpine
+  stage: test
+  cache:
+    paths:
+    - node_modules
+  before_script:
+  - npm install eslint
+  script:
+  - node_modules/.bin/eslint browsepy
+
+coverage:
+  extends: .after-base
+  stage: report
+  artifacts:
+    when: always
+    paths:
+    - htmlcov
+  coverage: '/^TOTAL\s+(?:\d+\s+)*(\d+\%)$/'
+  script:
+  - pip install coverage
+  - coverage combine
+  - coverage html --fail-under=0
+  - coverage report
+
+doc:
+  extends: .after-base
+  stage: report
+  dependencies: []
+  artifacts:
+    paths:
+    - doc/.build
+  before_script:
+  - pip install -r requirements/doc.txt
+  script:
+  - make -C doc html
+
+publish-github-mirror:
+  extends: .github-base
+  stage: publish
+  dependencies: []
+  only:
+    refs:
+    - next
+    - master
+  script:
+  - git remote add github git@github.com:ergoithz/browsepy.git
+  - git push github
+
+publish-github-pages:
+  extends: .github-base
+  stage: publish
+  dependencies:
+  - doc
+  only:
+    refs:
+    - master
+  script:
+  - git remote add github git@github.com:ergoithz/browsepy.git
+  - git fetch
+  - git checkout gh-pages
+  - cp -rf doc/.build/* .
+  - rm -rf doc
+  - git add **
+  - git commit -am "doc from ${CI_COMMIT_SHA} ${CI_COMMIT_MESSAGE}"
+  - git push github
+
+publish-alpha:
+  extends: .after-base
+  stage: publish
+  dependencies: []
+  only:
+    refs:
+    - next
+  before_script:
+  - pip install twine
+  script:
+  - |
+    ALPHA=$(date +%s)
+    SED_REGEX="s/^__version__\s*=\s*[\"']([^\"']+)[\"']\$/__version__ = '\\1a${ALPHA}'/g"
+    SED_PATH="unittest_resources/__init__.py"
+    sed -ri "${SED_REGEX}" "${SED_PATH}"
+    python setup.py bdist_wheel sdist
+    twine upload --repository-url=https://test.pypi.org/legacy/ dist/*
+
+publish:
+  extends: .after-base
+  stage: publish
+  dependencies: []
+  only:
+    refs:
+    - master
+  before_script:
+  - pip install twine
+  script:
+  - |
+    python setup.py bdist_wheel sdist
+    twine upload --repository-url=https://upload.pypi.org/legacy/ dist/*
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 868ec41..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-language: python
-
-addon:
-  apt:
-    nodejs
-
-matrix:
-  include:
-  - python: "2.7"
-  - python: "pypy"
-  - python: "pypy3"
-  - python: "3.5"
-  - python: "3.6"
-  - python: "3.7"
-    dist: xenial
-    env:
-    - eslint=yes
-    - sphinx=yes
-
-install:
-  - pip install -r requirements/ci.txt
-  - pip install .
-  - |
-    if [ "$eslint" = "yes" ]; then
-      nvm install stable
-      nvm use stable
-      npm install eslint
-    fi
-  - |
-    if [ "$sphinx" = "yes" ]; then
-      pip install -r requirements/doc.txt
-    fi
-
-script:
-  - flake8 browsepy
-  - coverage run setup.py test
-  - coverage report
-  - |
-    if [ "$eslint" = "yes" ]; then
-      node_modules/.bin/eslint browsepy
-    fi
-  - |
-    if [ "$sphinx" = "yes" ]; then
-      make -C doc html
-    fi
-
-after_success:
-  - codecov
-  - coveralls
-  - |
-    if [ "$sphinx" = "yes" ] && \
-       [ "$TRAVIS_BRANCH" = "master" ] && \
-       [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-      ghp-import \
-        --push \
-        --force \
-        --no-jekyll \
-        --branch=gh-pages \
-        --remote="https://${GH_TOKEN}@github.com${TRAVIS_REPO_SLUG}.git" \
-        doc/.build/html
-    fi
-
-notifications:
-  email: false
-
-cache:
-  directories:
-    - $HOME/.cache/pip
diff --git a/MANIFEST.in b/MANIFEST.in
index 0545255..78796c2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,12 @@
 include README.rst
+include LICENSE
+
 graft browsepy/templates
 graft browsepy/static
 graft browsepy/plugin/player/templates
 graft browsepy/plugin/player/static
 graft browsepy/plugin/file_actions/templates
 graft browsepy/plugin/file_actions/static
+
+global-exclude *.py[co]
+global-exclude __pycache__
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 56f2e1a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY: clean
-
-clean:
-	rm -rf \
-		build \
-		dist \
-		browsepy.egg-info
-	find browsepy -type f -name "*.py[co]" -delete
-	find browsepy -type d -name "__pycache__" -delete
-	$(MAKE) -C doc clean
-- 
GitLab


From bb93ae723234373919f8aac94006e0ea57a40139 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 11:48:00 +0100
Subject: [PATCH 081/171] add missing ci dependency

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4193316..3e16ba9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@
     - .coverage.*
   before_script:
   - apk add --no-cache build-base python3-dev
-  - pip install coverage
+  - pip install coverage flake8
   script:
   - flake8 browsepy
   - coverage run -p setup.py test
-- 
GitLab


From fb74a13a0800fb9b6c8b80a6e8869653682d9596 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 11:52:31 +0100
Subject: [PATCH 082/171] fix eslint

---
 .eslintrc.json                                | 2 +-
 browsepy/plugin/file_actions/static/script.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 668c8d9..d379fb1 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,7 +5,7 @@
   },
   "extends": "eslint:recommended",
   "parserOptions": {
-    "sourceType": "module"
+    "sourceType": "script"
   },
   "rules": {
     "indent": [
diff --git a/browsepy/plugin/file_actions/static/script.js b/browsepy/plugin/file_actions/static/script.js
index c26f09c..ffc6bf1 100644
--- a/browsepy/plugin/file_actions/static/script.js
+++ b/browsepy/plugin/file_actions/static/script.js
@@ -1,6 +1,6 @@
 (function() {
   function every(arr, fnc) {
-    for (let i = 0, l = arr.length; i < l; i++) {
+    for (var i = 0, l = arr.length; i < l; i++) {
       if (!fnc(arr[i], i, arr)) {
         return false;
       }
@@ -53,7 +53,7 @@
           .forEach(function (tr) {
             tr.className += ' clickable';
             event(tr, 'click', checkRow, checkbox, tr);
-            event(tr, 'selectstart', e => e.preventDefault());
+            event(tr, 'selectstart', function(e) {return e.preventDefault();});
           });
         check(checkbox);
       });
-- 
GitLab


From 7c8630a145b4b0235b148e9c0626d9fc9547c120 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 11:54:35 +0100
Subject: [PATCH 083/171] add missing flake8

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e16ba9..9fed602 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ python27:
   image: python:2.7-alpine
   before_script:
   - apk add --no-cache build-base python2-dev
-  - pip install coverage
+  - pip install coverage flake8
 
 python35:
   extends: .test-base
-- 
GitLab


From 2e43e2f0cbf59d54dbb40dec9b9cc045c091262d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 11:57:03 +0100
Subject: [PATCH 084/171] fix unused imports

---
 browsepy/file.py                         | 1 -
 browsepy/plugin/file_actions/__init__.py | 2 --
 2 files changed, 3 deletions(-)

diff --git a/browsepy/file.py b/browsepy/file.py
index eeab4a8..7c553e6 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -9,7 +9,6 @@ import string
 import random
 import datetime
 import logging
-import functools
 
 import flask
 
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index c896133..f27b8c5 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -1,7 +1,5 @@
 # -*- coding: UTF-8 -*-
 
-import functools
-
 from flask import Blueprint, render_template, request, redirect, url_for, \
                   session, current_app, g
 from werkzeug.exceptions import NotFound
-- 
GitLab


From 9f8cfe76fb0272fea12f2eaeb0d613fc6c08286f Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 12:58:14 +0100
Subject: [PATCH 085/171] avoid testing responses outside client context

---
 .gitlab-ci.yml                  |  2 +-
 browsepy/plugin/player/tests.py | 54 ++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9fed602..517646f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ python37:
   extends: .test-base
   image: python:3.7-alpine
 
-node:
+eslint:
   image: node:alpine
   stage: test
   cache:
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index a2c7003..b5b9abb 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -336,12 +336,6 @@ class TestBlueprint(TestPlayerBase):
         with self.app.app_context():
             return flask.url_for(endpoint, **kwargs)
 
-    def get(self, endpoint, **kwargs):
-        with self.app.test_client() as client:
-            url = self.url_for(endpoint, **kwargs)
-            response = client.get(url)
-        return response
-
     def file(self, path, data=''):
         apath = p(self.app.config['DIRECTORY_BASE'], path)
         with open(apath, 'w') as f:
@@ -355,31 +349,41 @@ class TestBlueprint(TestPlayerBase):
 
     def test_playable(self):
         name = 'test.mp3'
-        result = self.get('player.audio', path=name)
-        self.assertEqual(result.status_code, 404)
-        self.file(name)
-        result = self.get('player.audio', path=name)
-        self.assertEqual(result.status_code, 200)
+        url = self.url_for('player.audio', path=name)
+        with self.app.test_client() as client:
+            result = client.get(url)
+            self.assertEqual(result.status_code, 404)
+
+            self.file(name)
+            result = client.get(url)
+            self.assertEqual(result.status_code, 200)
 
     def test_playlist(self):
         name = 'test.m3u'
-        result = self.get('player.playlist', path=name)
-        self.assertEqual(result.status_code, 404)
-        self.file(name)
-        result = self.get('player.playlist', path=name)
-        self.assertEqual(result.status_code, 200)
+        url = self.url_for('player.playlist', path=name)
+        with self.app.test_client() as client:
+            result = client.get(url)
+            self.assertEqual(result.status_code, 404)
+
+            self.file(name)
+            result = client.get(url)
+            self.assertEqual(result.status_code, 200)
 
     def test_directory(self):
         name = 'directory'
-        result = self.get('player.directory', path=name)
-        self.assertEqual(result.status_code, 404)
-        self.directory(name)
-        result = self.get('player.directory', path=name)
-        self.assertEqual(result.status_code, 200)
-        self.file('directory/test.mp3')
-        result = self.get('player.directory', path=name)
-        self.assertEqual(result.status_code, 200)
-        self.assertIn(b'test.mp3', result.data)
+        url = self.url_for('player.directory', path=name)
+        with self.app.test_client() as client:
+            result = client.get(url)
+            self.assertEqual(result.status_code, 404)
+
+            self.directory(name)
+            result = client.get(url)
+            self.assertEqual(result.status_code, 200)
+
+            self.file('directory/test.mp3')
+            result = client.get(url)
+            self.assertEqual(result.status_code, 200)
+            self.assertIn(b'test.mp3', result.data)
 
     def test_endpoints(self):
         with self.app.app_context():
-- 
GitLab


From 9b6eb16b9eb269f728b2de99dd1d738457f452a6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 13:19:46 +0100
Subject: [PATCH 086/171] fix unicode error

---
 browsepy/tests/test_main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/tests/test_main.py b/browsepy/tests/test_main.py
index ed747b3..dad9adb 100644
--- a/browsepy/tests/test_main.py
+++ b/browsepy/tests/test_main.py
@@ -29,7 +29,7 @@ class TestMain(unittest.TestCase):
     @staticmethod
     @contextlib.contextmanager
     def stderr_ctx():
-        with io.StringIO() as f:
+        with io.BytesIO() as f:
             sys_sderr = sys.stderr
             sys.stderr = f
             yield f
-- 
GitLab


From 4d893185d5f6ce5bf3b5600bd0728a428ef344b2 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 14 Jul 2019 13:58:17 +0100
Subject: [PATCH 087/171] update tests

---
 .gitignore                          | 22 ++++-----
 browsepy/tests/meta.py              | 72 -----------------------------
 browsepy/tests/test_code.py         | 34 ++++++++++++++
 browsepy/tests/test_code_quality.py | 28 -----------
 browsepy/tests/test_main.py         |  8 ++--
 setup.py                            | 19 ++++----
 6 files changed, 60 insertions(+), 123 deletions(-)
 delete mode 100644 browsepy/tests/meta.py
 create mode 100644 browsepy/tests/test_code.py
 delete mode 100644 browsepy/tests/test_code_quality.py

diff --git a/.gitignore b/.gitignore
index 82e54ab..8d76b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,23 +2,21 @@
 .c9
 .idea
 .coverage
+
 htmlcov
 dist
 build
-doc/.build
-env
-env2
-env3
-wenv2
-wenv3
-penv2
-penv3
-.eggs
-browsepy.build
-browsepy.egg-info
-**/__pycache__
+env*
+wenv*
+package-lock.json
+
+**.build
+**.egg-info
 **.egg
 **.eggs
 **.egg-info
 **.pyc
+
 **/node_modules
+**/*.py[co]
+**/__pycache__
diff --git a/browsepy/tests/meta.py b/browsepy/tests/meta.py
deleted file mode 100644
index c9ee86e..0000000
--- a/browsepy/tests/meta.py
+++ /dev/null
@@ -1,72 +0,0 @@
-from browsepy.compat import res
-
-
-class TestFileMeta(type):
-    """
-    This metaclass generates test methods for every file matching given
-    rules (as class properties).
-
-    The added test methods will call an existing meta_test method passing
-    module name and filename as arguments.
-
-    Functions from :module:`importlib.resources` (see resource_methods) are
-    also injected for convenience.
-
-    Honored class properties:
-    - meta_test: called with module and filename by injected test methods.
-    - meta_module: module to inspect for files
-    - meta_file_extensions: filename extensions will result on test injection.
-    - meta_prefix: prefix added to injected tests (defaults to `file`)
-    """
-
-    resource_methods = (
-        'contents',
-        'is_resource',
-        'open_binary',
-        'open_text',
-        'path',
-        'read_binary',
-        'read_text',
-        )
-
-    @classmethod
-    def iter_contents(cls, module, extensions):
-        for item in res.contents(module):
-            if res.is_resource(module, item):
-                if any(map(item.endswith, extensions)):
-                    yield (module, item)
-                continue
-            submodule = '%s.%s' % (module, item)
-            try:
-                for subitem in cls.iter_contents(submodule, extensions):
-                    yield subitem
-            except ImportError:
-                pass
-
-    @classmethod
-    def create_method(cls, module, filename, prefix, extensions):
-        def test(self):
-            self.meta_test(module, filename)
-        strip = max(len(ext) for ext in extensions if filename.endswith(ext))
-        test.__name__ = 'test_%s_%s_%s' % (
-            prefix,
-            module.replace('.', '_').strip('_'),
-            filename[:-strip].strip('_'),
-            )
-        return test
-
-    def __init__(self, name, bases, dct):
-        super(TestFileMeta, self).__init__(name, bases, dct)
-
-        # generate tests from files
-        name = self.meta_module
-        prefix = getattr(self, 'meta_prefix', 'file')
-        extensions = self.meta_file_extensions
-        for module, item in self.iter_contents(name, extensions):
-            test = self.create_method(module, item, prefix, extensions)
-            setattr(self, test.__name__, test)
-
-        # add resource methods
-        for method in self.resource_methods:
-            if not hasattr(self, method):
-                setattr(self, method, staticmethod(getattr(res, method)))
diff --git a/browsepy/tests/test_code.py b/browsepy/tests/test_code.py
new file mode 100644
index 0000000..5146df2
--- /dev/null
+++ b/browsepy/tests/test_code.py
@@ -0,0 +1,34 @@
+
+import unittest_resources.testing as bases
+
+
+class TypingTestCase(bases.TypingTestCase):
+    """TestCase checking :module:`mypy`."""
+
+    meta_module = 'browsepy'
+
+
+class CodeStyleTestCase(bases.CodeStyleTestCase):
+    """TestCase checking :module:`pycodestyle`."""
+
+    meta_module = 'browsepy'
+
+
+class DocStyleTestCase(bases.DocStyleTestCase):
+    """TestCase checking :module:`pydocstyle`."""
+
+    meta_module = 'browsepy'
+
+
+class MaintainabilityIndexTestCase(bases.MaintainabilityIndexTestCase):
+    """TestCase checking :module:`radon` maintainability index."""
+
+    meta_module = 'browsepy'
+
+
+class CodeComplexityTestCase(bases.CodeComplexityTestCase):
+    """TestCase checking :module:`radon` code complexity."""
+
+    meta_module = 'browsepy'
+    max_class_complexity = 7
+    max_function_complexity = 7
diff --git a/browsepy/tests/test_code_quality.py b/browsepy/tests/test_code_quality.py
deleted file mode 100644
index f5b3900..0000000
--- a/browsepy/tests/test_code_quality.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import unittest
-
-import six
-import pycodestyle
-
-from . import meta
-
-
-class TestCodeFormat(six.with_metaclass(meta.TestFileMeta, unittest.TestCase)):
-    """pycodestyle unit test"""
-
-    meta_module = 'browsepy'
-    meta_prefix = 'code'
-    meta_file_extensions = ('.py',)
-
-    def meta_test(self, module, filename):
-        style = pycodestyle.StyleGuide(quiet=False)
-        with self.path(module, filename) as f:
-            result = style.check_files([str(f)])
-        self.assertFalse(result.total_errors, (
-            'Found {errors} code style error{s} (or warning{s}) '
-            'on module {module}, file {filename!r}.').format(
-                errors=result.total_errors,
-                s='s' if result.total_errors > 1 else '',
-                module=module,
-                filename=filename,
-                )
-            )
diff --git a/browsepy/tests/test_main.py b/browsepy/tests/test_main.py
index dad9adb..4bf1eaf 100644
--- a/browsepy/tests/test_main.py
+++ b/browsepy/tests/test_main.py
@@ -10,10 +10,12 @@ import contextlib
 
 import browsepy
 import browsepy.__main__ as main
+import browsepy.compat as compat
 
 
 class TestMain(unittest.TestCase):
     module = main
+    stream_class = io.BytesIO if compat.PY_LEGACY else io.StringIO
 
     def setUp(self):
         self.app = browsepy.app
@@ -26,10 +28,10 @@ class TestMain(unittest.TestCase):
     def tearDown(self):
         shutil.rmtree(self.base)
 
-    @staticmethod
+    @classmethod
     @contextlib.contextmanager
-    def stderr_ctx():
-        with io.BytesIO() as f:
+    def stderr_ctx(cls):
+        with cls.stream_class() as f:
             sys_sderr = sys.stderr
             sys.stderr = f
             yield f
diff --git a/setup.py b/setup.py
index 7f33865..c812a68 100644
--- a/setup.py
+++ b/setup.py
@@ -57,19 +57,22 @@ setup(
             'static/*',
             ],
         },
+    setup_requires=[
+        'setuptools>36.2',
+        ],
     install_requires=[
         'flask',
         'unicategories',
         'cookieman',
-        'backports.shutil_get_terminal_size ; python_version<\'3.3\'',
-        'scandir ; python_version<\'3.5\'',
-        'pathlib2 ; python_version<\'3.5\'',
-        'importlib_resources ; python_version<\'3.7\'',
+        'backports.shutil_get_terminal_size ; python_version<"3.3"',
+        'scandir ; python_version<"3.5"',
+        'pathlib2 ; python_version<"3.5"',
+        'importlib-resources ; python_version<"3.7"',
+        ],
+    tests_require=[
+        'beautifulsoup4',
+        'unittest-resources',
         ],
-    extras_require={
-        'tests': ['beautifulsoup4', 'pycodestyle'],
-        },
-    tests_require=['beautifulsoup4', 'pycodestyle'],
     test_suite='browsepy.tests',
     test_runner='browsepy.tests.runner:DebuggerTextTestRunner',
     zip_safe=False,
-- 
GitLab


From bbbd32bf3bed6ffb7e74df7ad0fb90b5c501f2fd Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 15:48:55 +0100
Subject: [PATCH 088/171] fix default argument parser

---
 browsepy/manager.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/browsepy/manager.py b/browsepy/manager.py
index edecafe..70e8f60 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -570,6 +570,13 @@ class ArgumentPluginManager(PluginManagerBase):
     _argparse_kwargs = {'add_help': False}
     _argparse_arguments = argparse.Namespace()
 
+    @cached_property
+    def _default_argument_parser(self):
+        parser = compat.SafeArgumentParser()
+        parser.add_argument('--plugin', action='append', default=[])
+        parser.add_argument('--help-all', action='store_true')
+        return parser
+
     def __init__(self, app=None):
         super(ArgumentPluginManager, self).__init__(app)
         self.plugin_filters.append(
@@ -593,12 +600,6 @@ class ArgumentPluginManager(PluginManagerBase):
             return manager._argparse_argkwargs
         return ()
 
-    def _default_argument_parser(self):
-        parser = compat.SafeArgumentParser()
-        parser.add_argument('--plugin', action='append', default=[])
-        parser.add_argument('--help-all', action='store_true')
-        return parser
-
     def _plugin_argument_parser(self, base=None):
         plugins = self.available_plugins
         parent = base or self._default_argument_parser
-- 
GitLab


From 80fadb8884ccebd14982854d62d2311b8b5025cd Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 15:58:56 +0100
Subject: [PATCH 089/171] do not use h3 on autosubmit form

---
 browsepy/static/base.css       | 26 +++++++++-----------------
 browsepy/templates/browse.html |  2 +-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index a335628..e13913b 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -60,22 +60,20 @@ a:active {
   color: #666;
 }
 
-form.autosubmit h3 {
-  font-size: 1em;
-  font-weight: normal;
-  margin: 0;
-  display: none;
-}
-html.autosubmit-support form.autosubmit h3 {
-  display: inline-block;
-}
-
 form.autosubmit label {
   border-radius: 0.25em;
   display: inline-block;
   vertical-align: middle;
 }
 
+form.autosubmit label span {
+  display: none;
+}
+
+html.autosubmit-support form.autosubmit label span {
+  display: inline-block;
+}
+
 form.autosubmit input{
   margin: 0;
 }
@@ -99,13 +97,7 @@ form.autosubmit input[type=submit] {
 
 html.autosubmit-support form.autosubmit input{
   position: fixed;
-  top: -500px;
-}
-
-html.autosubmit-support form.autosubmit h2{
-  font-size: 1em;
-  font-weight: normal;
-  padding: 0;
+  top: -10em;
 }
 
 table.browser {
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index 4710d6b..5773176 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -24,7 +24,7 @@
           action="{{ widget.action or url_for(widget.endpoint, path=file.urlpath) }}"
           enctype="multipart/form-data">
       <label>
-        <h3>{{ widget.text or 'Upload' }}</h3>
+        <span>{{ widget.text or 'Upload' }}</span>
         <input class="button text suggested" type="file" name="file[]" multiple=""/>
       </label>
       <input class="button text" type="submit" value="{{ widget.text or 'Upload' }}"/>
-- 
GitLab


From cae63219a7648924fe161df198561a31dff60049 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 16:09:36 +0100
Subject: [PATCH 090/171] more consistent button spacing

---
 browsepy/static/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index e13913b..68fd186 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -295,7 +295,7 @@ header form.autosubmit,
 footer a.button,
 footer input.button,
 footer form.autosubmit {
-  margin: 0 0.5em 0.5em 0;
+  margin: 0.5em 3px 0.5em 0;
 }
 
 a.button:last-child,
-- 
GitLab


From 7c34e94e5dfb78362ed8ce0b0166ce07ba8a820a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 16:14:02 +0100
Subject: [PATCH 091/171] revert button spacing

---
 browsepy/static/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index 68fd186..cdd7248 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -295,7 +295,7 @@ header form.autosubmit,
 footer a.button,
 footer input.button,
 footer form.autosubmit {
-  margin: 0.5em 3px 0.5em 0;
+  margin: 0 0.5em 0.5em 1px;
 }
 
 a.button:last-child,
-- 
GitLab


From c9a8fb4c8b4cb17012f25c2a5f914b9c69042ee8 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 16:42:22 +0100
Subject: [PATCH 092/171] fix missing ci install

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 517646f..aa18eb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,8 +79,9 @@ coverage:
     paths:
     - htmlcov
   coverage: '/^TOTAL\s+(?:\d+\s+)*(\d+\%)$/'
+  before_script:
+    - pip install coverage
   script:
-  - pip install coverage
   - coverage combine
   - coverage html --fail-under=0
   - coverage report
@@ -93,6 +94,7 @@ doc:
     paths:
     - doc/.build
   before_script:
+  - apk add --no-cache make
   - pip install -r requirements/doc.txt
   script:
   - make -C doc html
-- 
GitLab


From 45507888541cf23acf08b02923c247ceb75f2741 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 17:07:54 +0100
Subject: [PATCH 093/171] fix bad ci yml references

---
 .gitlab-ci.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa18eb2..afbf5d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@
   variables:
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
     COVERAGE_FILE: "${CI_PROJECT_DIR}/.coverage.${CI_JOB_NAME}"
+    MODULE: browsepy
   cache:
     paths:
     - .cache/pip
@@ -15,19 +16,22 @@
   - apk add --no-cache build-base python3-dev
   - pip install coverage flake8
   script:
-  - flake8 browsepy
+  - flake8 ${MODULE}
   - coverage run -p setup.py test
 
 .after-base:
   image: python:3.7-alpine
   variables:
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
+    MODULE: browsepy
   cache:
     paths:
     - .cache/pip
 
 .github-base:
   image: alpine/git
+  variables:
+    GITHUB_MIRROR: git@github.com:ergoithz/browsepy.git
   before_script:
   - mkdir -p ~/.ssh
   - echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
@@ -69,7 +73,7 @@ eslint:
   before_script:
   - npm install eslint
   script:
-  - node_modules/.bin/eslint browsepy
+  - node_modules/.bin/eslint ${MODULE}
 
 coverage:
   extends: .after-base
@@ -108,7 +112,7 @@ publish-github-mirror:
     - next
     - master
   script:
-  - git remote add github git@github.com:ergoithz/browsepy.git
+  - git remote add github "${GITHUB_MIRROR}"
   - git push github
 
 publish-github-pages:
@@ -120,7 +124,7 @@ publish-github-pages:
     refs:
     - master
   script:
-  - git remote add github git@github.com:ergoithz/browsepy.git
+  - git remote add github "${GITHUB_MIRROR}"
   - git fetch
   - git checkout gh-pages
   - cp -rf doc/.build/* .
@@ -142,7 +146,7 @@ publish-alpha:
   - |
     ALPHA=$(date +%s)
     SED_REGEX="s/^__version__\s*=\s*[\"']([^\"']+)[\"']\$/__version__ = '\\1a${ALPHA}'/g"
-    SED_PATH="unittest_resources/__init__.py"
+    SED_PATH="${MODULE}/__init__.py"
     sed -ri "${SED_REGEX}" "${SED_PATH}"
     python setup.py bdist_wheel sdist
     twine upload --repository-url=https://test.pypi.org/legacy/ dist/*
-- 
GitLab


From 57dfb44fb0625f4d03dc0fb9ab0c7bc290e6a6f9 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 17:36:05 +0100
Subject: [PATCH 094/171] update requirements, improve ci

---
 .gitlab-ci.yml               | 13 ++++++++++++-
 requirements/base.txt        |  2 +-
 requirements/ci.txt          | 26 --------------------------
 requirements/development.txt |  7 ++-----
 setup.py                     |  3 ++-
 5 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 requirements/ci.txt

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afbf5d0..bf5f171 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,12 @@
   cache:
     paths:
     - .cache/pip
+  only:
+    changes:
+    - "**.py"
+    - "**.html"
+    - "**.cfg"
+    - MANIFEST.in
   artifacts:
     when: on_success
     expire_in: 1h
@@ -31,7 +37,7 @@
 .github-base:
   image: alpine/git
   variables:
-    GITHUB_MIRROR: git@github.com:ergoithz/browsepy.git
+    GITHUB_MIRROR: "git@github.com:ergoithz/browsepy.git"
   before_script:
   - mkdir -p ~/.ssh
   - echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
@@ -70,6 +76,11 @@ eslint:
   cache:
     paths:
     - node_modules
+  only:
+    changes:
+    - "**.json"
+    - "**.js"
+    - .eslintignore
   before_script:
   - npm install eslint
   script:
diff --git a/requirements/base.txt b/requirements/base.txt
index 5d1f523..e7eddbf 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -12,12 +12,12 @@
 # - requirements/development.txt
 #
 
+six
 flask
 cookieman
 unicategories
 
 # compat
-six
 backports.shutil_get_terminal_size ; python_version<'3.3'
 scandir ; python_version<'3.5'
 pathlib2 ; python_version<'3.5'
diff --git a/requirements/ci.txt b/requirements/ci.txt
deleted file mode 100644
index c6aa8f1..0000000
--- a/requirements/ci.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Continuous-integration requirements file
-# ========================================
-#
-# This module includes all requirements for continuous-integration tasks
-# (see .travis.yml).
-#
-# Requirement file inheritance tree
-# ---------------------------------
-#
-# - requirements/ci.txt
-#   - requirements/development.txt
-#     - requirements/base.txt
-#
-# See also
-# --------
-#
-# - requirements.txt
-# - requirements/development.txt
-#
-
--r development.txt
-
-ghp-import
-codecov
-coveralls
diff --git a/requirements/development.txt b/requirements/development.txt
index cd9a5cd..0d5ffce 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -22,22 +22,19 @@
 
 -r base.txt
 
-# linting
+# lint and test
 flake8
-doc8
 yapf
 coverage
 jedi
-
-# dev
 sphinx
 pycodestyle
+pydocstyle
 importlib_resources  # pycodestyle unittest with python < 3.7
 six  # compatible metaclass with python 2-3
 pyyaml
 beautifulsoup4
 
 # dist
-setuptools
 wheel
 twine
diff --git a/setup.py b/setup.py
index c812a68..35441a0 100644
--- a/setup.py
+++ b/setup.py
@@ -61,9 +61,10 @@ setup(
         'setuptools>36.2',
         ],
     install_requires=[
+        'six',
         'flask',
-        'unicategories',
         'cookieman',
+        'unicategories',
         'backports.shutil_get_terminal_size ; python_version<"3.3"',
         'scandir ; python_version<"3.5"',
         'pathlib2 ; python_version<"3.5"',
-- 
GitLab


From 12e76a024b54260183285dcccedd664b8f4bc580 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 17:44:13 +0100
Subject: [PATCH 095/171] fix bad git image usage

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf5f171..17262c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,10 @@
     - .cache/pip
 
 .github-base:
-  image: alpine/git
+  image:
+    name: alpine/git
+    entrypoint:
+    - /bin/sh
   variables:
     GITHUB_MIRROR: "git@github.com:ergoithz/browsepy.git"
   before_script:
-- 
GitLab


From 82af32122660e43eb4728095de488627ad4e14e1 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 17:48:20 +0100
Subject: [PATCH 096/171] unoptomize ci until coverage issue get solved

---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17262c6..775ac3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,6 @@
   cache:
     paths:
     - .cache/pip
-  only:
-    changes:
-    - "**.py"
-    - "**.html"
-    - "**.cfg"
-    - MANIFEST.in
   artifacts:
     when: on_success
     expire_in: 1h
-- 
GitLab


From 2f46ee8759d618e5920bc580956a612e253baf83 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 17:58:45 +0100
Subject: [PATCH 097/171] appveyor fixes

---
 .appveyor.yml                   | 26 ++++++++------------------
 browsepy/plugin/player/tests.py |  2 +-
 browsepy/tests/test_app.py      |  4 ++--
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 54f91e3..8f359aa 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,45 +1,35 @@
 environment:
   matrix:
     - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
+      PYTHON_VERSION: "2.7.16"
       PYTHON_ARCH: "32"
 
     - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x" # currently 2.7.9
+      PYTHON_VERSION: "2.7.16"
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.x" # currently 3.4.3
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.x" # currently 3.4.3
-      PYTHON_ARCH: "64"
-
-    # Python versions not pre-installed
-
     - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.3"
+      PYTHON_VERSION: "3.5.7"
       PYTHON_ARCH: "32"
 
     - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.3"
+      PYTHON_VERSION: "3.5.7"
       PYTHON_ARCH: "64"
 
     - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6.1"
+      PYTHON_VERSION: "3.6.9"
       PYTHON_ARCH: "32"
 
     - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.1"
+      PYTHON_VERSION: "3.6.9"
       PYTHON_ARCH: "64"
 
     - PYTHON: "C:\\Python37"
-      PYTHON_VERSION: "3.7.1"
+      PYTHON_VERSION: "3.7.4"
       PYTHON_ARCH: "32"
 
     - PYTHON: "C:\\Python37-x64"
-      PYTHON_VERSION: "3.7.1"
+      PYTHON_VERSION: "3.7.4"
       PYTHON_ARCH: "64"
 
 build: off
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index b5b9abb..52f70b5 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -49,7 +49,7 @@ class TestPLSFileParser(unittest.TestCase):
     exceptions = player_playable.PLSFileParser.option_exceptions
 
     def get_parser(self, content=''):
-        with tempfile.NamedTemporaryFile(mode='w') as f:
+        with tempfile.NamedTemporaryFile(mode='w', suffix='.pls') as f:
             f.write(content)
             f.flush()
             return self.module.PLSFileParser(f.name)
diff --git a/browsepy/tests/test_app.py b/browsepy/tests/test_app.py
index cf30aee..6916b18 100644
--- a/browsepy/tests/test_app.py
+++ b/browsepy/tests/test_app.py
@@ -16,8 +16,8 @@ class TestApp(unittest.TestCase):
         self.app.config._warned.clear()
 
     def test_config(self):
-        with tempfile.NamedTemporaryFile() as f:
-            f.write(b'DIRECTORY_DOWNLOADABLE = False\n')
+        with tempfile.NamedTemporaryFile(mode='w', suffix='.pls') as f:
+            f.write('DIRECTORY_DOWNLOADABLE = False\n')
             f.flush()
 
             os.environ['BROWSEPY_TEST_SETTINGS'] = f.name
-- 
GitLab


From b03126cd7e54ffee818b555f1437404f8d23d35a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 31 Jul 2019 17:59:19 +0100
Subject: [PATCH 098/171] fix typo

---
 browsepy/tests/test_app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/tests/test_app.py b/browsepy/tests/test_app.py
index 6916b18..63bb9df 100644
--- a/browsepy/tests/test_app.py
+++ b/browsepy/tests/test_app.py
@@ -16,7 +16,7 @@ class TestApp(unittest.TestCase):
         self.app.config._warned.clear()
 
     def test_config(self):
-        with tempfile.NamedTemporaryFile(mode='w', suffix='.pls') as f:
+        with tempfile.NamedTemporaryFile(mode='w', suffix='.py') as f:
             f.write('DIRECTORY_DOWNLOADABLE = False\n')
             f.flush()
 
-- 
GitLab


From cf2e11fdd0e4c2fd3116f57325a6cd0a2d6d913a Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 09:20:07 +0000
Subject: [PATCH 099/171] try -again- to get gitlab-ci to behave

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 775ac3f..949833e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@
     name: alpine/git
     entrypoint:
     - /bin/sh
+    - -c
   variables:
     GITHUB_MIRROR: "git@github.com:ergoithz/browsepy.git"
   before_script:
-- 
GitLab


From 196ae6a9f32d78188a64d1c145ce39c5a577a98f Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 10:32:49 +0100
Subject: [PATCH 100/171] try to avoid hasefroch filesystem limitations

---
 .gitignore                      |  1 +
 .vscode/settings.json           | 27 ---------------------------
 browsepy/plugin/player/tests.py |  9 +++++----
 browsepy/tests/test_app.py      |  9 +++++----
 4 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index 8d76b59..4099e7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .c9
 .idea
 .coverage
+.vscode
 
 htmlcov
 dist
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 6b2ba5b..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "editor.rulers": [
-        72,
-        79
-    ],
-    "editor.tabSize": 4,
-    "files.trimTrailingWhitespace": true,
-    "files.insertFinalNewline": true,
-    "python.formatting.provider": "yapf",
-    "python.testing.unittestEnabled": true,
-    "python.linting.flake8Enabled": true,
-    "python.linting.enabled": true,
-    "python.linting.pep8Enabled": true,
-    "python.linting.pep8Path": "pycodestyle",
-    "python.linting.pylintEnabled": false,
-    "python.jediEnabled": true,
-    "python.pythonPath": "env/bin/python",
-    "python.testing.unittestArgs": [
-        "-v",
-        "-s",
-        "./browsepy/tests",
-        "-p",
-        "test_*.py"
-    ],
-    "python.testing.pytestEnabled": false,
-    "python.testing.nosetestsEnabled": false
-}
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 52f70b5..719d40e 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -49,10 +49,11 @@ class TestPLSFileParser(unittest.TestCase):
     exceptions = player_playable.PLSFileParser.option_exceptions
 
     def get_parser(self, content=''):
-        with tempfile.NamedTemporaryFile(mode='w', suffix='.pls') as f:
-            f.write(content)
-            f.flush()
-            return self.module.PLSFileParser(f.name)
+        with tempfile.TemporaryDirectory() as path:
+            name = os.path.join(path, 'file.pls')
+            with open(name, 'w') as f:
+                f.write(content)
+            return self.module.PLSFileParser(name)
 
     def test_getint(self):
         parser = self.get_parser()
diff --git a/browsepy/tests/test_app.py b/browsepy/tests/test_app.py
index 63bb9df..73f0134 100644
--- a/browsepy/tests/test_app.py
+++ b/browsepy/tests/test_app.py
@@ -16,11 +16,12 @@ class TestApp(unittest.TestCase):
         self.app.config._warned.clear()
 
     def test_config(self):
-        with tempfile.NamedTemporaryFile(mode='w', suffix='.py') as f:
-            f.write('DIRECTORY_DOWNLOADABLE = False\n')
-            f.flush()
+        with tempfile.TemporaryDirectory() as path:
+            name = os.path.join(path, 'file.py')
+            with open(name, 'w') as f:
+                f.write('DIRECTORY_DOWNLOADABLE = False\n')
 
-            os.environ['BROWSEPY_TEST_SETTINGS'] = f.name
+            os.environ['BROWSEPY_TEST_SETTINGS'] = name
             with warnings.catch_warnings(record=True) as warns:
                 warnings.simplefilter('always')
                 self.app.config['directory_downloadable'] = True
-- 
GitLab


From c5579f9edf22d208489341690ec88168cb0b1df3 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 10:36:39 +0100
Subject: [PATCH 101/171] set ref on github mirroring

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 949833e..67eae68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,7 +122,7 @@ publish-github-mirror:
     - master
   script:
   - git remote add github "${GITHUB_MIRROR}"
-  - git push github
+  - git push -u "${CI_COMMIT_REF_NAME}" github
 
 publish-github-pages:
   extends: .github-base
-- 
GitLab


From 82b0ef14dc4ccee4fe251b0bf14640a947477a1a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 10:58:17 +0100
Subject: [PATCH 102/171] replace tempdir.TemporaryDirectory by compat

---
 browsepy/plugin/player/tests.py | 25 ++++++-------------------
 browsepy/tests/test_app.py      |  4 ++--
 requirements/development.txt    |  2 --
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 719d40e..e358337 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -3,7 +3,6 @@
 import os
 import os.path
 import unittest
-import shutil
 import tempfile
 
 import six
@@ -13,6 +12,7 @@ import flask
 from werkzeug.exceptions import NotFound
 
 import browsepy
+import browsepy.compat as compat
 import browsepy.utils as utils
 import browsepy.file as browsepy_file
 import browsepy.manager as browsepy_manager
@@ -49,7 +49,7 @@ class TestPLSFileParser(unittest.TestCase):
     exceptions = player_playable.PLSFileParser.option_exceptions
 
     def get_parser(self, content=''):
-        with tempfile.TemporaryDirectory() as path:
+        with compat.mkdtemp() as path:
             name = os.path.join(path, 'file.pls')
             with open(name, 'w') as f:
                 f.write(content)
@@ -229,8 +229,7 @@ class TestPlayable(TestIntegrationBase):
             self.assertEqual(pf.title, 'asdf.%s' % ext)
 
     def test_playabledirectory(self):
-        tmpdir = tempfile.mkdtemp()
-        try:
+        with compat.mkdtemp() as tmpdir:
             file = p(tmpdir, 'playable.mp3')
             open(file, 'w').close()
             node = browsepy_file.Directory(tmpdir, app=self.app)
@@ -247,9 +246,6 @@ class TestPlayable(TestIntegrationBase):
             os.remove(file)
             self.assertFalse(self.module.PlayableDirectory.detect(node))
 
-        finally:
-            shutil.rmtree(tmpdir)
-
     def test_playlistfile(self):
         pf = self.module.PlayListFile.from_urlpath(
             path='filename.m3u', app=self.app)
@@ -263,8 +259,7 @@ class TestPlayable(TestIntegrationBase):
 
     def test_m3ufile(self):
         data = '/base/valid.mp3\n/outside.ogg\n/base/invalid.bin\nrelative.ogg'
-        tmpdir = tempfile.mkdtemp()
-        try:
+        with compat.mkdtemp() as tmpdir:
             file = p(tmpdir, 'playable.m3u')
             with open(file, 'w') as f:
                 f.write(data)
@@ -273,8 +268,6 @@ class TestPlayable(TestIntegrationBase):
                 [a.path for a in playlist.entries()],
                 [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
                 )
-        finally:
-            shutil.rmtree(tmpdir)
 
     def test_plsfile(self):
         data = (
@@ -284,8 +277,7 @@ class TestPlayable(TestIntegrationBase):
             'File3=/base/invalid.bin\n'
             'File4=relative.ogg'
             )
-        tmpdir = tempfile.mkdtemp()
-        try:
+        with compat.mkdtemp() as tmpdir:
             file = p(tmpdir, 'playable.pls')
             with open(file, 'w') as f:
                 f.write(data)
@@ -294,8 +286,6 @@ class TestPlayable(TestIntegrationBase):
                 [a.path for a in playlist.entries()],
                 [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
                 )
-        finally:
-            shutil.rmtree(tmpdir)
 
     def test_plsfile_with_holes(self):
         data = (
@@ -305,8 +295,7 @@ class TestPlayable(TestIntegrationBase):
             'File4=relative.ogg\n'
             'NumberOfEntries=4'
             )
-        tmpdir = tempfile.mkdtemp()
-        try:
+        with compat.mkdtemp() as tmpdir:
             file = p(tmpdir, 'playable.pls')
             with open(file, 'w') as f:
                 f.write(data)
@@ -315,8 +304,6 @@ class TestPlayable(TestIntegrationBase):
                 [a.path for a in playlist.entries()],
                 [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
                 )
-        finally:
-            shutil.rmtree(tmpdir)
 
 
 class TestBlueprint(TestPlayerBase):
diff --git a/browsepy/tests/test_app.py b/browsepy/tests/test_app.py
index 73f0134..cda25e5 100644
--- a/browsepy/tests/test_app.py
+++ b/browsepy/tests/test_app.py
@@ -1,10 +1,10 @@
 import os
 import os.path
 import unittest
-import tempfile
 import warnings
 
 import browsepy
+import browsepy.compat as compat
 import browsepy.appconfig
 
 
@@ -16,7 +16,7 @@ class TestApp(unittest.TestCase):
         self.app.config._warned.clear()
 
     def test_config(self):
-        with tempfile.TemporaryDirectory() as path:
+        with compat.mkdtemp() as path:
             name = os.path.join(path, 'file.py')
             with open(name, 'w') as f:
                 f.write('DIRECTORY_DOWNLOADABLE = False\n')
diff --git a/requirements/development.txt b/requirements/development.txt
index 0d5ffce..4c2b38a 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -30,8 +30,6 @@ jedi
 sphinx
 pycodestyle
 pydocstyle
-importlib_resources  # pycodestyle unittest with python < 3.7
-six  # compatible metaclass with python 2-3
 pyyaml
 beautifulsoup4
 
-- 
GitLab


From a87c93f69094cc59c143a3b8885e2f39aa30697d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 11:02:14 +0100
Subject: [PATCH 103/171] fix ppath test on hasefroch

---
 browsepy/tests/test_utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browsepy/tests/test_utils.py b/browsepy/tests/test_utils.py
index 7be70f6..4d1fc9b 100644
--- a/browsepy/tests/test_utils.py
+++ b/browsepy/tests/test_utils.py
@@ -34,12 +34,12 @@ class TestPPath(unittest.TestCase):
         self.assertTrue(
             self.module
             .ppath('a', 'b', module=__name__)
-            .endswith('browsepy/tests/a/b')
+            .endswith(os.path.join('browsepy', 'tests', 'a', 'b'))
             )
         self.assertTrue(
             self.module
             .ppath('a', 'b')
-            .endswith('browsepy/a/b')
+            .endswith(os.path.join('browsepy', 'a', 'b'))
             )
 
     def test_get_module(self):
-- 
GitLab


From b24fd6cef9215284752488fdd52b39463d5dfb28 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 11:04:35 +0100
Subject: [PATCH 104/171] fix git src refspec on github mirroring

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67eae68..4fdbfac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,7 +122,7 @@ publish-github-mirror:
     - master
   script:
   - git remote add github "${GITHUB_MIRROR}"
-  - git push -u "${CI_COMMIT_REF_NAME}" github
+  - git push -u github "${CI_COMMIT_REF_NAME}"
 
 publish-github-pages:
   extends: .github-base
-- 
GitLab


From 658611df01c2e6d3bc4aa807e9b02483dbd115da Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 11:36:51 +0100
Subject: [PATCH 105/171] workaround rmtree issues on hasefroch

---
 browsepy/compat.py                    | 90 ++++++++++++++++++++-------
 browsepy/file.py                      |  3 +-
 browsepy/plugin/file_actions/tests.py |  6 +-
 browsepy/tests/test_file.py           | 17 +++--
 browsepy/tests/test_main.py           |  3 +-
 browsepy/tests/test_module.py         | 13 ++--
 browsepy/tests/test_stream.py         |  4 +-
 7 files changed, 90 insertions(+), 46 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index f7a7f63..a78bd1c 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -4,6 +4,7 @@ import os
 import os.path
 import sys
 import abc
+import time
 import shutil
 import tempfile
 import itertools
@@ -45,12 +46,15 @@ except ImportError:
 
 
 class SafeArgumentParser(argparse.ArgumentParser):
+    """ArgumentParser based class which safer default behavior."""
+
     allow_abbrev_support = sys.version_info >= (3, 5, 0)
 
     def _get_option_tuples(self, option_string):
         return []
 
     def __init__(self, **kwargs):
+        """Initialize object."""
         if self.allow_abbrev_support:
             kwargs.setdefault('allow_abbrev', False)
         kwargs.setdefault('add_help', False)
@@ -58,8 +62,11 @@ class SafeArgumentParser(argparse.ArgumentParser):
 
 
 class HelpFormatter(argparse.RawTextHelpFormatter):
+    """HelpFormatter for argument parsers honoring terminal width."""
+
     def __init__(self, prog, indent_increment=2, max_help_position=24,
                  width=None):
+        """Initialize object."""
         if width is None:
             try:
                 width = get_terminal_size().columns - 2
@@ -72,7 +79,11 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
 @contextlib.contextmanager
 def scandir(path):
     """
-    Backwards-compatible :func:`scandir.scandir` context manager
+    Get iterable of :class:`os.DirEntry` as context manager.
+
+    This is just backwards-compatible :func:`scandir.scandir` context
+    manager wrapper, as since `3.6` calling `close` method became
+    mandatory, but it's not available on previous versions.
 
     :param path: path to iterate
     :type path: str
@@ -85,10 +96,34 @@ def scandir(path):
             files.close()
 
 
+def rmtree(path):
+    """
+    Remove directory tree, with platform-specific fixes.
+
+    A simple :func:`shutil.rmtree` wrapper, with some error handling and
+    retry logic, as some filesystems on some platforms does not always
+    behave as they should.
+
+    :param path: path to remove
+    :type path: str
+    """
+    while os.path.exists(path):
+        try:
+            shutil.rmtree(path)
+        except OSError as e:
+            if getattr(e, 'winerror', 145):
+                time.sleep(0.001)  # allow dumb filesystems to catch up
+                continue
+            raise
+
+
 @contextlib.contextmanager
 def mkdtemp(suffix='', prefix='', dir=None):
     """
-    Backwards-compatible :class:`tmpfile.TemporaryDirectory` context manager.
+    Create a temporary directory context manager.
+
+    Backwards-compatible :class:`tmpfile.TemporaryDirectory` context
+    manager, as it was added on `3.2`.
 
     :param path: path to iterate
     :type path: str
@@ -97,7 +132,7 @@ def mkdtemp(suffix='', prefix='', dir=None):
     try:
         yield path
     finally:
-        shutil.rmtree(path)
+        rmtree(path)
 
 
 def isexec(path):
@@ -114,7 +149,10 @@ def isexec(path):
 
 def fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
     """
-    Decode given path.
+    Decode given path using filesystem encoding.
+
+    This is necessary as python has pretty bad filesystem support on
+    some platforms.
 
     :param path: path will be decoded if using bytes
     :type path: bytes or str
@@ -135,7 +173,10 @@ def fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
 
 def fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
     """
-    Encode given path.
+    Encode given path using filesystem encoding.
+
+    This is necessary as python has pretty bad filesystem support on
+    some platforms.
 
     :param path: path will be encoded if not using bytes
     :type path: bytes or str
@@ -157,6 +198,7 @@ def fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
 def getcwd(fs_encoding=FS_ENCODING, cwd_fnc=os.getcwd):
     """
     Get current work directory's absolute path.
+
     Like os.getcwd but garanteed to return an unicode-str object.
 
     :param fs_encoding: filesystem encoding, defaults to autodetected
@@ -172,8 +214,9 @@ def getcwd(fs_encoding=FS_ENCODING, cwd_fnc=os.getcwd):
 
 def getdebug(environ=os.environ, true_values=TRUE_VALUES):
     """
-    Get if app is expected to be ran in debug mode looking at environment
-    variables.
+    Get if app is running in debug mode.
+
+    This is detected looking at environment variables.
 
     :param environ: environment dict-like object
     :type environ: collections.abc.Mapping
@@ -185,8 +228,16 @@ def getdebug(environ=os.environ, true_values=TRUE_VALUES):
 
 def deprecated(func_or_text, environ=os.environ):
     """
-    Decorator used to mark functions as deprecated. It will result in a
-    warning being emmitted hen the function is called.
+    Decorate function and mark it as deprecated.
+
+    Calling a deprected function will result in a warning message.
+
+    :param func_or_text: message or callable to decorate
+    :type func_or_text: callable
+    :param environ: optional environment mapping
+    :type environ: collections.abc.Mapping
+    :returns: nested decorator or new decorated function (depending on params)
+    :rtype: callable
 
     Usage:
 
@@ -200,12 +251,6 @@ def deprecated(func_or_text, environ=os.environ):
     ... def fnc():
     ...     pass
 
-    :param func_or_text: message or callable to decorate
-    :type func_or_text: callable
-    :param environ: optional environment mapping
-    :type environ: collections.abc.Mapping
-    :returns: nested decorator or new decorated function (depending on params)
-    :rtype: callable
     """
     def inner(func):
         message = (
@@ -229,6 +274,11 @@ def usedoc(other):
     """
     Decorator which copies __doc__ of given object into decorated one.
 
+    :param other: anything with a __doc__ attribute
+    :type other: any
+    :returns: decorator function
+    :rtype: callable
+
     Usage:
 
     >>> def fnc1():
@@ -240,10 +290,6 @@ def usedoc(other):
     >>> fnc2.__doc__
     'docstring'collections.abc.D
 
-    :param other: anything with a __doc__ attribute
-    :type other: any
-    :returns: decorator function
-    :rtype: callable
     """
     def inner(fnc):
         fnc.__doc__ = fnc.__doc__ or getattr(other, '__doc__')
@@ -368,8 +414,10 @@ def which(name,
 
 def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
     """
-    Escape all special regex characters in pattern and converts non-ascii
-    characters into unicode escape sequences.
+    Escape pattern to include it safely into another regex.
+
+    This function escapes all special regex characters while translating
+    non-ascii characters into unicode escape sequences.
 
     Logic taken from regex module.
 
diff --git a/browsepy/file.py b/browsepy/file.py
index 7c553e6..2e6ef74 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -3,7 +3,6 @@
 import os
 import os.path
 import re
-import shutil
 import codecs
 import string
 import random
@@ -653,7 +652,7 @@ class Directory(Node):
         :raises OutsideRemovableBase: when not under removable base directory
         """
         super(Directory, self).remove()
-        shutil.rmtree(self.path)
+        compat.rmtree(self.path)
 
     def download(self):
         """
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index d1ecf86..8360ed8 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -2,7 +2,6 @@
 
 import unittest
 import tempfile
-import shutil
 import os
 import os.path
 import functools
@@ -12,6 +11,7 @@ import flask
 
 from werkzeug.utils import cached_property
 
+import browsepy.compat as compat
 import browsepy.utils as utils
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
@@ -132,7 +132,7 @@ class TestIntegration(unittest.TestCase):
         self.manager.reload()
 
     def tearDown(self):
-        shutil.rmtree(self.base)
+        compat.rmtree(self.base)
         self.app.config.clear()
         self.app.config.update(self.original_config)
         self.manager.clear()
@@ -252,7 +252,7 @@ class TestAction(unittest.TestCase):
             return '', 400
 
     def tearDown(self):
-        shutil.rmtree(self.base)
+        compat.rmtree(self.base)
         utils.clear_flask_context()
 
     def mkdir(self, *path):
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index 08ca9cc..336e15e 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -3,16 +3,15 @@ import os
 import os.path
 import unittest
 import tempfile
-import shutil
 import stat
 
 import browsepy
 import browsepy.file
-import browsepy.compat
+import browsepy.compat as compat
 import browsepy.utils as utils
 
 
-PY_LEGACY = browsepy.compat.PY_LEGACY
+PY_LEGACY = compat.PY_LEGACY
 
 
 class TestFile(unittest.TestCase):
@@ -23,15 +22,15 @@ class TestFile(unittest.TestCase):
         self.workbench = tempfile.mkdtemp()
 
     def clear_workbench(self):
-        with browsepy.compat.scandir(self.workbench) as files:
+        with compat.scandir(self.workbench) as files:
             for entry in files:
                 if entry.is_dir():
-                    shutil.rmtree(entry.path)
+                    compat.rmtree(entry.path)
                 else:
                     os.remove(entry.path)
 
     def tearDown(self):
-        shutil.rmtree(self.workbench)
+        compat.rmtree(self.workbench)
         utils.clear_flask_context()
 
     def textfile(self, name, text):
@@ -43,7 +42,7 @@ class TestFile(unittest.TestCase):
     def test_repr(self):
         self.assertIsInstance(
             repr(self.module.Node('a', app=self.app)),
-            browsepy.compat.basestring
+            compat.basestring
             )
 
     def test_iter_listdir(self):
@@ -96,7 +95,7 @@ class TestFile(unittest.TestCase):
         tmp_err = os.path.join(self.workbench, 'nonexisting_file')
 
         # test file command
-        if browsepy.compat.which('file'):
+        if compat.which('file'):
             f = self.module.File(tmp_txt, app=self.app)
             self.assertEqual(f.mimetype, 'text/plain; charset=us-ascii')
             self.assertEqual(f.type, 'text/plain')
@@ -146,7 +145,7 @@ class TestFile(unittest.TestCase):
         f = self.module.File(virtual_file, app=self.app)
 
         self.assertRaises(
-            browsepy.compat.FileNotFoundError,
+            compat.FileNotFoundError,
             lambda: f.stats
             )
         self.assertEqual(f.modified, None)
diff --git a/browsepy/tests/test_main.py b/browsepy/tests/test_main.py
index 4bf1eaf..2ba24f9 100644
--- a/browsepy/tests/test_main.py
+++ b/browsepy/tests/test_main.py
@@ -5,7 +5,6 @@ import sys
 import os.path
 import unittest
 import tempfile
-import shutil
 import contextlib
 
 import browsepy
@@ -26,7 +25,7 @@ class TestMain(unittest.TestCase):
             f.write('.ignore\n')
 
     def tearDown(self):
-        shutil.rmtree(self.base)
+        compat.rmtree(self.base)
 
     @classmethod
     @contextlib.contextmanager
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index 2a7d962..46944f3 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -4,7 +4,6 @@
 import unittest
 import os
 import os.path
-import shutil
 import tempfile
 import tarfile
 import io
@@ -21,11 +20,11 @@ import browsepy
 import browsepy.file
 import browsepy.manager
 import browsepy.__main__
-import browsepy.compat
+import browsepy.compat as compat
 import browsepy.utils as utils
 
-PY_LEGACY = browsepy.compat.PY_LEGACY
-range = browsepy.compat.range  # noqa
+PY_LEGACY = compat.PY_LEGACY
+range = compat.range  # noqa
 
 
 class AppMock(object):
@@ -219,12 +218,12 @@ class TestApp(unittest.TestCase):
         for sub in os.listdir(path):
             sub = os.path.join(path, sub)
             if os.path.isdir(sub):
-                shutil.rmtree(sub)
+                compat.rmtree(sub)
             else:
                 os.remove(sub)
 
     def tearDown(self):
-        shutil.rmtree(self.base)
+        compat.rmtree(self.base)
         utils.clear_flask_context()
 
     def get(self, endpoint, **kwargs):
@@ -535,7 +534,7 @@ class TestApp(unittest.TestCase):
         self.clear(self.upload)
 
     def test_upload_restrictions(self):
-        pathconf = browsepy.compat.pathconf(self.upload)
+        pathconf = compat.pathconf(self.upload)
         maxname = pathconf['PC_NAME_MAX']
         maxpath = pathconf['PC_PATH_MAX']
 
diff --git a/browsepy/tests/test_stream.py b/browsepy/tests/test_stream.py
index 3935b00..b3bd18e 100644
--- a/browsepy/tests/test_stream.py
+++ b/browsepy/tests/test_stream.py
@@ -4,9 +4,9 @@ import os.path
 import codecs
 import unittest
 import tempfile
-import shutil
 import time
 
+import browsepy.compat as compat
 import browsepy.stream
 
 
@@ -17,7 +17,7 @@ class StreamTest(unittest.TestCase):
         self.base = tempfile.mkdtemp()
 
     def tearDown(self):
-        shutil.rmtree(self.base)
+        compat.rmtree(self.base)
 
     def randfile(self, size=1024):
         name = codecs.encode(os.urandom(5), 'hex_codec').decode()
-- 
GitLab


From 93d65796f75298874f4f20f31b85aa491fd2b40e Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 11:45:23 +0100
Subject: [PATCH 106/171] limit rmtree retries

---
 browsepy/compat.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index a78bd1c..02f24c6 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -107,12 +107,14 @@ def rmtree(path):
     :param path: path to remove
     :type path: str
     """
+    attempt = -1
     while os.path.exists(path):
+        attempt += 1
         try:
             shutil.rmtree(path)
-        except OSError as e:
-            if getattr(e, 'winerror', 145):
-                time.sleep(0.001)  # allow dumb filesystems to catch up
+        except OSError as error:
+            if getattr(error, 'winerror', 145) and attempt < 50:
+                time.sleep(0.01)  # allow dumb filesystems to catch up
                 continue
             raise
 
-- 
GitLab


From 1cb74feeccf8c45d46d358aab8c544932b851dd8 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 12:11:33 +0100
Subject: [PATCH 107/171] more hasefroch/appveyor fixes

---
 .appveyor.yml      | 31 +++++++++++++------------------
 browsepy/compat.py |  2 +-
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 8f359aa..754966f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -38,24 +38,19 @@ init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 
 install:
-  # If there is a newer build queued for the same PR, cancel this one.
-  # The AppVeyor 'rollout builds' option is supposed to serve the same
-  # purpose but it is problematic because it tends to cancel builds pushed
-  # directly to master instead of just PR builds (or the converse).
-  # credits: JuliaLang developers.
-  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-          throw "There are newer queued builds for this pull request, failing early." }
-  - ECHO "Filesystem root:"
-  - ps: "ls \"C:/\""
-  - ECHO "Installed SDKs:"
-  - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
-  - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - "python --version"
-  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  - "pip install --disable-pip-version-check --user --upgrade pip setuptools"
+  - ps: |
+      echo "Available Python versions:"
+      ls "C:/" | Select-String -Pattern "Python*"
+      echo "Installed SDKs:"
+      ls "C:/Program Files/Microsoft SDKs/Windows"
+      if (-not(Test-Path($env:PYTHON))) {
+        & appveyor\install.ps1
+      }
+  - |
+    SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+    python --version
+    python -c "import struct; print(struct.calcsize('P') * 8)"
+    pip install --disable-pip-version-check --user --upgrade pip setuptools
 
 test_script:
   - "python setup.py test"
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 02f24c6..d662861 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -113,7 +113,7 @@ def rmtree(path):
         try:
             shutil.rmtree(path)
         except OSError as error:
-            if getattr(error, 'winerror', 145) and attempt < 50:
+            if getattr(error, 'winerror', 0) in (5, 145) and attempt < 50:
                 time.sleep(0.01)  # allow dumb filesystems to catch up
                 continue
             raise
-- 
GitLab


From b9c66038ede8aab95c21e197e5cb01ee151a79ae Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 12:13:21 +0100
Subject: [PATCH 108/171] push head on github-mirror

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fdbfac..3de8e3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,7 +122,7 @@ publish-github-mirror:
     - master
   script:
   - git remote add github "${GITHUB_MIRROR}"
-  - git push -u github "${CI_COMMIT_REF_NAME}"
+  - git push github "HEAD:${CI_COMMIT_REF_NAME}"
 
 publish-github-pages:
   extends: .github-base
-- 
GitLab


From a7ec49c6ef727b8f5d95a831b01a1b2ee7341e8c Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 13:20:30 +0100
Subject: [PATCH 109/171] ci fixes

---
 .appveyor.yml  | 1 +
 .gitlab-ci.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 754966f..e500f87 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -41,6 +41,7 @@ install:
   - ps: |
       echo "Available Python versions:"
       ls "C:/" | Select-String -Pattern "Python*"
+      echo ""
       echo "Installed SDKs:"
       ls "C:/Program Files/Microsoft SDKs/Windows"
       if (-not(Test-Path($env:PYTHON))) {
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3de8e3d..9ca5bcb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@
     GITHUB_MIRROR: "git@github.com:ergoithz/browsepy.git"
   before_script:
   - mkdir -p ~/.ssh
-  - echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
+  - echo -e "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
   - chmod 600 ~/.ssh/id_rsa
   - ssh-keyscan -H $ssh_port "$ssh_host" >> ~/.ssh/known_hosts
   - git config user.name "${GITLAB_USER_LOGIN}"
-- 
GitLab


From d625cdfa037ae27cd1dd80ed3cbc831812d2d131 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 14:06:55 +0100
Subject: [PATCH 110/171] add gh-pages logic

---
 .gitlab-ci.yml | 69 +++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 40 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ca5bcb..25f92ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,22 +28,6 @@
     paths:
     - .cache/pip
 
-.github-base:
-  image:
-    name: alpine/git
-    entrypoint:
-    - /bin/sh
-    - -c
-  variables:
-    GITHUB_MIRROR: "git@github.com:ergoithz/browsepy.git"
-  before_script:
-  - mkdir -p ~/.ssh
-  - echo -e "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
-  - chmod 600 ~/.ssh/id_rsa
-  - ssh-keyscan -H $ssh_port "$ssh_host" >> ~/.ssh/known_hosts
-  - git config user.name "${GITLAB_USER_LOGIN}"
-  - git config user.email "${GITLAB_USER_EMAIL}"
-
 stages:
 - test
 - report
@@ -69,8 +53,8 @@ python37:
   image: python:3.7-alpine
 
 eslint:
-  image: node:alpine
   stage: test
+  image: node:alpine
   cache:
     paths:
     - node_modules
@@ -105,42 +89,47 @@ doc:
   dependencies: []
   artifacts:
     paths:
-    - doc/.build
+    - doc/.build/html
   before_script:
   - apk add --no-cache make
   - pip install -r requirements/doc.txt
   script:
   - make -C doc html
 
-publish-github-mirror:
-  extends: .github-base
-  stage: publish
-  dependencies: []
-  only:
-    refs:
-    - next
-    - master
-  script:
-  - git remote add github "${GITHUB_MIRROR}"
-  - git push github "HEAD:${CI_COMMIT_REF_NAME}"
-
-publish-github-pages:
-  extends: .github-base
+publish-gh-pages:
   stage: publish
+  image:
+    name: alpine/git
+    entrypoint:
+    - /bin/sh
+    - -c
   dependencies:
   - doc
   only:
     refs:
     - master
+    - next
+  before_script:
+  - mkdir -p ~/.ssh
+  - echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
+  - chmod 600 ~/.ssh/id_rsa
+  - ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
+  - git config user.name "${GITLAB_USER_LOGIN}"
+  - git config user.email "${GITLAB_USER_EMAIL}"
   script:
-  - git remote add github "${GITHUB_MIRROR}"
-  - git fetch
-  - git checkout gh-pages
-  - cp -rf doc/.build/* .
-  - rm -rf doc
-  - git add **
-  - git commit -am "doc from ${CI_COMMIT_SHA} ${CI_COMMIT_MESSAGE}"
-  - git push github
+  - |
+    if [ "${CI_COMMIT_REF_NAME}" == "master" ]; then
+      TARGET_BRANCH="gh-pages"
+    else
+      TARGET_BRANCH="gh-pages-${CI_COMMIT_REF_NAME}"
+    fi
+    git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
+    git pull || echo "No remote history."
+    find . -not -path './doc' -delete
+    cp doc/.build/html/** .
+    git add **
+    git commit -am "update ${TARGET_BRANCH}"
+    git push -u origin "${TARGET_BRANCH}"
 
 publish-alpha:
   extends: .after-base
-- 
GitLab


From 9f10750ad75a8cc6f5bfce5251665caa00de0b6e Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 14:42:44 +0100
Subject: [PATCH 111/171] harden rmtree, fix bad ci doc cleaning

---
 .gitlab-ci.yml     |  2 +-
 browsepy/compat.py | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25f92ce..e70b252 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,7 +125,7 @@ publish-gh-pages:
     fi
     git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
     git pull || echo "No remote history."
-    find . -not -path './doc' -delete
+    find . -not -path './doc' -not -path './doc/**' -delete
     cp doc/.build/html/** .
     git add **
     git commit -am "update ${TARGET_BRANCH}"
diff --git a/browsepy/compat.py b/browsepy/compat.py
index d662861..6c17a70 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -3,6 +3,7 @@
 import os
 import os.path
 import sys
+import errno
 import abc
 import time
 import shutil
@@ -113,8 +114,22 @@ def rmtree(path):
         try:
             shutil.rmtree(path)
         except OSError as error:
-            if getattr(error, 'winerror', 0) in (5, 145) and attempt < 50:
-                time.sleep(0.01)  # allow dumb filesystems to catch up
+            if attempt < 50 and (
+              getattr(error, 'winerror', 0) in (5, 145) or
+              error.errno in (
+                errno.ENOENT,
+                errno.EIO,
+                errno.ENXIO,
+                errno.EAGAIN,
+                errno.EBUSY,
+                errno.ENOTDIR,
+                errno.EISDIR,
+                errno.ENOTEMPTY,
+                errno.EALREADY,
+                errno.EINPROGRESS,
+                errno.EREMOTEIO,
+              )):
+                time.sleep(0.01)  # allow sluggish filesystems to catch up
                 continue
             raise
 
-- 
GitLab


From f906e0777e28836182764158a9044b2183ae8954 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 14:43:40 +0100
Subject: [PATCH 112/171] ci doc cleaning

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e70b252..e4b67f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,6 +127,7 @@ publish-gh-pages:
     git pull || echo "No remote history."
     find . -not -path './doc' -not -path './doc/**' -delete
     cp doc/.build/html/** .
+    rm -rf doc
     git add **
     git commit -am "update ${TARGET_BRANCH}"
     git push -u origin "${TARGET_BRANCH}"
-- 
GitLab


From a0f040b935b1899b0b5845e4b19a36296a239314 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 14:44:56 +0100
Subject: [PATCH 113/171] ci doc cp overwrite

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4b67f1..8e784a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,7 +126,7 @@ publish-gh-pages:
     git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
     git pull || echo "No remote history."
     find . -not -path './doc' -not -path './doc/**' -delete
-    cp doc/.build/html/** .
+    cp -rf doc/.build/html/** .
     rm -rf doc
     git add **
     git commit -am "update ${TARGET_BRANCH}"
-- 
GitLab


From 7d4eeffe6bf1ffac3ab1bd1c6358b755661d499b Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 15:15:22 +0100
Subject: [PATCH 114/171] retry to support old 3.5 fs retries

---
 browsepy/compat.py | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 6c17a70..5416471 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -19,6 +19,21 @@ import argparse
 FS_ENCODING = sys.getfilesystemencoding()
 PY_LEGACY = sys.version_info < (3, )
 TRUE_VALUES = frozenset(('true', 'yes', '1', 'enable', 'enabled', True, 1))
+RETRYABLE_FS_ERRNO_VALUES = frozenset(
+    ((errno.EPERM,) if os.name == 'nt' else ()) + (
+        errno.ENOENT,
+        errno.EIO,
+        errno.ENXIO,
+        errno.EAGAIN,
+        errno.EBUSY,
+        errno.ENOTDIR,
+        errno.EISDIR,
+        errno.ENOTEMPTY,
+        errno.EALREADY,
+        errno.EINPROGRESS,
+        errno.EREMOTEIO,
+        )
+    )
 
 try:
     import importlib.resources as res  # python 3.7+
@@ -113,23 +128,12 @@ def rmtree(path):
         attempt += 1
         try:
             shutil.rmtree(path)
-        except OSError as error:
-            if attempt < 50 and (
-              getattr(error, 'winerror', 0) in (5, 145) or
-              error.errno in (
-                errno.ENOENT,
-                errno.EIO,
-                errno.ENXIO,
-                errno.EAGAIN,
-                errno.EBUSY,
-                errno.ENOTDIR,
-                errno.EISDIR,
-                errno.ENOTEMPTY,
-                errno.EALREADY,
-                errno.EINPROGRESS,
-                errno.EREMOTEIO,
-              )):
-                time.sleep(0.01)  # allow sluggish filesystems to catch up
+        except EnvironmentError as error:
+            if (
+              attempt < 5 and
+              getattr(error, 'errno', None) in RETRYABLE_FS_ERRNO_VALUES
+              ):
+                time.sleep(0.1)  # allow sluggish filesystems to catch up
                 continue
             raise
 
-- 
GitLab


From d382a7905603047fe8f41ddd3b3b53744fc791fc Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 15:20:55 +0100
Subject: [PATCH 115/171] avoid to delete too many files for gh-pages

---
 .gitlab-ci.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e784a7..d16c2a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,8 +124,17 @@ publish-gh-pages:
       TARGET_BRANCH="gh-pages-${CI_COMMIT_REF_NAME}"
     fi
     git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
-    git pull || echo "No remote history."
-    find . -not -path './doc' -not -path './doc/**' -delete
+    git pull || true
+    find . \
+      -not -path 'doc' \
+      -not -path 'doc/**' \
+      -not -path '.git' \
+      -not -path '.git/**' \
+      -not -path '.gitignore' \
+      -not -path 'README*' \
+      -not -path 'CHANGELOG' \
+      -not -path 'LICENSE' \
+      -delete
     cp -rf doc/.build/html/** .
     rm -rf doc
     git add **
-- 
GitLab


From 01a7802319487cfa981b3117667df8fa7bbcfa2c Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 15:30:22 +0100
Subject: [PATCH 116/171] cleaner gh-pages environment

---
 .gitlab-ci.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d16c2a9..daafd68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,20 +123,13 @@ publish-gh-pages:
     else
       TARGET_BRANCH="gh-pages-${CI_COMMIT_REF_NAME}"
     fi
+    git init .gh_pages
+    cd .gh_pages
+    git remote add origin "${CI_REPOSITORY_URL}"
+    git fetch
     git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
-    git pull || true
-    find . \
-      -not -path 'doc' \
-      -not -path 'doc/**' \
-      -not -path '.git' \
-      -not -path '.git/**' \
-      -not -path '.gitignore' \
-      -not -path 'README*' \
-      -not -path 'CHANGELOG' \
-      -not -path 'LICENSE' \
-      -delete
-    cp -rf doc/.build/html/** .
-    rm -rf doc
+    cp ${CI_PROJECT_DIR}/.gitignore .
+    cp -rf ${CI_PROJECT_DIR}/doc/.build/html/** .
     git add **
     git commit -am "update ${TARGET_BRANCH}"
     git push -u origin "${TARGET_BRANCH}"
-- 
GitLab


From 7460d7c27f3a0266007aee36b463faeb57b7bcdf Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 15:49:15 +0100
Subject: [PATCH 117/171] another attempt on cover hasefroch fs

---
 browsepy/compat.py | 64 ++++++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 5416471..5157cc6 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -16,24 +16,10 @@ import posixpath
 import ntpath
 import argparse
 
-FS_ENCODING = sys.getfilesystemencoding()
-PY_LEGACY = sys.version_info < (3, )
-TRUE_VALUES = frozenset(('true', 'yes', '1', 'enable', 'enabled', True, 1))
-RETRYABLE_FS_ERRNO_VALUES = frozenset(
-    ((errno.EPERM,) if os.name == 'nt' else ()) + (
-        errno.ENOENT,
-        errno.EIO,
-        errno.ENXIO,
-        errno.EAGAIN,
-        errno.EBUSY,
-        errno.ENOTDIR,
-        errno.EISDIR,
-        errno.ENOTEMPTY,
-        errno.EALREADY,
-        errno.EINPROGRESS,
-        errno.EREMOTEIO,
-        )
-    )
+try:
+    import builtins  # python 3+
+except ImportError:
+    import __builtin__ as builtins  # noqa
 
 try:
     import importlib.resources as res  # python 3.7+
@@ -61,6 +47,40 @@ except ImportError:
     from collections import Iterator as BaseIterator  # noqa
 
 
+FS_ENCODING = sys.getfilesystemencoding()
+PY_LEGACY = sys.version_info < (3, )
+TRUE_VALUES = frozenset(
+    # Truthy values
+    ('true', 'yes', '1', 'enable', 'enabled', True, 1)
+    )
+RETRYABLE_FS_EXCEPTIONS = (
+    # Handle non PEP 3151 python versions
+    ((builtins.WindowsError,) if hasattr(builtins, 'WindowsError') else ()) + (
+        EnvironmentError,
+        )
+    )
+RETRYABLE_FS_ERRNO_VALUES = frozenset(
+    # Error codes which could imply a busy filesystem
+    ((errno.EPERM,) if os.name == 'nt' else ()) + (
+        errno.ENOENT,
+        errno.EIO,
+        errno.ENXIO,
+        errno.EAGAIN,
+        errno.EBUSY,
+        errno.ENOTDIR,
+        errno.EISDIR,
+        errno.ENOTEMPTY,
+        errno.EALREADY,
+        errno.EINPROGRESS,
+        errno.EREMOTEIO,
+        )
+    )
+RETRYABLE_FS_WINERROR_VALUES = frozenset(
+    # Handle WindowsError instances without errno
+    (5, 145)
+    )
+
+
 class SafeArgumentParser(argparse.ArgumentParser):
     """ArgumentParser based class which safer default behavior."""
 
@@ -128,10 +148,10 @@ def rmtree(path):
         attempt += 1
         try:
             shutil.rmtree(path)
-        except EnvironmentError as error:
-            if (
-              attempt < 5 and
-              getattr(error, 'errno', None) in RETRYABLE_FS_ERRNO_VALUES
+        except RETRYABLE_FS_EXCEPTIONS as error:
+            if attempt < 5 and (
+              getattr(error, 'errno', None) in RETRYABLE_FS_ERRNO_VALUES or
+              getattr(error, 'winerror', None) in RETRYABLE_FS_WINERROR_VALUES
               ):
                 time.sleep(0.1)  # allow sluggish filesystems to catch up
                 continue
-- 
GitLab


From 4d7179a53eebd3ac44a9840f8d7ce8ebd563d602 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 15:51:07 +0100
Subject: [PATCH 118/171] configure ci git user an email

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index daafd68..265fe23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,8 +114,8 @@ publish-gh-pages:
   - echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
   - chmod 600 ~/.ssh/id_rsa
   - ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
-  - git config user.name "${GITLAB_USER_LOGIN}"
-  - git config user.email "${GITLAB_USER_EMAIL}"
+  - git config --global user.name "${GITLAB_USER_LOGIN}"
+  - git config --global user.email "${GITLAB_USER_EMAIL}"
   script:
   - |
     if [ "${CI_COMMIT_REF_NAME}" == "master" ]; then
-- 
GitLab


From 542e267b33f8b0bc01ae7abfcb14f6e6325a6023 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 16:03:20 +0100
Subject: [PATCH 119/171] handle errno inconsistencies across platforms

---
 browsepy/compat.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 5157cc6..ac9fcae 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -53,28 +53,34 @@ TRUE_VALUES = frozenset(
     # Truthy values
     ('true', 'yes', '1', 'enable', 'enabled', True, 1)
     )
-RETRYABLE_FS_EXCEPTIONS = (
+RETRYABLE_FS_EXCEPTIONS = tuple(
     # Handle non PEP 3151 python versions
-    ((builtins.WindowsError,) if hasattr(builtins, 'WindowsError') else ()) + (
-        EnvironmentError,
+    getattr(builtins, prop)
+    for prop in (
+        'WindowsError',
+        'EnvironmentError',
         )
+    if hasattr(builtins, prop)
     )
 RETRYABLE_FS_ERRNO_VALUES = frozenset(
     # Error codes which could imply a busy filesystem
-    ((errno.EPERM,) if os.name == 'nt' else ()) + (
-        errno.ENOENT,
-        errno.EIO,
-        errno.ENXIO,
-        errno.EAGAIN,
-        errno.EBUSY,
-        errno.ENOTDIR,
-        errno.EISDIR,
-        errno.ENOTEMPTY,
-        errno.EALREADY,
-        errno.EINPROGRESS,
-        errno.EREMOTEIO,
+    getattr(errno, prop)
+    for prop in (
+        'ENOENT',
+        'EIO',
+        'ENXIO',
+        'EAGAIN',
+        'EBUSY',
+        'ENOTDIR',
+        'EISDIR',
+        'ENOTEMPTY',
+        'EALREADY',
+        'EINPROGRESS',
+        'EREMOTEIO',
+        'EPERM' if os.name == 'nt' else None,
         )
-    )
+    if prop and hasattr(errno, prop)
+)
 RETRYABLE_FS_WINERROR_VALUES = frozenset(
     # Handle WindowsError instances without errno
     (5, 145)
-- 
GitLab


From c0fdb3274e0392ab0b2a842958dab3bb23ef87fe Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 16:09:06 +0100
Subject: [PATCH 120/171] define gh-pages remote url manually

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 265fe23..6d77813 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,7 +125,7 @@ publish-gh-pages:
     fi
     git init .gh_pages
     cd .gh_pages
-    git remote add origin "${CI_REPOSITORY_URL}"
+    git remote add origin "git@gitlab.com:$CI_PROJECT_PATH.git"
     git fetch
     git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
     cp ${CI_PROJECT_DIR}/.gitignore .
-- 
GitLab


From b18d53fd0c9cb0940e35aae96c1c5bf95f6f8f63 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 16:31:09 +0100
Subject: [PATCH 121/171] try to cover windows permission error

---
 .appveyor.yml      | 5 +++++
 .gitlab-ci.yml     | 2 +-
 browsepy/compat.py | 8 +++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e500f87..f02b561 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,3 +1,8 @@
+branches:
+  except:
+    - gh-pages
+    - /gh-pages-.*/
+
 environment:
   matrix:
     - PYTHON: "C:\\Python27"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d77813..d4c9a01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,7 +128,7 @@ publish-gh-pages:
     git remote add origin "git@gitlab.com:$CI_PROJECT_PATH.git"
     git fetch
     git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
-    cp ${CI_PROJECT_DIR}/.gitignore .
+    cp ../.gitignore ../.appveyor.yml .
     cp -rf ${CI_PROJECT_DIR}/doc/.build/html/** .
     git add **
     git commit -am "update ${TARGET_BRANCH}"
diff --git a/browsepy/compat.py b/browsepy/compat.py
index ac9fcae..30a4891 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -57,15 +57,18 @@ RETRYABLE_FS_EXCEPTIONS = tuple(
     # Handle non PEP 3151 python versions
     getattr(builtins, prop)
     for prop in (
+        'PermissionError' if os.name == 'nt' else None,
         'WindowsError',
         'EnvironmentError',
+        'OSError',
         )
-    if hasattr(builtins, prop)
+    if prop and hasattr(builtins, prop)
     )
 RETRYABLE_FS_ERRNO_VALUES = frozenset(
     # Error codes which could imply a busy filesystem
     getattr(errno, prop)
     for prop in (
+        'EPERM' if os.name == 'nt' else None,
         'ENOENT',
         'EIO',
         'ENXIO',
@@ -77,10 +80,9 @@ RETRYABLE_FS_ERRNO_VALUES = frozenset(
         'EALREADY',
         'EINPROGRESS',
         'EREMOTEIO',
-        'EPERM' if os.name == 'nt' else None,
         )
     if prop and hasattr(errno, prop)
-)
+    )
 RETRYABLE_FS_WINERROR_VALUES = frozenset(
     # Handle WindowsError instances without errno
     (5, 145)
-- 
GitLab


From 29bd5fa49f1abae7d1a71b66f60571ebb95b25f5 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 16:34:04 +0100
Subject: [PATCH 122/171] wait for external after publish on ci

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4c9a01..f38d759 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,7 @@
 stages:
 - test
 - report
+- external
 - publish
 
 python27:
-- 
GitLab


From d5fa3d64ddb1d25d25c3e2c4236a76bad856699a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 17:53:09 +0100
Subject: [PATCH 123/171] try to improve rmtree error handling

---
 .appveyor.yml      |  76 +++++++++++----------------------
 browsepy/compat.py | 104 +++++++++++++++++++++++++--------------------
 2 files changed, 82 insertions(+), 98 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f02b561..ede2b90 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,62 +1,36 @@
 branches:
   except:
-    - gh-pages
-    - /gh-pages-.*/
+  - gh-pages
+  - /gh-pages-.*/
 
 environment:
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.16"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.16"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.7"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.7"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6.9"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.9"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python37"
-      PYTHON_VERSION: "3.7.4"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python37-x64"
-      PYTHON_VERSION: "3.7.4"
-      PYTHON_ARCH: "64"
+  - PYTHON: "C:\\Python27"
+  - PYTHON: "C:\\Python27-x64"
+  - PYTHON: "C:\\Python35"
+  - PYTHON: "C:\\Python35-x64"
+  - PYTHON: "C:\\Python36"
+  - PYTHON: "C:\\Python36-x64"
+  - PYTHON: "C:\\Python37"
+  - PYTHON: "C:\\Python37-x64"
 
 build: off
 
-init:
-  - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
-
 install:
-  - ps: |
-      echo "Available Python versions:"
-      ls "C:/" | Select-String -Pattern "Python*"
-      echo ""
-      echo "Installed SDKs:"
-      ls "C:/Program Files/Microsoft SDKs/Windows"
-      if (-not(Test-Path($env:PYTHON))) {
-        & appveyor\install.ps1
-      }
-  - |
-    SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
-    python --version
-    python -c "import struct; print(struct.calcsize('P') * 8)"
-    pip install --disable-pip-version-check --user --upgrade pip setuptools
+- ps: |
+    echo "Available Python versions:"
+    ls "C:/" | Select-String -Pattern "Python*"
+    echo ""
+    echo "Installed SDKs:"
+    ls "C:/Program Files/Microsoft SDKs/Windows"
+    if (-not(Test-Path($env:PYTHON))) {
+      & appveyor\install.ps1
+    }
+- |
+  SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+  python --version
+  python -c "import struct; print(struct.calcsize('P') * 8)"
+  pip install --disable-pip-version-check --user --upgrade pip setuptools
 
 test_script:
-  - "python setup.py test"
+- "python setup.py test"
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 30a4891..d2c5f76 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -2,6 +2,7 @@
 
 import os
 import os.path
+import stat
 import sys
 import errno
 import abc
@@ -16,11 +17,6 @@ import posixpath
 import ntpath
 import argparse
 
-try:
-    import builtins  # python 3+
-except ImportError:
-    import __builtin__ as builtins  # noqa
-
 try:
     import importlib.resources as res  # python 3.7+
 except ImportError:
@@ -53,40 +49,31 @@ TRUE_VALUES = frozenset(
     # Truthy values
     ('true', 'yes', '1', 'enable', 'enabled', True, 1)
     )
-RETRYABLE_FS_EXCEPTIONS = tuple(
-    # Handle non PEP 3151 python versions
-    getattr(builtins, prop)
-    for prop in (
-        'PermissionError' if os.name == 'nt' else None,
-        'WindowsError',
-        'EnvironmentError',
-        'OSError',
-        )
-    if prop and hasattr(builtins, prop)
-    )
-RETRYABLE_FS_ERRNO_VALUES = frozenset(
-    # Error codes which could imply a busy filesystem
-    getattr(errno, prop)
-    for prop in (
-        'EPERM' if os.name == 'nt' else None,
-        'ENOENT',
-        'EIO',
-        'ENXIO',
-        'EAGAIN',
-        'EBUSY',
-        'ENOTDIR',
-        'EISDIR',
-        'ENOTEMPTY',
-        'EALREADY',
-        'EINPROGRESS',
-        'EREMOTEIO',
-        )
-    if prop and hasattr(errno, prop)
-    )
-RETRYABLE_FS_WINERROR_VALUES = frozenset(
-    # Handle WindowsError instances without errno
-    (5, 145)
-    )
+RETRYABLE_OSERROR_PROPERTIES = {
+    'errno': frozenset(
+        # Error codes which could imply a busy filesystem
+        getattr(errno, prop)
+        for prop in (
+            'EPERM',
+            'ENOENT',
+            'EIO',
+            'ENXIO',
+            'EAGAIN',
+            'EBUSY',
+            'ENOTDIR',
+            'EISDIR',
+            'ENOTEMPTY',
+            'EALREADY',
+            'EINPROGRESS',
+            'EREMOTEIO',
+            )
+        if prop and hasattr(errno, prop)
+        ),
+    'winerror': frozenset(
+        # Handle WindowsError instances without errno
+        (5, 145)
+        ),
+    }
 
 
 class SafeArgumentParser(argparse.ArgumentParser):
@@ -151,18 +138,41 @@ def rmtree(path):
     :param path: path to remove
     :type path: str
     """
-    attempt = -1
+    known = set()
+    retries = 5
     while os.path.exists(path):
-        attempt += 1
         try:
             shutil.rmtree(path)
-        except RETRYABLE_FS_EXCEPTIONS as error:
-            if attempt < 5 and (
-              getattr(error, 'errno', None) in RETRYABLE_FS_ERRNO_VALUES or
-              getattr(error, 'winerror', None) in RETRYABLE_FS_WINERROR_VALUES
+        except EnvironmentError as error:
+            if retries and any(
+              getattr(error, prop, None) in values
+              for prop, values in RETRYABLE_OSERROR_PROPERTIES.items()
               ):
-                time.sleep(0.1)  # allow sluggish filesystems to catch up
-                continue
+                # files with permission issues (common on some platforms)
+                unreachable = [
+                    filename
+                    for filename in (
+                        getattr(error, 'filename', None),
+                        getattr(error, 'filename2', None)
+                        )
+                    if (
+                        filename and
+                        filename not in known and
+                        not os.access(filename, os.W_OK)
+                        )
+                    ]
+
+                # allow sluggish filesystems to catch up
+                if not unreachable:
+                    retries -= 1
+                    time.sleep(0.1)
+                    continue
+
+                # try to fix permissions
+                known.update(unreachable)
+                for filename in unreachable:
+                    os.chmod(path, stat.S_IWUSR)
+
             raise
 
 
-- 
GitLab


From a5e1f43bdda88d59ee52116787b1fd44ee43bbc8 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 18:36:14 +0100
Subject: [PATCH 124/171] retry handle rmtree issues

---
 .appveyor.yml      |  3 +--
 .gitlab-ci.yml     | 50 ++++++++++++++++++++++++++++++----------------
 browsepy/compat.py | 39 +++++++++++-------------------------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ede2b90..31b2536 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,6 @@
 branches:
   except:
-  - gh-pages
-  - /gh-pages-.*/
+  - /^gh-pages(-.*)?$/
 
 environment:
   matrix:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f38d759..1f3056f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,10 @@
+.base:
+  except:
+    refs:
+    - /^gh-pages(-.*)?$/
+
 .test-base:
+  extends: .base
   stage: test
   variables:
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
@@ -13,13 +19,16 @@
     paths:
     - .coverage.*
   before_script:
-  - apk add --no-cache build-base python3-dev
-  - pip install coverage flake8
+  - |
+    apk add --no-cache build-base python3-dev
+    pip install coverage flake8
   script:
-  - flake8 ${MODULE}
-  - coverage run -p setup.py test
+  - |
+    flake8 ${MODULE}
+    coverage run -p setup.py test
 
 .after-base:
+  extends: .base
   image: python:3.7-alpine
   variables:
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
@@ -38,8 +47,9 @@ python27:
   extends: .test-base
   image: python:2.7-alpine
   before_script:
-  - apk add --no-cache build-base python2-dev
-  - pip install coverage flake8
+  - |
+    apk add --no-cache build-base python2-dev
+    pip install coverage flake8
 
 python35:
   extends: .test-base
@@ -54,6 +64,7 @@ python37:
   image: python:3.7-alpine
 
 eslint:
+  extends: .base
   stage: test
   image: node:alpine
   cache:
@@ -64,6 +75,7 @@ eslint:
     - "**.json"
     - "**.js"
     - .eslintignore
+    - .eslintrc.json
   before_script:
   - npm install eslint
   script:
@@ -80,9 +92,10 @@ coverage:
   before_script:
     - pip install coverage
   script:
-  - coverage combine
-  - coverage html --fail-under=0
-  - coverage report
+  - |
+    coverage combine
+    coverage html --fail-under=0
+    coverage report
 
 doc:
   extends: .after-base
@@ -92,12 +105,14 @@ doc:
     paths:
     - doc/.build/html
   before_script:
-  - apk add --no-cache make
-  - pip install -r requirements/doc.txt
+  - |
+    apk add --no-cache make
+    pip install -r requirements/doc.txt
   script:
   - make -C doc html
 
 publish-gh-pages:
+  extends: .base
   stage: publish
   image:
     name: alpine/git
@@ -111,12 +126,13 @@ publish-gh-pages:
     - master
     - next
   before_script:
-  - mkdir -p ~/.ssh
-  - echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
-  - chmod 600 ~/.ssh/id_rsa
-  - ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
-  - git config --global user.name "${GITLAB_USER_LOGIN}"
-  - git config --global user.email "${GITLAB_USER_EMAIL}"
+  - |
+    mkdir -p ~/.ssh
+    echo "${SSH_PRIVATE_KEY}" | tr -d '\r' > ~/.ssh/id_rsa
+    chmod 600 ~/.ssh/id_rsa
+    ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
+    git config --global user.name "${GITLAB_USER_LOGIN}"
+    git config --global user.email "${GITLAB_USER_EMAIL}"
   script:
   - |
     if [ "${CI_COMMIT_REF_NAME}" == "master" ]; then
diff --git a/browsepy/compat.py b/browsepy/compat.py
index d2c5f76..9d075a7 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -138,40 +138,25 @@ def rmtree(path):
     :param path: path to remove
     :type path: str
     """
-    known = set()
-    retries = 5
+    def remove_readonly(operation, name, exc_info):
+        """Clear the readonly bit and reattempt the removal."""
+        exc_type, exc_value, exc_traceback = exc_info
+        if issubclass(exc_type, PermissionError):
+            os.chmod(path, stat.S_IWRITE)
+        raise exc_info
+
+    retries = 10
     while os.path.exists(path):
         try:
-            shutil.rmtree(path)
+            shutil.rmtree(path, onerror=remove_readonly)
         except EnvironmentError as error:
             if retries and any(
               getattr(error, prop, None) in values
               for prop, values in RETRYABLE_OSERROR_PROPERTIES.items()
               ):
-                # files with permission issues (common on some platforms)
-                unreachable = [
-                    filename
-                    for filename in (
-                        getattr(error, 'filename', None),
-                        getattr(error, 'filename2', None)
-                        )
-                    if (
-                        filename and
-                        filename not in known and
-                        not os.access(filename, os.W_OK)
-                        )
-                    ]
-
-                # allow sluggish filesystems to catch up
-                if not unreachable:
-                    retries -= 1
-                    time.sleep(0.1)
-                    continue
-
-                # try to fix permissions
-                known.update(unreachable)
-                for filename in unreachable:
-                    os.chmod(path, stat.S_IWUSR)
+                retries -= 1
+                time.sleep(0.1)  # allow sluggish filesystems to catch up
+                continue
 
             raise
 
-- 
GitLab


From 22d43b654bbedf80b3c6028cdddeec9dcd918aff Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 18:37:44 +0100
Subject: [PATCH 125/171] fix typo

---
 browsepy/compat.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 9d075a7..1a885d3 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -138,12 +138,14 @@ def rmtree(path):
     :param path: path to remove
     :type path: str
     """
-    def remove_readonly(operation, name, exc_info):
+    def remove_readonly(action, name, exc_info):
         """Clear the readonly bit and reattempt the removal."""
         exc_type, exc_value, exc_traceback = exc_info
         if issubclass(exc_type, PermissionError):
-            os.chmod(path, stat.S_IWRITE)
-        raise exc_info
+            os.chmod(name, stat.S_IWRITE)
+            action(name)
+        else:
+            raise exc_info
 
     retries = 10
     while os.path.exists(path):
-- 
GitLab


From 6e6d73936e94f966bf55f49fd61d6636f41a2a6a Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 17:56:38 +0000
Subject: [PATCH 126/171] handle permission error on py2

---
 browsepy/compat.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 1a885d3..6a6ec65 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -17,6 +17,11 @@ import posixpath
 import ntpath
 import argparse
 
+try:
+    import builtins  # python 3+
+except ImportError:
+    import __builtin__ as builtins  # noqa
+
 try:
     import importlib.resources as res  # python 3.7+
 except ImportError:
@@ -141,7 +146,10 @@ def rmtree(path):
     def remove_readonly(action, name, exc_info):
         """Clear the readonly bit and reattempt the removal."""
         exc_type, exc_value, exc_traceback = exc_info
-        if issubclass(exc_type, PermissionError):
+        if issubclass(
+          exc_type,
+          getattr(builtins, 'PermissionError', OSError),
+          ) and exc_value.errno == errno.EPERM:
             os.chmod(name, stat.S_IWRITE)
             action(name)
         else:
-- 
GitLab


From f3195d9f8890bd26478f7f567e6631b233e457f7 Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Thu, 1 Aug 2019 18:08:59 +0000
Subject: [PATCH 127/171] better py2 handling

---
 browsepy/compat.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 6a6ec65..e1b780a 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -146,15 +146,22 @@ def rmtree(path):
     def remove_readonly(action, name, exc_info):
         """Clear the readonly bit and reattempt the removal."""
         exc_type, exc_value, exc_traceback = exc_info
-        if issubclass(
-          exc_type,
-          getattr(builtins, 'PermissionError', OSError),
-          ) and exc_value.errno == errno.EPERM:
+        is_perm = issubclass(
+            exc_type,
+            getattr(
+                builtins,
+                'PermissionError',
+                EnvironmentError,
+                ),
+            ) and (
+            exc_value == errno.EPERM or
+            getattr(exc_value, 'winerror', None) == 5
+            )
+        if is_perm:
             os.chmod(name, stat.S_IWRITE)
             action(name)
         else:
-            raise exc_info
-
+            raise exc_type, exc_value, exc_traceback
     retries = 10
     while os.path.exists(path):
         try:
-- 
GitLab


From c3310a49b1df72bbc66d880e8b4e87adb538cb72 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 11:14:30 +0100
Subject: [PATCH 128/171] use six reraise

---
 browsepy/compat.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index e1b780a..b9145d4 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -4,6 +4,7 @@ import os
 import os.path
 import stat
 import sys
+import six
 import errno
 import abc
 import time
@@ -146,22 +147,16 @@ def rmtree(path):
     def remove_readonly(action, name, exc_info):
         """Clear the readonly bit and reattempt the removal."""
         exc_type, exc_value, exc_traceback = exc_info
-        is_perm = issubclass(
-            exc_type,
-            getattr(
-                builtins,
-                'PermissionError',
-                EnvironmentError,
-                ),
-            ) and (
-            exc_value == errno.EPERM or
+        is_perm = issubclass(exc_type, EnvironmentError) and (
+            exc_value.errno == errno.EPERM or
             getattr(exc_value, 'winerror', None) == 5
             )
         if is_perm:
             os.chmod(name, stat.S_IWRITE)
             action(name)
         else:
-            raise exc_type, exc_value, exc_traceback
+            six.reraise(exc_type, exc_value, exc_traceback)
+
     retries = 10
     while os.path.exists(path):
         try:
-- 
GitLab


From e8db67d187e2790cb727da6c09cf966f5c649526 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 11:51:08 +0100
Subject: [PATCH 129/171] implement rmtree from scratch

---
 browsepy/compat.py | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index b9145d4..a3d2320 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -8,7 +8,6 @@ import six
 import errno
 import abc
 import time
-import shutil
 import tempfile
 import itertools
 import functools
@@ -137,40 +136,34 @@ def rmtree(path):
     """
     Remove directory tree, with platform-specific fixes.
 
-    A simple :func:`shutil.rmtree` wrapper, with some error handling and
-    retry logic, as some filesystems on some platforms does not always
-    behave as they should.
+    Implemented from scratch as :func:`shutil.rmtree` is broken on some
+    platforms and python version combinations.
 
     :param path: path to remove
     :type path: str
     """
-    def remove_readonly(action, name, exc_info):
-        """Clear the readonly bit and reattempt the removal."""
-        exc_type, exc_value, exc_traceback = exc_info
-        is_perm = issubclass(exc_type, EnvironmentError) and (
-            exc_value.errno == errno.EPERM or
-            getattr(exc_value, 'winerror', None) == 5
-            )
-        if is_perm:
-            os.chmod(name, stat.S_IWRITE)
-            action(name)
-        else:
-            six.reraise(exc_type, exc_value, exc_traceback)
-
-    retries = 10
-    while os.path.exists(path):
+    exc_type, exc_value, exc_traceback = None, None, None
+    for retry in range(10):
         try:
-            shutil.rmtree(path, onerror=remove_readonly)
-        except EnvironmentError as error:
-            if retries and any(
-              getattr(error, prop, None) in values
+            if os.path.exists(path):
+                for base, dirs, files in os.walk(path, topdown=False):
+                    os.chmod(base, stat.S_IRWXU)
+                    for filename in files:
+                        filename = os.path.join(base, filename)
+                        os.chmod(filename, stat.S_IWUSR)
+                        os.unlink(filename)
+                    os.rmdir(base)
+            return
+        except EnvironmentError:
+            if any(
+              getattr(exc_value, prop, None) in values
               for prop, values in RETRYABLE_OSERROR_PROPERTIES.items()
               ):
-                retries -= 1
+                exc_type, exc_value, exc_traceback = sys.exc_info()
                 time.sleep(0.1)  # allow sluggish filesystems to catch up
                 continue
-
             raise
+    six.reraise(exc_type, exc_value, exc_traceback)
 
 
 @contextlib.contextmanager
-- 
GitLab


From 44dea1582a614e6e54de3db428f7070d2b7f2b7d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 12:00:28 +0100
Subject: [PATCH 130/171] reduce complexity

---
 browsepy/compat.py | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index a3d2320..f8e2729 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -132,6 +132,19 @@ def scandir(path):
             files.close()
 
 
+def is_oserror_retryable(error):
+    """
+    Check if given OSError is retryable for filesystem operations.
+
+    :param error: error to check
+    :type error: OSError
+    """
+    for prop, values in RETRYABLE_OSERROR_PROPERTIES.items():
+        if getattr(error, prop, None) in values:
+            return True
+    return False
+
+
 def rmtree(path):
     """
     Remove directory tree, with platform-specific fixes.
@@ -142,28 +155,23 @@ def rmtree(path):
     :param path: path to remove
     :type path: str
     """
-    exc_type, exc_value, exc_traceback = None, None, None
+    exc_info = ()
     for retry in range(10):
         try:
-            if os.path.exists(path):
-                for base, dirs, files in os.walk(path, topdown=False):
-                    os.chmod(base, stat.S_IRWXU)
-                    for filename in files:
-                        filename = os.path.join(base, filename)
-                        os.chmod(filename, stat.S_IWUSR)
-                        os.unlink(filename)
-                    os.rmdir(base)
+            for base, dirs, files in os.walk(path, topdown=False):
+                os.chmod(base, stat.S_IRWXU)
+                for filename in files:
+                    filename = os.path.join(base, filename)
+                    os.chmod(filename, stat.S_IWUSR)
+                    os.unlink(filename)
+                os.rmdir(base)
             return
-        except EnvironmentError:
-            if any(
-              getattr(exc_value, prop, None) in values
-              for prop, values in RETRYABLE_OSERROR_PROPERTIES.items()
-              ):
-                exc_type, exc_value, exc_traceback = sys.exc_info()
-                time.sleep(0.1)  # allow sluggish filesystems to catch up
-                continue
-            raise
-    six.reraise(exc_type, exc_value, exc_traceback)
+        except EnvironmentError as error:
+            if not is_oserror_retryable(error):
+                raise
+            exc_info = sys.exc_info()
+        time.sleep(0.1)  # allow sluggish filesystems to catch up
+    six.reraise(*exc_info)
 
 
 @contextlib.contextmanager
-- 
GitLab


From bca3f6f8d41510c3f999fe808b18ba3c77200fd7 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 12:11:21 +0100
Subject: [PATCH 131/171] try again to use shutil.rmtree

---
 browsepy/compat.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index f8e2729..e5cd52c 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -3,6 +3,7 @@
 import os
 import os.path
 import stat
+import shutil
 import sys
 import six
 import errno
@@ -149,22 +150,18 @@ def rmtree(path):
     """
     Remove directory tree, with platform-specific fixes.
 
-    Implemented from scratch as :func:`shutil.rmtree` is broken on some
-    platforms and python version combinations.
-
     :param path: path to remove
     :type path: str
     """
     exc_info = ()
+    path_join = os.path.join
     for retry in range(10):
         try:
             for base, dirs, files in os.walk(path, topdown=False):
                 os.chmod(base, stat.S_IRWXU)
                 for filename in files:
-                    filename = os.path.join(base, filename)
-                    os.chmod(filename, stat.S_IWUSR)
-                    os.unlink(filename)
-                os.rmdir(base)
+                    os.chmod(path_join(base, filename), stat.S_IWUSR)
+            shutil.rmtree(path)
             return
         except EnvironmentError as error:
             if not is_oserror_retryable(error):
-- 
GitLab


From 7c8a85017ada09b54e768f2028c3b87b4c512e4b Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 12:32:33 +0100
Subject: [PATCH 132/171] try to wait for directory content removal

---
 .gitlab-ci.yml     |  2 +-
 browsepy/compat.py | 38 ++++++++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f3056f..907e1f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,7 +147,7 @@ publish-gh-pages:
     git checkout "${TARGET_BRANCH}" || git checkout --orphan "${TARGET_BRANCH}"
     cp ../.gitignore ../.appveyor.yml .
     cp -rf ${CI_PROJECT_DIR}/doc/.build/html/** .
-    git add **
+    git add .
     git commit -am "update ${TARGET_BRANCH}"
     git push -u origin "${TARGET_BRANCH}"
 
diff --git a/browsepy/compat.py b/browsepy/compat.py
index e5cd52c..2f932f5 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -3,7 +3,6 @@
 import os
 import os.path
 import stat
-import shutil
 import sys
 import six
 import errno
@@ -133,7 +132,7 @@ def scandir(path):
             files.close()
 
 
-def is_oserror_retryable(error):
+def _is_oserror_retryable(error):
     """
     Check if given OSError is retryable for filesystem operations.
 
@@ -146,25 +145,44 @@ def is_oserror_retryable(error):
     return False
 
 
+def _unsafe_rmtree(path):
+    """
+    Remove directory tree, without error handling.
+
+    :param path: directory path
+    :type path: str
+    """
+    for base, dirs, files in os.walk(path, topdown=False):
+        os.chmod(base, stat.S_IRWXU)
+
+        for filename in files:
+            filename = os.path.join(base, filename)
+            os.chmod(filename, stat.S_IWUSR)
+            os.remove(filename)
+
+        while os.listdir(base):
+            time.sleep(0.1)  # wait for emptyness
+
+        os.rmdir(base)
+
+
 def rmtree(path):
     """
     Remove directory tree, with platform-specific fixes.
 
+    Implemented from scratch as :func:`shutil.rmtree` is broken on some
+    platforms and python version combinations.
+
     :param path: path to remove
     :type path: str
     """
+
     exc_info = ()
-    path_join = os.path.join
     for retry in range(10):
         try:
-            for base, dirs, files in os.walk(path, topdown=False):
-                os.chmod(base, stat.S_IRWXU)
-                for filename in files:
-                    os.chmod(path_join(base, filename), stat.S_IWUSR)
-            shutil.rmtree(path)
-            return
+            return _unsafe_rmtree(path)
         except EnvironmentError as error:
-            if not is_oserror_retryable(error):
+            if not _is_oserror_retryable(error):
                 raise
             exc_info = sys.exc_info()
         time.sleep(0.1)  # allow sluggish filesystems to catch up
-- 
GitLab


From bc443164db870498ccef13f133db3bf0d25fc6d4 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 12:38:16 +0100
Subject: [PATCH 133/171] make rmtree wait and retry recursive

---
 browsepy/compat.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 2f932f5..b1a597f 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -160,10 +160,11 @@ def _unsafe_rmtree(path):
             os.chmod(filename, stat.S_IWUSR)
             os.remove(filename)
 
-        while os.listdir(base):
-            time.sleep(0.1)  # wait for emptyness
-
-        os.rmdir(base)
+        if os.listdir(base):
+            time.sleep(0.5)  # wait for emptyness
+            _unsafe_rmtree(base)
+        else:
+            os.rmdir(base)
 
 
 def rmtree(path):
-- 
GitLab


From f4d44efbc2a6bbf0d135771921298a6ad56ae99c Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 12:51:03 +0100
Subject: [PATCH 134/171] use scandir for rmtree

---
 browsepy/compat.py | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index b1a597f..97859da 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -132,19 +132,6 @@ def scandir(path):
             files.close()
 
 
-def _is_oserror_retryable(error):
-    """
-    Check if given OSError is retryable for filesystem operations.
-
-    :param error: error to check
-    :type error: OSError
-    """
-    for prop, values in RETRYABLE_OSERROR_PROPERTIES.items():
-        if getattr(error, prop, None) in values:
-            return True
-    return False
-
-
 def _unsafe_rmtree(path):
     """
     Remove directory tree, without error handling.
@@ -152,7 +139,7 @@ def _unsafe_rmtree(path):
     :param path: directory path
     :type path: str
     """
-    for base, dirs, files in os.walk(path, topdown=False):
+    for base, dirs, files in walk(path, topdown=False):
         os.chmod(base, stat.S_IRWXU)
 
         for filename in files:
@@ -160,7 +147,10 @@ def _unsafe_rmtree(path):
             os.chmod(filename, stat.S_IWUSR)
             os.remove(filename)
 
-        if os.listdir(base):
+        with scandir(base) as remaining:
+            retry = any(remaining)
+
+        if retry:
             time.sleep(0.5)  # wait for emptyness
             _unsafe_rmtree(base)
         else:
@@ -183,7 +173,10 @@ def rmtree(path):
         try:
             return _unsafe_rmtree(path)
         except EnvironmentError as error:
-            if not _is_oserror_retryable(error):
+            if not any(
+              getattr(error, prop, None) in values
+              for prop, values in RETRYABLE_OSERROR_PROPERTIES.items()
+              ):
                 raise
             exc_info = sys.exc_info()
         time.sleep(0.1)  # allow sluggish filesystems to catch up
-- 
GitLab


From f981d7dc1c5da3f0696927579a9b11617c3893d8 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 2 Aug 2019 16:20:16 +0100
Subject: [PATCH 135/171] no longer handle permission errors on rmtree

---
 browsepy/compat.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 97859da..bebe441 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -2,7 +2,6 @@
 
 import os
 import os.path
-import stat
 import sys
 import six
 import errno
@@ -59,7 +58,6 @@ RETRYABLE_OSERROR_PROPERTIES = {
         # Error codes which could imply a busy filesystem
         getattr(errno, prop)
         for prop in (
-            'EPERM',
             'ENOENT',
             'EIO',
             'ENXIO',
@@ -140,18 +138,14 @@ def _unsafe_rmtree(path):
     :type path: str
     """
     for base, dirs, files in walk(path, topdown=False):
-        os.chmod(base, stat.S_IRWXU)
-
         for filename in files:
-            filename = os.path.join(base, filename)
-            os.chmod(filename, stat.S_IWUSR)
-            os.remove(filename)
+            os.remove(os.path.join(base, filename))
 
         with scandir(base) as remaining:
             retry = any(remaining)
 
         if retry:
-            time.sleep(0.5)  # wait for emptyness
+            time.sleep(0.1)  # wait for sluggish filesystems
             _unsafe_rmtree(base)
         else:
             os.rmdir(base)
@@ -179,7 +173,7 @@ def rmtree(path):
               ):
                 raise
             exc_info = sys.exc_info()
-        time.sleep(0.1)  # allow sluggish filesystems to catch up
+        time.sleep(0.1)
     six.reraise(*exc_info)
 
 
-- 
GitLab


From 1122e71e716699de54d0911b4a3a294ef481661f Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Fri, 9 Aug 2019 09:35:34 +0000
Subject: [PATCH 136/171] fix player plugin button sizing

---
 browsepy/plugin/player/static/css/base.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browsepy/plugin/player/static/css/base.css b/browsepy/plugin/player/static/css/base.css
index f1199d4..81eeb5f 100644
--- a/browsepy/plugin/player/static/css/base.css
+++ b/browsepy/plugin/player/static/css/base.css
@@ -6,6 +6,10 @@
   width: auto;
 }
 
+.jp-controls button {
+  box-sizing: border-box;
+}
+
 .jp-current-time, .jp-duration {
   width: 4.5em;
 }
-- 
GitLab


From 97ac31318ee0c8343aa5b9bc6724cfdac602a885 Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Fri, 9 Aug 2019 09:38:34 +0000
Subject: [PATCH 137/171] generalize player button fix

---
 browsepy/plugin/player/static/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browsepy/plugin/player/static/css/base.css b/browsepy/plugin/player/static/css/base.css
index 81eeb5f..4b92457 100644
--- a/browsepy/plugin/player/static/css/base.css
+++ b/browsepy/plugin/player/static/css/base.css
@@ -6,7 +6,7 @@
   width: auto;
 }
 
-.jp-controls button {
+.jp-audio button {
   box-sizing: border-box;
 }
 
-- 
GitLab


From 67cd6581f3928ccfb41f9de92a1b314cf46afc8a Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Fri, 9 Aug 2019 09:56:07 +0000
Subject: [PATCH 138/171] generalize page titles

---
 .../templates/create_directory.file_actions.html            | 6 ++++++
 .../file_actions/templates/selection.file_actions.html      | 6 ++++++
 browsepy/plugin/player/templates/audio.player.html          | 6 ++++++
 browsepy/templates/browse.html                              | 6 +++---
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/browsepy/plugin/file_actions/templates/create_directory.file_actions.html b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
index 93811cf..d0db9f2 100644
--- a/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
@@ -1,5 +1,11 @@
 {% extends "base.html" %}
 
+{% block title %}
+  {{- super() -}}
+  {%- if file and file.urlpath %} - {{ file.urlpath }}{% endif -%}
+  {{- ' - create directory' -}}
+{% endblock %}
+
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" type="text/css" href="{{ url_for('file_actions.static', filename='style.css') }}"/>
diff --git a/browsepy/plugin/file_actions/templates/selection.file_actions.html b/browsepy/plugin/file_actions/templates/selection.file_actions.html
index ac333f9..593e210 100644
--- a/browsepy/plugin/file_actions/templates/selection.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/selection.file_actions.html
@@ -1,5 +1,11 @@
 {% extends "base.html" %}
 
+{% block title %}
+  {{- super() -}}
+  {%- if file and file.urlpath %} - {{ file.urlpath }}{% endif -%}
+  {{- ' - selection' -}}
+{% endblock %}
+
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" type="text/css" href="{{ url_for('file_actions.static', filename='style.css') }}"/>
diff --git a/browsepy/plugin/player/templates/audio.player.html b/browsepy/plugin/player/templates/audio.player.html
index 908ea6c..2019919 100644
--- a/browsepy/plugin/player/templates/audio.player.html
+++ b/browsepy/plugin/player/templates/audio.player.html
@@ -1,5 +1,11 @@
 {% extends "base.html" %}
 
+{% block title %}
+  {{- super() -}}
+  {%- if file and file.urlpath %} - {{ file.urlpath }}{% endif -%}
+  {{- ' - play' -}}
+{% endblock %}
+
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" type="text/css" href="{{ url_for('player.static', filename='css/jplayer.blue.monday.min.css') }}"/>
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index 5773176..0713611 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -59,10 +59,10 @@
 </th>
 {%- endmacro %}
 
-{% block title -%}
-  {{ super() }}
+{% block title %}
+  {{- super() -}}
   {%- if file and file.urlpath %} - {{ file.urlpath }}{% endif -%}
-{%- endblock %}
+{% endblock %}
 
 {% block styles %}
   {{ super() }}
-- 
GitLab


From 2f2219d7b014d2f85ad72448c4978d84496f949a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 6 Nov 2019 05:25:25 +0000
Subject: [PATCH 139/171] Add etag to browse endpoint

---
 browsepy/__init__.py | 11 ++++++++++-
 browsepy/file.py     | 41 ++++++++++++++++++++++++++++-------------
 browsepy/http.py     |  8 ++++++++
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 9551097..164abc9 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -17,6 +17,7 @@ from .appconfig import Flask
 from .manager import PluginManager
 from .file import Node, secure_filename
 from .stream import stream_template
+from .http import etag
 from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
                         InvalidFilenameError, InvalidPathError
 from . import compat
@@ -159,13 +160,21 @@ def browse(path):
     try:
         directory = Node.from_urlpath(path)
         if directory.is_directory and not directory.is_excluded:
-            return stream_template(
+            response = stream_template(
                 'browse.html',
                 file=directory,
                 sort_property=sort_property,
                 sort_fnc=sort_fnc,
                 sort_reverse=sort_reverse
                 )
+            response.set_etag(
+                etag(
+                    content_mtime=directory.content_mtime,
+                    sort_property=sort_property,
+                    ),
+                )
+            response.make_conditional(request)
+            return response
     except OutsideDirectoryBase:
         pass
     return NotFound()
diff --git a/browsepy/file.py b/browsepy/file.py
index 2e6ef74..1e5fc4d 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -503,6 +503,21 @@ class Directory(Node):
     encoding = 'default'
     generic = False
 
+    @property
+    def content_mtime(self):
+        """
+        Get computed modification file based on its content.
+
+        :returns: modification id
+        :rtype: str
+        """
+        nodes = self.listdir(sortkey=lambda n: n.stats.st_mtime, reverse=True)
+        for node in nodes:
+            if node.stats.st_mtime > self.stats.st_mtime:
+                return node.stats.st_mtime
+            break
+        return self.stats.st_mtime
+
     @property
     def name(self):
         """
@@ -639,11 +654,11 @@ class Directory(Node):
         :returns: True if this directory has no entries, False otherwise.
         :rtype: bool
         """
-        if self._listdir_cache is not None:
-            return not bool(self._listdir_cache)
-        for entry in self._listdir():
-            return False
-        return True
+        if self._listdir_cache is None:
+            for entry in self._listdir():
+                return False
+            return True
+        return not self._listdir_cache
 
     def remove(self):
         """
@@ -689,6 +704,8 @@ class Directory(Node):
         """
         Check if directory contains an entry with given filename.
 
+        This method purposely hits the filesystem to support platform quirks.
+
         :param filename: filename will be check
         :type filename: str
         :returns: True if exists, False otherwise.
@@ -771,14 +788,12 @@ class Directory(Node):
         :return: sorted list of File instances
         :rtype: list of File instances
         """
-        if self._listdir_cache is None:
-            self._listdir_cache = tuple(self._listdir())
-        if sortkey:
-            return sorted(self._listdir_cache, key=sortkey, reverse=reverse)
-        data = list(self._listdir_cache)
-        if reverse:
-            data.reverse()
-        return data
+        cache = self._listdir_cache
+        if cache is None:
+            self._listdir_cache = cache = list(self._listdir())
+        if sortkey is None:
+            return cache[::-1 if reverse else 1]
+        return sorted(cache, key=sortkey, reverse=reverse)
 
 
 def fmt_size(size, binary=True):
diff --git a/browsepy/http.py b/browsepy/http.py
index 94ad19c..ba890cd 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -1,8 +1,11 @@
 # -*- coding: UTF-8 -*-
 
 import re
+import binascii
 import logging
 
+import msgpack
+
 from werkzeug.http import dump_header, dump_options_header
 from werkzeug.datastructures import Headers as BaseHeaders
 
@@ -54,3 +57,8 @@ class Headers(BaseHeaders):
             for key, value in kwargs.items()
             ]
         return super(Headers, self).__init__(items)
+
+
+def etag(*args, **kwargs):
+    """Generate etag identifier from given parameters."""
+    return '{:x}'.format(binascii.crc32(msgpack.dumps((args, kwargs))))
-- 
GitLab


From 3aa65060c2c5c605e39ea3df7acc9e32ae5c4b61 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 6 Nov 2019 18:22:36 +0000
Subject: [PATCH 140/171] make cached listdir to always precompute stats

---
 browsepy/compat.py |  2 ++
 browsepy/file.py   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index bebe441..52038d1 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -515,6 +515,7 @@ if PY_LEGACY:
     range = xrange  # noqa
     filter = itertools.ifilter
     map = itertools.imap
+    zip = itertools.izip
     basestring = basestring  # noqa
     unicode = unicode  # noqa
     chr = unichr  # noqa
@@ -525,6 +526,7 @@ else:
     range = range
     filter = filter
     map = map
+    zip = zip
     basestring = str
     unicode = str
     chr = chr
diff --git a/browsepy/file.py b/browsepy/file.py
index 1e5fc4d..e257f9c 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -511,12 +511,9 @@ class Directory(Node):
         :returns: modification id
         :rtype: str
         """
-        nodes = self.listdir(sortkey=lambda n: n.stats.st_mtime, reverse=True)
-        for node in nodes:
-            if node.stats.st_mtime > self.stats.st_mtime:
-                return node.stats.st_mtime
-            break
-        return self.stats.st_mtime
+        mtimes = [node.stats.st_mtime for node in self.listdir()]
+        mtimes.append(self.stats.st_mtime)
+        return max(mtimes)
 
     @property
     def name(self):
@@ -680,7 +677,7 @@ class Directory(Node):
             self.path,
             self.app.config.get('DIRECTORY_TAR_BUFFSIZE', 10240),
             flask.copy_current_request_context(
-                self.plugin_manager.check_excluded
+                self.plugin_manager.check_excluded,
                 ),
             self.app.config.get('DIRECTORY_TAR_COMPRESS', 'gzip'),
             self.app.config.get('DIRECTORY_TAR_COMPRESSLEVEL', 1),
@@ -696,8 +693,8 @@ class Directory(Node):
                 content_disposition=(
                     'attachment',
                     {'filename': stream.name} if stream.name else {},
-                    )
-                )
+                    ),
+                ),
             )
 
     def contains(self, filename):
@@ -790,7 +787,9 @@ class Directory(Node):
         """
         cache = self._listdir_cache
         if cache is None:
-            self._listdir_cache = cache = list(self._listdir())
+            cache = self._listdir_cache = (
+                list(self._listdir(precomputed_stats=True))
+                )
         if sortkey is None:
             return cache[::-1 if reverse else 1]
         return sorted(cache, key=sortkey, reverse=reverse)
-- 
GitLab


From 700957f9d8adfbe6965d6145a6c0c065b83b337b Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 6 Nov 2019 19:10:46 +0000
Subject: [PATCH 141/171] cleanup

---
 browsepy/__init__.py     | 25 ++++++++++---------------
 browsepy/file.py         | 24 ++++++++++++------------
 browsepy/http.py         |  5 ++---
 browsepy/static/base.css | 12 +++++++++---
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 164abc9..20efbc1 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -10,7 +10,7 @@ import cookieman
 
 from flask import request, render_template, redirect, \
                   url_for, send_from_directory, \
-                  make_response, session
+                  session
 from werkzeug.exceptions import NotFound
 
 from .appconfig import Flask
@@ -62,6 +62,7 @@ plugin_manager = PluginManager(app)
 
 @app.session_interface.register('browse:sort')
 def shrink_browse_sort(data, last):
+    """Session `browse:short` size reduction logic."""
     if data['browse:sort'] and not last:
         data['browse:sort'].pop()
     else:
@@ -148,7 +149,7 @@ def sort(property, path):
 
     session['browse:sort'] = \
         [(path, property)] + session.get('browse:sort', [])
-    return redirect(url_for(".browse", path=directory.urlpath))
+    return redirect(url_for('.browse', path=directory.urlpath))
 
 
 @app.route('/browse', defaults={'path': ''})
@@ -167,6 +168,7 @@ def browse(path):
                 sort_fnc=sort_fnc,
                 sort_reverse=sort_reverse
                 )
+            response.last_modified = directory.content_mtime
             response.set_etag(
                 etag(
                     content_mtime=directory.content_mtime,
@@ -180,7 +182,7 @@ def browse(path):
     return NotFound()
 
 
-@app.route('/open/<path:path>', endpoint="open")
+@app.route('/open/<path:path>', endpoint='open')
 def open_file(path):
     try:
         file = Node.from_urlpath(path)
@@ -191,7 +193,7 @@ def open_file(path):
     return NotFound()
 
 
-@app.route("/download/file/<path:path>")
+@app.route('/download/file/<path:path>')
 def download_file(path):
     try:
         file = Node.from_urlpath(path)
@@ -202,7 +204,7 @@ def download_file(path):
     return NotFound()
 
 
-@app.route("/download/directory/<path:path>.tgz")
+@app.route('/download/directory/<path:path>.tgz')
 def download_directory(path):
     try:
         directory = Node.from_urlpath(path)
@@ -213,7 +215,7 @@ def download_directory(path):
     return NotFound()
 
 
-@app.route("/remove/<path:path>", methods=("GET", "POST"))
+@app.route('/remove/<path:path>', methods=('GET', 'POST'))
 def remove(path):
     try:
         file = Node.from_urlpath(path)
@@ -230,8 +232,8 @@ def remove(path):
     return redirect(url_for(".browse", path=file.parent.urlpath))
 
 
-@app.route("/upload", defaults={'path': ''}, methods=("POST",))
-@app.route("/upload/<path:path>", methods=("POST",))
+@app.route('/upload', defaults={'path': ''}, methods=('POST',))
+@app.route('/upload/<path:path>', methods=('POST',))
 def upload(path):
     try:
         directory = Node.from_urlpath(path)
@@ -270,13 +272,6 @@ def index():
     return browse(urlpath)
 
 
-@app.after_request
-def page_not_found(response):
-    if response.status_code == 404:
-        return make_response((render_template('404.html'), 404))
-    return response
-
-
 @app.errorhandler(InvalidPathError)
 def bad_request_error(e):
     file = None
diff --git a/browsepy/file.py b/browsepy/file.py
index e257f9c..409e4b5 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -503,18 +503,6 @@ class Directory(Node):
     encoding = 'default'
     generic = False
 
-    @property
-    def content_mtime(self):
-        """
-        Get computed modification file based on its content.
-
-        :returns: modification id
-        :rtype: str
-        """
-        mtimes = [node.stats.st_mtime for node in self.listdir()]
-        mtimes.append(self.stats.st_mtime)
-        return max(mtimes)
-
     @property
     def name(self):
         """
@@ -657,6 +645,18 @@ class Directory(Node):
             return True
         return not self._listdir_cache
 
+    @cached_property
+    def content_mtime(self):
+        """
+        Get computed modification file based on its content.
+
+        :returns: modification id
+        :rtype: str
+        """
+        mtimes = [node.stats.st_mtime for node in self.listdir()]
+        mtimes.append(self.stats.st_mtime)
+        return max(mtimes)
+
     def remove(self):
         """
         Remove directory tree.
diff --git a/browsepy/http.py b/browsepy/http.py
index ba890cd..ec81a9c 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -1,12 +1,11 @@
 # -*- coding: UTF-8 -*-
 
 import re
-import binascii
 import logging
 
 import msgpack
 
-from werkzeug.http import dump_header, dump_options_header
+from werkzeug.http import dump_header, dump_options_header, generate_etag
 from werkzeug.datastructures import Headers as BaseHeaders
 
 
@@ -61,4 +60,4 @@ class Headers(BaseHeaders):
 
 def etag(*args, **kwargs):
     """Generate etag identifier from given parameters."""
-    return '{:x}'.format(binascii.crc32(msgpack.dumps((args, kwargs))))
+    return generate_etag(msgpack.dumps((args, kwargs)))
diff --git a/browsepy/static/base.css b/browsepy/static/base.css
index cdd7248..16ef3eb 100644
--- a/browsepy/static/base.css
+++ b/browsepy/static/base.css
@@ -114,6 +114,7 @@ table.browser tr:nth-child(2n) {
 
 table.browser th,
 table.browser td {
+  padding: 0;
   margin: 0;
   text-align: center;
   vertical-align: middle;
@@ -122,7 +123,6 @@ table.browser td {
 }
 
 table.browser th {
-  padding-bottom: 0.75em;
   border-bottom: 1px solid black;
 }
 
@@ -230,13 +230,19 @@ ol.path li *.root:after {
 
 a.sorting {
   display: block;
-  padding: 0 1.4em 0 0;
+}
+
+table.browser th a.sorting {
+  margin: -0.5em;
+  padding: 0.5em 0.5em 0.75em;
 }
 
 a.sorting:after,
 a.sorting:before {
   float: right;
-  margin: 0.2em -1.3em -0.2em;
+  line-height: 1.25em;
+  vertical-align: middle;
+  margin-left: -1em;
 }
 
 a.sorting:hover:after,
-- 
GitLab


From 5e4e1ce17ce0b8dbb81cc1127944233391301a30 Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Tue, 3 Dec 2019 10:28:05 +0000
Subject: [PATCH 142/171] add py38 to CI

---
 .appveyor.yml  | 2 ++
 .gitlab-ci.yml | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 31b2536..c3df04d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,6 +12,8 @@ environment:
   - PYTHON: "C:\\Python36-x64"
   - PYTHON: "C:\\Python37"
   - PYTHON: "C:\\Python37-x64"
+  - PYTHON: "C:\\Python38"
+  - PYTHON: "C:\\Python38-x64"
 
 build: off
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 907e1f9..0407b4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,10 @@ python37:
   extends: .test-base
   image: python:3.7-alpine
 
+python38:
+  extends: .test-base
+  image: python:3.8-alpine
+
 eslint:
   extends: .base
   stage: test
@@ -133,6 +137,8 @@ publish-gh-pages:
     ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
     git config --global user.name "${GITLAB_USER_LOGIN}"
     git config --global user.email "${GITLAB_USER_EMAIL}"
+  after_script:
+  - rm ~/.ssh/id_rsa
   script:
   - |
     if [ "${CI_COMMIT_REF_NAME}" == "master" ]; then
-- 
GitLab


From 8dfb4c16cd648abbcd8e16fb9f520bd6a36baaf9 Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Tue, 3 Dec 2019 15:02:01 +0000
Subject: [PATCH 143/171] ensure build deps are installed on ci

---
 .appveyor.yml  |  2 +-
 .gitlab-ci.yml | 58 +++++++++++++++++++++++++-------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index c3df04d..85248bb 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -31,7 +31,7 @@ install:
   SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   python --version
   python -c "import struct; print(struct.calcsize('P') * 8)"
-  pip install --disable-pip-version-check --user --upgrade pip setuptools
+  pip install --disable-pip-version-check --user --upgrade pip setuptools wheel
 
 test_script:
 - "python setup.py test"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0407b4e..d9f168f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,17 +2,20 @@
   except:
     refs:
     - /^gh-pages(-.*)?$/
+  cache:
+    paths:
+    - .cache/pip
+  variables:
+    PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
+    MODULE: browsepy
 
-.test-base:
+.test:
   extends: .base
   stage: test
   variables:
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
     COVERAGE_FILE: "${CI_PROJECT_DIR}/.coverage.${CI_JOB_NAME}"
     MODULE: browsepy
-  cache:
-    paths:
-    - .cache/pip
   artifacts:
     when: on_success
     expire_in: 1h
@@ -21,21 +24,26 @@
   before_script:
   - |
     apk add --no-cache build-base python3-dev
-    pip install coverage flake8
+    pip install coverage flake8 wheel
   script:
   - |
     flake8 ${MODULE}
     coverage run -p setup.py test
 
-.after-base:
+.report:
   extends: .base
+  stage: report
   image: python:3.7-alpine
-  variables:
-    PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
-    MODULE: browsepy
-  cache:
-    paths:
-    - .cache/pip
+
+.publish:
+  extends: .base
+  stage: publish
+  dependencies: []
+  before_script:
+  - |
+    apk add --no-cache build-base python3-dev
+    pip install twine
+
 
 stages:
 - test
@@ -44,7 +52,7 @@ stages:
 - publish
 
 python27:
-  extends: .test-base
+  extends: .test
   image: python:2.7-alpine
   before_script:
   - |
@@ -52,19 +60,19 @@ python27:
     pip install coverage flake8
 
 python35:
-  extends: .test-base
+  extends: .test
   image: python:3.5-alpine
 
 python36:
-  extends: .test-base
+  extends: .test
   image: python:3.6-alpine
 
 python37:
-  extends: .test-base
+  extends: .test
   image: python:3.7-alpine
 
 python38:
-  extends: .test-base
+  extends: .test
   image: python:3.8-alpine
 
 eslint:
@@ -86,8 +94,7 @@ eslint:
   - node_modules/.bin/eslint ${MODULE}
 
 coverage:
-  extends: .after-base
-  stage: report
+  extends: .report
   artifacts:
     when: always
     paths:
@@ -102,8 +109,7 @@ coverage:
     coverage report
 
 doc:
-  extends: .after-base
-  stage: report
+  extends: .report
   dependencies: []
   artifacts:
     paths:
@@ -158,14 +164,11 @@ publish-gh-pages:
     git push -u origin "${TARGET_BRANCH}"
 
 publish-alpha:
-  extends: .after-base
-  stage: publish
+  extends: .publish
   dependencies: []
   only:
     refs:
     - next
-  before_script:
-  - pip install twine
   script:
   - |
     ALPHA=$(date +%s)
@@ -176,14 +179,11 @@ publish-alpha:
     twine upload --repository-url=https://test.pypi.org/legacy/ dist/*
 
 publish:
-  extends: .after-base
-  stage: publish
+  extends: .publish
   dependencies: []
   only:
     refs:
     - master
-  before_script:
-  - pip install twine
   script:
   - |
     python setup.py bdist_wheel sdist
-- 
GitLab


From 3d579e19fe0765ff45af397207ddf8379cda7cba Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Tue, 3 Dec 2019 15:12:46 +0000
Subject: [PATCH 144/171] ensure ci got correct image

---
 .gitlab-ci.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9f168f..84a5c34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,10 @@
   except:
     refs:
     - /^gh-pages(-.*)?$/
+
+.python:
+  extends: .base
+  image: python:3.8-alpine
   cache:
     paths:
     - .cache/pip
@@ -10,7 +14,7 @@
     MODULE: browsepy
 
 .test:
-  extends: .base
+  extends: .python
   stage: test
   variables:
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
@@ -31,12 +35,11 @@
     coverage run -p setup.py test
 
 .report:
-  extends: .base
+  extends: .python
   stage: report
-  image: python:3.7-alpine
 
 .publish:
-  extends: .base
+  extends: .python
   stage: publish
   dependencies: []
   before_script:
-- 
GitLab


From 36836a03e7bbeb9c5231e8584d877cd385f006ae Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Tue, 3 Dec 2019 15:22:51 +0000
Subject: [PATCH 145/171] ci refactor config file for readability

---
 .gitlab-ci.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84a5c34..d487a1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,12 @@
+
+# config
+
+stages:
+- test
+- report
+- external
+- publish
+
 .base:
   except:
     refs:
@@ -47,12 +56,7 @@
     apk add --no-cache build-base python3-dev
     pip install twine
 
-
-stages:
-- test
-- report
-- external
-- publish
+# stage: tests
 
 python27:
   extends: .test
@@ -96,6 +100,8 @@ eslint:
   script:
   - node_modules/.bin/eslint ${MODULE}
 
+# stage: report
+
 coverage:
   extends: .report
   artifacts:
@@ -124,6 +130,8 @@ doc:
   script:
   - make -C doc html
 
+# stage: publish
+
 publish-gh-pages:
   extends: .base
   stage: publish
@@ -166,7 +174,7 @@ publish-gh-pages:
     git commit -am "update ${TARGET_BRANCH}"
     git push -u origin "${TARGET_BRANCH}"
 
-publish-alpha:
+publish-next:
   extends: .publish
   dependencies: []
   only:
@@ -181,7 +189,7 @@ publish-alpha:
     python setup.py bdist_wheel sdist
     twine upload --repository-url=https://test.pypi.org/legacy/ dist/*
 
-publish:
+publish-master:
   extends: .publish
   dependencies: []
   only:
-- 
GitLab


From 3b906d35dc25cee6b3eea56a508a9299deee1df1 Mon Sep 17 00:00:00 2001
From: "Felipe A. Hernandez" <ergoithz@gmail.com>
Date: Tue, 3 Dec 2019 15:34:25 +0000
Subject: [PATCH 146/171] ci add libffi-dev

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d487a1a..08f1d91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ stages:
     - .coverage.*
   before_script:
   - |
-    apk add --no-cache build-base python3-dev
+    apk add --no-cache build-base libffi-dev python3-dev
     pip install coverage flake8 wheel
   script:
   - |
@@ -53,7 +53,7 @@ stages:
   dependencies: []
   before_script:
   - |
-    apk add --no-cache build-base python3-dev
+    apk add --no-cache build-base libffi-dev python3-dev
     pip install twine
 
 # stage: tests
@@ -63,7 +63,7 @@ python27:
   image: python:2.7-alpine
   before_script:
   - |
-    apk add --no-cache build-base python2-dev
+    apk add --no-cache build-base libffi-dev python2-dev
     pip install coverage flake8
 
 python35:
-- 
GitLab


From 7b61384167782c8d16567a0347ca8aa99f5b0ee6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 4 Dec 2019 13:16:56 +0000
Subject: [PATCH 147/171] fix symlink vulnerabilities, drop deprecated plugin
 manager

---
 browsepy/compat.py  |   2 +-
 browsepy/file.py    |  48 ++++++++++---
 browsepy/manager.py | 168 ++++----------------------------------------
 browsepy/stream.py  |  79 ++++++++++-----------
 4 files changed, 92 insertions(+), 205 deletions(-)

diff --git a/browsepy/compat.py b/browsepy/compat.py
index 52038d1..049727c 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -497,7 +497,7 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
 
 
 if PY_LEGACY:
-    class FileNotFoundError(BaseException):
+    class FileNotFoundError(Exception):
         __metaclass__ = abc.ABCMeta
 
     FileNotFoundError.register(OSError)
diff --git a/browsepy/file.py b/browsepy/file.py
index 409e4b5..670764f 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -26,11 +26,11 @@ from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
 
 
 logger = logging.getLogger(__name__)
-unicode_underscore = '_'.decode('utf-8') if compat.PY_LEGACY else '_'
+unicode_underscore = compat.unicode('_')
 underscore_replace = '%s:underscore' % __name__
 codecs.register_error(
     underscore_replace,
-    lambda error: (unicode_underscore, error.start + 1)
+    lambda error: (unicode_underscore, getattr(error, 'start', 0) + 1),
     )
 binary_units = ('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB')
 standard_units = ('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB')
@@ -80,7 +80,19 @@ class Node(object):
 
         :returns: True if excluded, False otherwise
         """
-        return self.plugin_manager.check_excluded(self.path)
+        return self.plugin_manager.check_excluded(
+            self.path,
+            follow_symlinks=self.is_symlink,
+            )
+
+    @cached_property
+    def is_symlink(self):
+        """
+        Get if current node is a symlink.
+
+        :returns: True if symlink, False otherwise
+        """
+        return os.path.islink(self.path)
 
     @cached_property
     def plugin_manager(self):
@@ -152,7 +164,12 @@ class Node(object):
         :returns: stats object
         :rtype: posix.stat_result or nt.stat_result
         """
-        return os.stat(self.path)
+        try:
+            return os.stat(self.path)
+        except compat.FileNotFoundError:
+            if self.is_symlink:
+                return os.lstat(self.path)
+            raise
 
     @cached_property
     def pathconf(self):
@@ -617,7 +634,7 @@ class Directory(Node):
         :returns: True if a file can be upload to directory, False otherwise
         :rtype: bool
         """
-        dirbase = self.app.config.get('DIRECTORY_UPLOAD', False)
+        dirbase = self.app.config.get('DIRECTORY_UPLOAD')
         return dirbase and check_base(self.path, dirbase)
 
     @cached_property
@@ -748,7 +765,9 @@ class Directory(Node):
 
     def _listdir(self, precomputed_stats=(os.name == 'nt')):
         """
-        Iter unsorted entries on this directory.
+        Iterate unsorted entries on this directory.
+
+        Symlinks are skipped when pointing outside to base directory.
 
         :yields: Directory or File instance for each entry in directory
         :rtype: Iterator of browsepy.file.Node
@@ -756,25 +775,30 @@ class Directory(Node):
         directory_class = self.directory_class
         file_class = self.file_class
         exclude_fnc = self.plugin_manager.check_excluded
-
         with compat.scandir(self.path) as files:
             for entry in files:
-                if exclude_fnc(entry.path):
+                is_symlink = entry.is_symlink()
+                if exclude_fnc(entry.path, follow_symlinks=is_symlink):
                     continue
                 kwargs = {
                     'path': entry.path,
                     'app': self.app,
                     'parent': self,
                     'is_excluded': False,
+                    'is_symlink': is_symlink,
                     }
                 try:
-                    if precomputed_stats and not entry.is_symlink():
-                        kwargs['stats'] = entry.stat()
+                    if precomputed_stats:
+                        kwargs['stats'] = entry.stat(
+                            follow_symlinks=is_symlink,
+                            )
                     yield (
                         directory_class(**kwargs)
-                        if entry.is_dir(follow_symlinks=True) else
+                        if entry.is_dir(follow_symlinks=is_symlink) else
                         file_class(**kwargs)
                         )
+                except compat.FileNotFoundError:
+                    pass
                 except OSError as e:
                     logger.exception(e)
 
@@ -782,6 +806,8 @@ class Directory(Node):
         """
         Get sorted list (by given sortkey and reverse params) of File objects.
 
+        Symlinks are skipped when pointing outside to base directory.
+
         :return: sorted list of File instances
         :rtype: list of File instances
         """
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 70e8f60..51a71f5 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -1,22 +1,19 @@
 # -*- coding: UTF-8 -*-
 
-import re
+import os.path
 import pkgutil
 import argparse
 import functools
 import warnings
-import collections
-
-import flask
 
 from werkzeug.utils import cached_property
 from cookieman import CookieMan
 
 from . import mimetype
 from . import compat
+from . import file
 from . import utils
 
-from .compat import deprecated, usedoc
 from .utils import defaultsnamedtuple
 from .exceptions import PluginNotFoundError, InvalidArgumentError, \
                         WidgetParameterException
@@ -271,12 +268,16 @@ class ExcludePluginManager(PluginManagerBase):
         """
         self._exclude_functions.add(exclude_fnc)
 
-    def check_excluded(self, path):
+    def check_excluded(self, path, follow_symlinks=True):
         """
         Check if given path is excluded.
 
+        Followed symlinks are checked against directory base for safety.
+
         :param path: absolute path to check against config and plugins
         :type path: str
+        :param follow_symlinks: wether or not follow_symlinks
+        :type follow_symlinks: bool
         :return: wether if path should be excluded or not
         :rtype: bool
         """
@@ -286,6 +287,13 @@ class ExcludePluginManager(PluginManagerBase):
         for fnc in self._exclude_functions:
             if fnc(path):
                 return True
+        if follow_symlinks:
+            realpath = os.path.realpath(path)
+            dirbase = self.app.config.get('DIRECTORY_BASE')
+            return realpath != path and (
+                dirbase and not file.check_base(path, dirbase) or
+                self.check_excluded(realpath, follow_symlinks=False)
+                )
         return False
 
     def clear(self):
@@ -708,153 +716,7 @@ class ArgumentPluginManager(PluginManagerBase):
         return getattr(self._argparse_arguments, name, default)
 
 
-class MimetypeActionPluginManager(WidgetPluginManager, MimetypePluginManager):
-    """
-    Deprecated plugin API
-    """
-
-    _deprecated_places = {
-        'javascript': 'scripts',
-        'style': 'styles',
-        'button': 'entry-actions',
-        'link': 'entry-link',
-        }
-
-    @classmethod
-    def _mimetype_filter(cls, mimetypes):
-        widget_mimetype_re = re.compile(
-            '^%s$' % '$|^'.join(
-                map(re.escape, mimetypes)
-                ).replace('\\*', '[^/]+')
-            )
-
-        def handler(f):
-            return widget_mimetype_re.match(f.type) is not None
-
-        return handler
-
-    def _widget_attrgetter(self, widget, name):
-        def handler(f):
-            app = f.app or self.app or flask.current_app
-            with app.app_context():
-                return getattr(widget.for_file(f), name)
-        return handler
-
-    def _widget_props(self, widget, endpoint=None, mimetypes=(),
-                      dynamic=False):
-        type = getattr(widget, '_type', 'base')
-        fields = self.widget_types[type]._fields
-        with self.app.app_context():
-            props = {
-                name: self._widget_attrgetter(widget, name)
-                for name in fields
-                if hasattr(widget, name)
-                }
-        props.update(
-            type=type,
-            place=self._deprecated_places.get(widget.place),
-            )
-        if dynamic:
-            props['filter'] = self._mimetype_filter(mimetypes)
-        if 'endpoint' in fields:
-            props['endpoint'] = endpoint
-        return props
-
-    @usedoc(WidgetPluginManager.__init__)
-    def __init__(self, app=None):
-        self._action_widgets = []
-        super(MimetypeActionPluginManager, self).__init__(app=app)
-
-    @usedoc(WidgetPluginManager.clear)
-    def clear(self):
-        self._action_widgets[:] = ()
-        super(MimetypeActionPluginManager, self).clear()
-
-    @cached_property
-    def _widget(self):
-        with warnings.catch_warnings():
-            warnings.filterwarnings('ignore', category=DeprecationWarning)
-            from . import widget
-        return widget
-
-    @cached_property
-    @deprecated('Deprecated attribute action_class')
-    def action_class(self):
-        return collections.namedtuple(
-            'MimetypeAction',
-            ('endpoint', 'widget')
-            )
-
-    @cached_property
-    @deprecated('Deprecated attribute style_class')
-    def style_class(self):
-        return self._widget.StyleWidget
-
-    @cached_property
-    @deprecated('Deprecated attribute button_class')
-    def button_class(self):
-        return self._widget.ButtonWidget
-
-    @cached_property
-    @deprecated('Deprecated attribute javascript_class')
-    def javascript_class(self):
-        return self._widget.JavascriptWidget
-
-    @cached_property
-    @deprecated('Deprecated attribute link_class')
-    def link_class(self):
-        return self._widget.LinkWidget
-
-    @deprecated('Deprecated method register_action')
-    def register_action(self, endpoint, widget, mimetypes=(), **kwargs):
-        props = self._widget_props(widget, endpoint, mimetypes, True)
-        self.register_widget(**props)
-        self._action_widgets.append((widget, props['filter'], endpoint))
-
-    @deprecated('Deprecated method get_actions')
-    def get_actions(self, file):
-        return [
-            self.action_class(endpoint, deprecated.for_file(file))
-            for deprecated, filter, endpoint in self._action_widgets
-            if endpoint and filter(file)
-            ]
-
-    @usedoc(WidgetPluginManager.register_widget)
-    def register_widget(self, place=None, type=None, widget=None, filter=None,
-                        **kwargs):
-        if isinstance(place or widget, self._widget.WidgetBase):
-            warnings.warn(
-                'Deprecated use of register_widget',
-                DeprecationWarning
-                )
-            widget = place or widget
-            props = self._widget_props(widget)
-            self.register_widget(**props)
-            self._action_widgets.append((widget, None, None))
-            return
-        return super(MimetypeActionPluginManager, self).register_widget(
-            place=place, type=type, widget=widget, filter=filter, **kwargs)
-
-    @usedoc(WidgetPluginManager.get_widgets)
-    def get_widgets(self, file=None, place=None):
-        if isinstance(file, compat.basestring) or \
-          place in self._deprecated_places:
-            warnings.warn(
-                'Deprecated use of get_widgets',
-                DeprecationWarning
-                )
-            place = file or place
-            return [
-                widget
-                for widget, filter, endpoint in self._action_widgets
-                if not (filter or endpoint) and place == widget.place
-                ]
-        return super(MimetypeActionPluginManager, self).get_widgets(
-            file=file, place=place)
-
-
-class PluginManager(MimetypeActionPluginManager,
-                    BlueprintPluginManager,
+class PluginManager(BlueprintPluginManager,
                     ExcludePluginManager,
                     WidgetPluginManager,
                     MimetypePluginManager,
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 50c918a..47a9c56 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -90,7 +90,8 @@ class TarFileStream(compat.Iterator):
     queue_class = ByteQueue
     abort_exception = WriteAbort
     thread_class = threading.Thread
-    tarfile_class = tarfile.open
+    tarfile_open = tarfile.open
+    tarfile_format = tarfile.PAX_FORMAT
 
     mimetype = 'application/x-tar'
     compresion_modes = {
@@ -102,18 +103,19 @@ class TarFileStream(compat.Iterator):
 
     @property
     def name(self):
-        """
-        Filename generated from given path and compression method.
-        """
+        """Get filename generated from given path and compression method."""
         return '%s.%s' % (os.path.basename(self.path), self._extension)
 
     @property
     def encoding(self):
-        """
-        Mimetype parameters (such as encoding).
-        """
+        """Mimetype parameters (such as encoding)."""
         return self._compress
 
+    @property
+    def closed(self):
+        """Get if input stream have been closed with no further writes."""
+        return self._closed
+
     def __init__(self, path, buffsize=10240, exclude=None, compress='gzip',
                  compresslevel=1):
         """
@@ -134,22 +136,23 @@ class TarFileStream(compat.Iterator):
         """
         self.path = path
         self.exclude = exclude
-        self.closed = False
 
         self._started = False
+        self._closed = False
         self._buffsize = buffsize
 
         self._compress = compress if compress and buffsize > 15 else None
         self._mode, self._extension = self.compresion_modes[self._compress]
 
         self._queue = self.queue_class(buffsize)
-        self._th = self.thread_class(target=self._fill)
-        self._th_exc = None
+        self._thread = self.thread_class(target=self._fill)
+        self._thread_exception = None
 
-    @property
-    def _infofilter(self):
+    def _fill(self):
         """
-        TarInfo filtering function based on :attr:`exclude`.
+        Perform compression pushing compressed data to internal queue.
+
+        Used as compression thread target, started on first iteration.
         """
         path = self.path
         path_join = os.path.join
@@ -164,32 +167,28 @@ class TarFileStream(compat.Iterator):
             :return: infofile or None if file must be excluded
             :rtype: tarfile.TarInfo or None
             """
-            return None if exclude(path_join(path, info.name)) else info
-
-        return infofilter if exclude else None
-
-    def _fill(self):
-        """
-        Writes data on internal tarfile instance, which writes to current
-        object, using :meth:`write`.
+            return (
+                None
+                if exclude(
+                    path_join(path, info.name),
+                    follow_symlinks=info.issym(),
+                    ) else
+                info
+                )
 
-        As this method is blocking, it is used inside a thread.
-
-        This method is called automatically, on a thread, on initialization,
-        so there is little need to call it manually.
-        """
         try:
-            with self.tarfile_class(
+            with self.tarfile_open(
               fileobj=self,
               mode='w|{}'.format(self._mode),
               bufsize=self._buffsize,
+              format=self.tarfile_format,
               encoding='utf-8',
               ) as tarfile:
-                tarfile.add(self.path, '', filter=self._infofilter)
+                tarfile.add(path, filter=infofilter if exclude else None)
         except self.abort_exception:
             pass
         except Exception as e:
-            self._th_exc = e
+            self._thread_exception = e
         finally:
             self._queue.finish()
 
@@ -202,16 +201,16 @@ class TarFileStream(compat.Iterator):
         :returns: tarfile data as bytes
         :rtype: bytes
         """
-        if self.closed:
-            raise StopIteration()
+        if self._closed:
+            raise StopIteration
 
         if not self._started:
             self._started = True
-            self._th.start()
+            self._thread.start()
 
         data = self._queue.get()
         if not data:
-            raise StopIteration()
+            raise StopIteration
 
         return data
 
@@ -228,7 +227,7 @@ class TarFileStream(compat.Iterator):
         :rtype: int
         :raises WriteAbort: if already closed or closed while blocking
         """
-        if self.closed:
+        if self._closed:
             raise self.abort_exception()
 
         try:
@@ -242,13 +241,13 @@ class TarFileStream(compat.Iterator):
         """
         Closes tarfile pipe and stops further processing.
         """
-        if not self.closed:
-            self.closed = True
+        if not self._closed:
+            self._closed = True
             self._queue.finish()
-            if self._started and self._th.is_alive():
-                self._th.join()
-            if self._th_exc:
-                raise self._th_exc
+            if self._started and self._thread.is_alive():
+                self._thread.join()
+            if self._thread_exception:
+                raise self._thread_exception
 
 
 def stream_template(template_name, **context):
-- 
GitLab


From adda9b82d2d626721769e228fe6cecd8d807b195 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 6 Dec 2019 17:04:36 +0000
Subject: [PATCH 148/171] wip refactor

---
 browsepy/__init__.py                          | 157 ++++------
 browsepy/__main__.py                          |   4 +-
 browsepy/file.py                              |  30 +-
 browsepy/manager.py                           |   6 +-
 browsepy/mimetype.py                          |  16 +-
 browsepy/plugin/player/__init__.py            |  99 ++----
 browsepy/plugin/player/playable.py            | 245 +++++++++------
 .../plugin/player/templates/audio.player.html |   4 +-
 browsepy/stream.py                            |  58 ++--
 browsepy/tests/deprecated/__init__.py         |   0
 browsepy/tests/deprecated/plugin/__init__.py  |   0
 browsepy/tests/deprecated/plugin/player.py    |  92 ------
 browsepy/tests/deprecated/test_plugins.py     | 292 ------------------
 browsepy/tests/runner.py                      |  53 ----
 browsepy/tests/test_code.py                   |  28 +-
 browsepy/transform/__init__.py                |  19 +-
 browsepy/transform/glob.py                    |  19 ++
 browsepy/transform/htmlcompress.py            |  16 +
 browsepy/utils.py                             |  31 +-
 browsepy/widget.py                            |  89 ------
 requirements/development.txt                  |   3 +
 setup.py                                      |   6 +-
 22 files changed, 405 insertions(+), 862 deletions(-)
 delete mode 100644 browsepy/tests/deprecated/__init__.py
 delete mode 100644 browsepy/tests/deprecated/plugin/__init__.py
 delete mode 100644 browsepy/tests/deprecated/plugin/player.py
 delete mode 100644 browsepy/tests/deprecated/test_plugins.py
 delete mode 100644 browsepy/tests/runner.py
 delete mode 100644 browsepy/widget.py

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 20efbc1..bf81e8b 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -10,7 +10,7 @@ import cookieman
 
 from flask import request, render_template, redirect, \
                   url_for, send_from_directory, \
-                  session
+                  session, abort
 from werkzeug.exceptions import NotFound
 
 from .appconfig import Flask
@@ -139,17 +139,12 @@ def template_globals():
 @app.route('/sort/<string:property>', defaults={'path': ''})
 @app.route('/sort/<string:property>/<path:path>')
 def sort(property, path):
-    try:
-        directory = Node.from_urlpath(path)
-    except OutsideDirectoryBase:
-        return NotFound()
-
-    if not directory.is_directory or directory.is_excluded:
-        return NotFound()
-
-    session['browse:sort'] = \
-        [(path, property)] + session.get('browse:sort', [])
-    return redirect(url_for('.browse', path=directory.urlpath))
+    directory = Node.from_urlpath(path)
+    if directory.is_directory and not directory.is_excluded:
+        session['browse:sort'] = \
+            [(path, property)] + session.get('browse:sort', [])
+        return redirect(url_for('.browse', path=directory.urlpath))
+    abort(404)
 
 
 @app.route('/browse', defaults={'path': ''})
@@ -157,119 +152,93 @@ def sort(property, path):
 def browse(path):
     sort_property = get_cookie_browse_sorting(path, 'text')
     sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
-
-    try:
-        directory = Node.from_urlpath(path)
-        if directory.is_directory and not directory.is_excluded:
-            response = stream_template(
-                'browse.html',
-                file=directory,
+    directory = Node.from_urlpath(path)
+    if directory.is_directory and not directory.is_excluded:
+        response = stream_template(
+            'browse.html',
+            file=directory,
+            sort_property=sort_property,
+            sort_fnc=sort_fnc,
+            sort_reverse=sort_reverse
+            )
+        response.last_modified = directory.content_mtime
+        response.set_etag(
+            etag(
+                content_mtime=directory.content_mtime,
                 sort_property=sort_property,
-                sort_fnc=sort_fnc,
-                sort_reverse=sort_reverse
-                )
-            response.last_modified = directory.content_mtime
-            response.set_etag(
-                etag(
-                    content_mtime=directory.content_mtime,
-                    sort_property=sort_property,
-                    ),
-                )
-            response.make_conditional(request)
-            return response
-    except OutsideDirectoryBase:
-        pass
-    return NotFound()
+                ),
+            )
+        response.make_conditional(request)
+        return response
+    abort(404)
 
 
 @app.route('/open/<path:path>', endpoint='open')
 def open_file(path):
-    try:
-        file = Node.from_urlpath(path)
-        if file.is_file and not file.is_excluded:
-            return send_from_directory(file.parent.path, file.name)
-    except OutsideDirectoryBase:
-        pass
-    return NotFound()
+    file = Node.from_urlpath(path)
+    if file.is_file and not file.is_excluded:
+        return send_from_directory(file.parent.path, file.name)
+    abort(404)
 
 
 @app.route('/download/file/<path:path>')
 def download_file(path):
-    try:
-        file = Node.from_urlpath(path)
-        if file.is_file and not file.is_excluded:
-            return file.download()
-    except OutsideDirectoryBase:
-        pass
-    return NotFound()
+    file = Node.from_urlpath(path)
+    if file.is_file and not file.is_excluded:
+        return file.download()
+    abort(404)
 
 
 @app.route('/download/directory/<path:path>.tgz')
 def download_directory(path):
-    try:
-        directory = Node.from_urlpath(path)
-        if directory.is_directory and not directory.is_excluded:
-            return directory.download()
-    except OutsideDirectoryBase:
-        pass
-    return NotFound()
+    directory = Node.from_urlpath(path)
+    if directory.is_directory and not directory.is_excluded:
+        return directory.download()
+    abort(404)
 
 
 @app.route('/remove/<path:path>', methods=('GET', 'POST'))
 def remove(path):
-    try:
-        file = Node.from_urlpath(path)
-    except OutsideDirectoryBase:
-        return NotFound()
-
-    if not file.can_remove or file.is_excluded:
-        return NotFound()
-
-    if request.method == 'GET':
-        return render_template('remove.html', file=file)
-
-    file.remove()
-    return redirect(url_for(".browse", path=file.parent.urlpath))
+    file = Node.from_urlpath(path)
+    if file.can_remove and not file.is_excluded:
+        if request.method == 'GET':
+            return render_template('remove.html', file=file)
+        file.remove()
+        return redirect(url_for(".browse", path=file.parent.urlpath))
+    abort(404)
 
 
 @app.route('/upload', defaults={'path': ''}, methods=('POST',))
 @app.route('/upload/<path:path>', methods=('POST',))
 def upload(path):
-    try:
-        directory = Node.from_urlpath(path)
-    except OutsideDirectoryBase:
-        return NotFound()
-
+    directory = Node.from_urlpath(path)
     if (
-      not directory.is_directory or
-      not directory.can_upload or
-      directory.is_excluded
+      directory.is_directory and
+      directory.can_upload and
+      not directory.is_excluded
       ):
-        return NotFound()
-
-    for v in request.files.listvalues():
-        for f in v:
-            filename = secure_filename(f.filename)
-            if filename:
-                filename = directory.choose_filename(filename)
-                filepath = os.path.join(directory.path, filename)
-                f.save(filepath)
-            else:
+        files = (
+            (secure_filename(file.filename), file)
+            for values in request.files.listvalues()
+            for file in values
+            )
+        for filename, file in files:
+            if not filename:
                 raise InvalidFilenameError(
                     path=directory.path,
-                    filename=f.filename
+                    filename=file.filename,
                     )
-    return redirect(url_for('.browse', path=directory.urlpath))
+            filename = directory.choose_filename(filename)
+            filepath = os.path.join(directory.path, filename)
+            file.save(filepath)
+        return redirect(url_for('.browse', path=directory.urlpath))
+    abort(404)
 
 
 @app.route('/')
 def index():
     path = app.config['DIRECTORY_START'] or app.config['DIRECTORY_BASE']
-    try:
-        urlpath = Node(path).urlpath
-    except OutsideDirectoryBase:
-        return NotFound()
-    return browse(urlpath)
+    return browse(Node(path).urlpath)
 
 
 @app.errorhandler(InvalidPathError)
@@ -284,11 +253,13 @@ def bad_request_error(e):
 
 
 @app.errorhandler(OutsideRemovableBase)
+@app.errorhandler(OutsideDirectoryBase)
 @app.errorhandler(404)
 def page_not_found_error(e):
     return render_template('404.html'), 404
 
 
+@app.errorhandler(Exception)
 @app.errorhandler(500)
 def internal_server_error(e):  # pragma: no cover
     logger.exception(e)
diff --git a/browsepy/__main__.py b/browsepy/__main__.py
index 318234f..987025f 100644
--- a/browsepy/__main__.py
+++ b/browsepy/__main__.py
@@ -39,7 +39,6 @@ class ArgParse(SafeArgumentParser):
     default_port = os.getenv('BROWSEPY_PORT', '8080')
 
     defaults = {
-        'add_help': True,
         'prog': name,
         'formatter_class': HelpFormatter,
         'description': 'description: starts a %s web file browser' % name
@@ -55,6 +54,9 @@ class ArgParse(SafeArgumentParser):
             'port', nargs='?', type=int,
             default=self.default_port,
             help='port to listen (default: %(default)s)')
+        self.add_argument(
+            '--help', action='store_true',
+            help='show help and exit (honors --plugin)')
         self.add_argument(
             '--help-all', action='store_true',
             help='show help for all available plugins and exit')
diff --git a/browsepy/file.py b/browsepy/file.py
index 670764f..cda6fc2 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -14,7 +14,6 @@ import flask
 from werkzeug.utils import cached_property
 
 from . import compat
-from . import manager
 from . import utils
 from . import stream
 
@@ -60,13 +59,14 @@ class Node(object):
     to specify :meth:`from_urlpath` classmethod behavior:
 
     * :attr:`generic`, if true, an instance of directory_class or file_class
-      will be created instead of an instance of this class tself.
+       will be created instead of an instance of this class itself.
     * :attr:`directory_class`, class will be used for directory nodes,
     * :attr:`file_class`, class will be used for file nodes.
     """
     generic = True
-    directory_class = None  # set later at import time
-    file_class = None  # set later at import time
+    directory_class = None  # set at import time
+    file_class = None  # set at import time
+    manager_class = None  # set at import time
 
     re_charset = re.compile('; charset=(?P<charset>[^;]+)')
     can_download = False
@@ -75,8 +75,7 @@ class Node(object):
     @cached_property
     def is_excluded(self):
         """
-        Get if current node shouldn't be shown, using :attt:`app` config's
-        exclude_fnc.
+        Get if current node should be avoided based on registered rules.
 
         :returns: True if excluded, False otherwise
         """
@@ -104,7 +103,7 @@ class Node(object):
         """
         return (
             self.app.extensions.get('plugin_manager') or
-            manager.PluginManager(self.app)
+            self.manager_class(self.app)
             )
 
     @cached_property
@@ -339,7 +338,7 @@ class Node(object):
     @classmethod
     def register_file_class(cls, kls):
         """
-        Convenience method for setting current class file_class property.
+        Set given type as file_class constructor for current class.
 
         :param kls: class to set
         :type kls: type
@@ -352,7 +351,7 @@ class Node(object):
     @classmethod
     def register_directory_class(cls, kls):
         """
-        Convenience method for setting current class directory_class property.
+        Set given type as directory_class constructor for current class.
 
         :param kls: class to set
         :type kls: type
@@ -362,6 +361,19 @@ class Node(object):
         cls.directory_class = kls
         return kls
 
+    @classmethod
+    def register_manager_class(cls, kls):
+        """
+        Set given type as manager_class constructor for current class.
+
+        :param kls: class to set
+        :type kls: type
+        :returns: given class (enabling using this as decorator)
+        :rtype: type
+        """
+        cls.manager_class = kls
+        return kls
+
 
 @Node.register_file_class
 class File(Node):
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 51a71f5..c72bbf5 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -463,8 +463,7 @@ class WidgetPluginManager(PluginManagerBase):
     def register_widget(self, place=None, type=None, widget=None, filter=None,
                         **kwargs):
         """
-        Create (see :meth:`create_widget`) or use provided widget and register
-        it.
+        Register a widget, optionally creating it with :meth:`create_widget`.
 
         This method provides this dual behavior in order to simplify widget
         creation-registration on an functional single step without sacrifycing
@@ -670,7 +669,7 @@ class ArgumentPluginManager(PluginManagerBase):
                 for argargs, argkwargs in arguments:
                     group.add_argument(*argargs, **argkwargs)
 
-        if options.help_all:
+        if options.help or options.help_all:
             parser.print_help()
             parser.exit()
 
@@ -716,6 +715,7 @@ class ArgumentPluginManager(PluginManagerBase):
         return getattr(self._argparse_arguments, name, default)
 
 
+@file.Node.register_manager_class
 class PluginManager(BlueprintPluginManager,
                     ExcludePluginManager,
                     WidgetPluginManager,
diff --git a/browsepy/mimetype.py b/browsepy/mimetype.py
index ef681f0..9201d54 100644
--- a/browsepy/mimetype.py
+++ b/browsepy/mimetype.py
@@ -1,4 +1,9 @@
-# -*- coding: UTF-8 -*-
+"""
+File mimetype detection functions.
+
+This module exposes an :var:`alternatives` tuple containing an ordered
+list of detection strategies, sorted by priority.
+"""
 
 import re
 import subprocess
@@ -11,17 +16,19 @@ re_mime_validate = re.compile(r'\w+/\w+(; \w+=[^;]+)*')
 
 
 def by_python(path):
+    """Get mimetype by file extension using python mimetype database."""
     mime, encoding = mimetypes.guess_type(path)
     if mime in generic_mimetypes:
         return None
     return "%s%s%s" % (
-        mime or "application/octet-stream", "; "
-        if encoding else
-        "", encoding or ""
+        mime or "application/octet-stream",
+        "; " if encoding else "",
+        encoding or ""
         )
 
 
 def by_file(path):
+    """Get mimetype by calling file POSIX utility."""
     try:
         output = subprocess.check_output(
             ("file", "-ib", path),
@@ -36,6 +43,7 @@ def by_file(path):
 
 
 def by_default(path):
+    """Get default generic mimetype."""
     return "application/octet-stream"
 
 
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index b24625f..5a6a820 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -1,15 +1,11 @@
 # -*- coding: UTF-8 -*-
 
-from flask import Blueprint, render_template
-from werkzeug.exceptions import NotFound
-
+from flask import Blueprint, abort
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
-from browsepy.file import OutsideDirectoryBase
 from browsepy.utils import ppath
 from browsepy.stream import stream_template
 
-from .playable import PlayableFile, PlayableDirectory, \
-                      PlayListFile, detect_playable_mimetype
+from .playable import Playable, detect_playable_mimetype
 
 
 player = Blueprint(
@@ -21,51 +17,29 @@ player = Blueprint(
     )
 
 
-@player.route('/audio/<path:path>')
-def audio(path):
-    try:
-        file = PlayableFile.from_urlpath(path)
-        if file.is_file:
-            return render_template('audio.player.html', file=file)
-    except OutsideDirectoryBase:
-        pass
-    return NotFound()
-
-
-@player.route('/list/<path:path>')
-def playlist(path):
-    try:
-        file = PlayListFile.from_urlpath(path)
-        if file.is_file:
-            return stream_template(
-                'audio.player.html',
-                file=file,
-                playlist=True
-                )
-    except OutsideDirectoryBase:
-        pass
-    return NotFound()
-
-
-@player.route('/directory', defaults={'path': ''})
-@player.route('/directory/<path:path>')
-def directory(path):
+@player.route('/', defaults={'path': ''})
+@player.route('/<path:path>')
+def play(path):
+    """
+    Handle player requests.
+
+    :param path: path to directory
+    :type path: str
+    :returns: flask.Response
+    """
     sort_property = get_cookie_browse_sorting(path, 'text')
     sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
-    try:
-        file = PlayableDirectory.from_urlpath(path)
-        if file.is_directory:
-            return stream_template(
-                'audio.player.html',
-                file=file,
-                sort_property=sort_property,
-                sort_fnc=sort_fnc,
-                sort_reverse=sort_reverse,
-                playlist=True
-                )
-    except OutsideDirectoryBase:
-        pass
-    return NotFound()
+    node = Playable.from_urlpath(path)
+    if node.is_playable and not node.is_excluded:
+        return stream_template(
+            'audio.player.html',
+            file=node,
+            sort_property=sort_property,
+            sort_fnc=sort_fnc,
+            sort_reverse=sort_reverse,
+            playlist=node.playable_list,
+            )
+    abort(404)
 
 
 def register_arguments(manager):
@@ -77,7 +51,6 @@ def register_arguments(manager):
     :param manager: plugin manager
     :type manager: browsepy.manager.PluginManager
     """
-
     # Arguments are forwarded to argparse:ArgumentParser.add_argument,
     # https://docs.python.org/3.7/library/argparse.html#the-add-argument-method
     manager.register_argument(
@@ -108,15 +81,8 @@ def register_plugin(manager):
     manager.register_widget(
         place='entry-link',
         type='link',
-        endpoint='player.audio',
-        filter=PlayableFile.detect
-        )
-    manager.register_widget(
-        place='entry-link',
-        icon='playlist',
-        type='link',
-        endpoint='player.playlist',
-        filter=PlayListFile.detect
+        endpoint='player.play',
+        filter=Playable.playable_check,
         )
 
     # register action buttons
@@ -124,15 +90,8 @@ def register_plugin(manager):
         place='entry-actions',
         css='play',
         type='button',
-        endpoint='player.audio',
-        filter=PlayableFile.detect
-        )
-    manager.register_widget(
-        place='entry-actions',
-        css='play',
-        type='button',
-        endpoint='player.playlist',
-        filter=PlayListFile.detect
+        endpoint='player.play',
+        filter=Playable.playable_check,
         )
 
     # check argument (see `register_arguments`) before registering
@@ -141,7 +100,7 @@ def register_plugin(manager):
         manager.register_widget(
             place='header',
             type='button',
-            endpoint='player.directory',
+            endpoint='player.play',
             text='Play directory',
-            filter=PlayableDirectory.detect
+            filter=Playable.playable_check,
             )
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 1536a02..93b75a3 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -34,6 +34,7 @@ class PLSFileParser(object):
         )
 
     def __init__(self, path):
+        """Initialize."""
         with warnings.catch_warnings():
             # We already know about SafeConfigParser deprecation!
             warnings.simplefilter('ignore', category=DeprecationWarning)
@@ -41,6 +42,7 @@ class PLSFileParser(object):
         self._parser.read(path)
 
     def getint(self, section, key, fallback=NOT_SET):
+        """Get int from pls file, returning fallback if unable."""
         try:
             return self._parser.getint(section, key)
         except self.option_exceptions:
@@ -49,6 +51,7 @@ class PLSFileParser(object):
             return fallback
 
     def get(self, section, key, fallback=NOT_SET):
+        """Get value from pls file, returning fallback if unable."""
         try:
             return self._parser.get(section, key)
         except self.option_exceptions:
@@ -57,74 +60,31 @@ class PLSFileParser(object):
             return fallback
 
 
-class PlayableBase(File):
-    extensions = {
-        'mp3': 'audio/mpeg',
-        'ogg': 'audio/ogg',
-        'wav': 'audio/wav',
-        'm3u': 'audio/x-mpegurl',
-        'm3u8': 'audio/x-mpegurl',
-        'pls': 'audio/x-scpls',
-        }
-
-    @classmethod
-    def extensions_from_mimetypes(cls, mimetypes):
-        mimetypes = frozenset(mimetypes)
-        return {
-            ext: mimetype
-            for ext, mimetype in cls.extensions.items()
-            if mimetype in mimetypes
-        }
-
-    @classmethod
-    def detect(cls, node, os_sep=os.sep):
-        basename = node.path.rsplit(os_sep)[-1]
-        if '.' in basename:
-            ext = basename.rsplit('.')[-1]
-            return cls.extensions.get(ext, None)
-        return None
-
-
-class PlayableFile(PlayableBase):
-    mimetypes = ['audio/mpeg', 'audio/ogg', 'audio/wav']
-    extensions = PlayableBase.extensions_from_mimetypes(mimetypes)
-    media_map = {mime: ext for ext, mime in extensions.items()}
-
-    def __init__(self, **kwargs):
-        self.duration = kwargs.pop('duration', None)
-        self.title = kwargs.pop('title', None)
-        super(PlayableFile, self).__init__(**kwargs)
-
-    @property
-    def title(self):
-        return self._title or self.name
+class Playable(Node):
+    """Base class for playable nodes."""
 
-    @title.setter
-    def title(self, title):
-        self._title = title
+    playable_list = False
 
-    @property
-    def media_format(self):
-        return self.media_map[self.type]
-
-
-class PlayListFile(PlayableBase):
-    playable_class = PlayableFile
-    mimetypes = ['audio/x-mpegurl', 'audio/x-mpegurl', 'audio/x-scpls']
-    extensions = PlayableBase.extensions_from_mimetypes(mimetypes)
+    @cached_property
+    def is_playable(self):
+        """
+        Get if node is playable.
 
-    @classmethod
-    def from_urlpath(cls, path, app=None):
-        original = Node.from_urlpath(path, app)
-        if original.mimetype == PlayableDirectory.mimetype:
-            return PlayableDirectory(original.path, original.app)
-        elif original.mimetype == M3UFile.mimetype:
-            return M3UFile(original.path, original.app)
-        if original.mimetype == PLSFile.mimetype:
-            return PLSFile(original.path, original.app)
-        return original
+        :returns: True if node is playable, False otherwise
+        :rtype: bool
+        """
+        print(self)
+        return self.playable_check(self)
 
     def normalize_playable_path(self, path):
+        """
+        Fixes the path of playable file from a playlist.
+
+        :param path: absolute or relative path or uri
+        :type path: str
+        :returns: absolute path or uri
+        :rtype: str or None
+        """
         if '://' in path:
             return path
         path = os.path.normpath(path)
@@ -141,16 +101,103 @@ class PlayListFile(PlayableBase):
         return ()
 
     def entries(self, sortkey=None, reverse=None):
-        for file in self._entries():
-            if self.playable_class.detect(file):
-                yield file
+        """Get playlist file entries."""
+        for node in self._entries():
+            if node.is_playable and not node.is_excluded:
+                yield node
+
+    @classmethod
+    def playable_check(cls, node):
+        """Check if class supports node."""
+        kls = cls.directory_class if node.is_directory else cls.file_class
+        return kls.playable_check(node)
+
+
+@Playable.register_file_class
+class PlayableExtension(Playable):
+    """=Generic node for filenames with extension."""
+
+    title = None
+    duration = None
+
+    playable_extensions = {}
+    playable_extension_classes = []  # deferred
+
+    @cached_property
+    def mimetype(self):
+        """Get mimetype."""
+        print(self)
+        return self.detect_mimetype(self.path)
+
+    @classmethod
+    def detect_extension(cls, path):
+        for extension in cls.playable_extensions:
+            if path.endswith('.%s' % extension):
+                return extension
+        return None
 
+    @classmethod
+    def detect_mimetype(cls, path):
+        return cls.playable_extensions.get(cls.detect_extension(path))
+
+    @classmethod
+    def playable_check(cls, node):
+        """Get if file is playable."""
+        if cls.generic:
+            return any(
+                kls.playable_check(node)
+                for kls in cls.playable_extension_classes
+                )
+        return cls.detect_extension(node.path) in cls.playable_extensions
+
+    @classmethod
+    def from_node(cls, node, app=None):
+        """Get playable node from given node."""
+        if cls.generic:
+            for kls in cls.playable_classes:
+                playable = kls.from_node(node)
+                if playable:
+                    return playable
+            return node
+        return kls(node.path, node.app)
+
+    @classmethod
+    def from_urlpath(cls, path, app=None):
+        kls = cls.get_extension_class(path)
+        if cls.generic:
+            for kls in cls.playable_extension_classes:
+                if kls.detect_extension(path):
+                    return kls.from_urlpath(path, app=app)
+        return super(PlayableExtension, cls).from_urlpath(path, app=app)
+
+    @classmethod
+    def register_playable_extension_class(cls, kls):
+        cls.playable_extension_classes.append(kls)
+        return kls
+
+
+@PlayableExtension.register_playable_extension_class
+class PlayableAudioFile(PlayableExtension, File):
+    """Audio file node."""
+
+    playable_extensions = {
+        'mp3': 'audio/mpeg',
+        'ogg': 'audio/ogg',
+        'wav': 'audio/wav',
+        }
+
+
+@PlayableExtension.register_playable_extension_class
+class PLSFile(PlayableExtension, File):
+    """PLS playlist file node."""
+
+    playable_list = True
+    playable_extensions = {
+        'pls': 'audio/x-scpls',
+        }
 
-class PLSFile(PlayListFile):
     ini_parser_class = PLSFileParser
     maxsize = getattr(sys, 'maxint', 0) or getattr(sys, 'maxsize', 0) or 2**32
-    mimetype = 'audio/x-scpls'
-    extensions = PlayableBase.extensions_from_mimetypes([mimetype])
 
     def _entries(self):
         parser = self.ini_parser_class(self.path)
@@ -180,9 +227,15 @@ class PLSFile(PlayListFile):
                 )
 
 
-class M3UFile(PlayListFile):
-    mimetype = 'audio/x-mpegurl'
-    extensions = PlayableBase.extensions_from_mimetypes([mimetype])
+@PlayableExtension.register_playable_extension_class
+class M3UFile(PlayableExtension, File):
+    """M3U playlist file node."""
+
+    playable_list = True
+    playable_extensions = {
+        'm3u': 'audio/x-mpegurl',
+        'm3u8': 'audio/x-mpegurl',
+        }
 
     def _iter_lines(self):
         prefix = '#EXTM3U\n'
@@ -214,32 +267,34 @@ class M3UFile(PlayListFile):
             data.clear()
 
 
-class PlayableDirectory(Directory):
-    file_class = PlayableFile
-    name = ''
+@Playable.register_directory_class
+class PlayListDirectory(Playable, Directory):
+    """Playable directory node."""
+
+    playable_list = True
 
     @cached_property
     def parent(self):
+        """Get standard directory node."""
         return self.directory_class(self.path, app=self.app)
 
-    @classmethod
-    def detect(cls, node):
-        if node.is_directory:
-            for file in node._listdir():
-                if cls.file_class.detect(file):
-                    return cls.mimetype
-        return None
-
     def entries(self, sortkey=None, reverse=None):
-        listdir_fnc = super(PlayableDirectory, self).listdir
-        for file in listdir_fnc(sortkey=sortkey, reverse=reverse):
-            if self.file_class.detect(file):
-                yield file
-
-
-def detect_playable_mimetype(path, os_sep=os.sep):
-    basename = path.rsplit(os_sep)[-1]
-    if '.' in basename:
-        ext = basename.rsplit('.')[-1]
-        return PlayableBase.extensions.get(ext, None)
-    return None
+        """Get playable directory entries."""
+        for node in self.listdir(sortkey=sortkey, reverse=reverse):
+            if (not node.is_directory) and node.is_playable:
+                yield node
+
+    @classmethod
+    def playable_check(cls, node):
+        """Detect if given node contains playable files."""
+        super_check = super(PlayListDirectory, cls).playable_check
+        return node.is_directory and any(
+            super_check(child)
+            for child in node._listdir()
+            if not child.is_directory
+            )
+
+
+def detect_playable_mimetype(path):
+    """Detect if path corresponds to a playable file by its extension."""
+    return PlayableExtension.detect_mimetype(path)
diff --git a/browsepy/plugin/player/templates/audio.player.html b/browsepy/plugin/player/templates/audio.player.html
index 2019919..1dd98b7 100644
--- a/browsepy/plugin/player/templates/audio.player.html
+++ b/browsepy/plugin/player/templates/audio.player.html
@@ -25,14 +25,14 @@
     data-player-urls="
       {%- for entry in file.entries(sortkey=sort_fnc, reverse=sort_reverse) -%}
         {%- if not loop.first -%}|{%- endif -%}
-        {{- entry.media_format -}}|
+        {{- entry.mimetype -}}|
         {{- entry.name -}}|
         {{- url_for('open', path=entry.urlpath) -}}
       {%- endfor -%}
     "
   {% else %}
     data-player-title="{{ file.name }}"
-    data-player-format="{{ file.media_format }}"
+    data-player-format="{{ file.mimetype }}"
     data-player-url="{{ url_for('open', path=file.urlpath) }}"
   {% endif %}
   ></div>
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 47a9c56..6094230 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Streaming functionality with generators and response constructors."""
 
 import os
 import os.path
@@ -12,12 +12,12 @@ from . import compat
 
 class ByteQueue(compat.Queue):
     """
-    Small synchronized queue storing bytes, with an additional finish method
-    with turns the queue :method:`get` into non-blocking (returns empty bytes).
+    Synchronized byte queue, with an additional finish method.
 
-    On a finished queue all :method:`put` will raise Full exceptions,
-    regardless of the parameters given.
+    On a finished, :method:`put` will raise queue.Full exceptions and
+    :method:`get` will return empty bytes without blockng.
     """
+
     def _init(self, maxsize):
         self.queue = []
         self.bytes = 0
@@ -42,17 +42,17 @@ class ByteQueue(compat.Queue):
         return data
 
     def qsize(self):
-        """
-        Return the number of bytes in the queue.
-        """
+        """Return the number of bytes in the queue."""
         with self.mutex:
             return self.bytes
 
     def finish(self):
         """
-        Turn queue into finished mode: :method:`get` becomes non-blocking
-        and returning empty bytes if empty, and :method:`put` raising
-        :class:`queue.Full` exceptions unconditionally.
+        Put queue into finished mode.
+
+        On finished mode, :method:`get` becomes non-blocking once empty
+        by returning empty and :method:`put` raises :class:`queue.Full`
+        exceptions unconditionally.
         """
         self.finished = True
 
@@ -61,10 +61,8 @@ class ByteQueue(compat.Queue):
 
 
 class WriteAbort(Exception):
-    """
-    Exception used internally by :class:`TarFileStream`'s default
-    implementation to stop tarfile compression.
-    """
+    """Exception to stop tarfile compression process."""
+
     pass
 
 
@@ -119,7 +117,7 @@ class TarFileStream(compat.Iterator):
     def __init__(self, path, buffsize=10240, exclude=None, compress='gzip',
                  compresslevel=1):
         """
-        Initialize thread and class (thread is not started until interation).
+        Initialize thread and class (thread is not started until iteration).
 
         Note that compress parameter will be ignored if buffsize is below 16.
 
@@ -150,7 +148,7 @@ class TarFileStream(compat.Iterator):
 
     def _fill(self):
         """
-        Perform compression pushing compressed data to internal queue.
+        Compress files in path, pushing compressed data into internal queue.
 
         Used as compression thread target, started on first iteration.
         """
@@ -160,7 +158,7 @@ class TarFileStream(compat.Iterator):
 
         def infofilter(info):
             """
-            Filter TarInfo objects for TarFile.
+            Filter TarInfo objects from TarFile.
 
             :param info:
             :type info: tarfile.TarInfo
@@ -184,7 +182,12 @@ class TarFileStream(compat.Iterator):
               format=self.tarfile_format,
               encoding='utf-8',
               ) as tarfile:
-                tarfile.add(path, filter=infofilter if exclude else None)
+                tarfile.add(
+                    path,
+                    arcname='',  # as archive root
+                    recursive=True,
+                    filter=infofilter if exclude else None,
+                    )
         except self.abort_exception:
             pass
         except Exception as e:
@@ -194,7 +197,9 @@ class TarFileStream(compat.Iterator):
 
     def __next__(self):
         """
-        Pulls chunk from tarfile (which is processed on its own thread).
+        Get chunk from internal queue.
+
+        Starts compression thread on first call.
 
         :param want: number bytes to read, defaults to 0 (all available)
         :type want: int
@@ -216,10 +221,11 @@ class TarFileStream(compat.Iterator):
 
     def write(self, data):
         """
-        Put chunk of data into data queue, used on the tarfile thread.
+        Add chunk of data into data queue.
 
-        This method blocks when pipe is already, applying backpressure to
-        writers.
+        This method is used inside the compression thread, blocking when
+        the internal queue is already full, propagating backpressure to
+        writer.
 
         :param data: bytes to write to pipe
         :type data: bytes
@@ -238,9 +244,7 @@ class TarFileStream(compat.Iterator):
         return len(data)
 
     def close(self):
-        """
-        Closes tarfile pipe and stops further processing.
-        """
+        """Close tarfile pipe and stops further processing."""
         if not self._closed:
             self._closed = True
             self._queue.finish()
@@ -252,6 +256,8 @@ class TarFileStream(compat.Iterator):
 
 def stream_template(template_name, **context):
     """
+    Get streaming response rendering a jinja template.
+
     Some templates can be huge, this function returns an streaming response,
     sending the content in chunks and preventing from timeout.
 
diff --git a/browsepy/tests/deprecated/__init__.py b/browsepy/tests/deprecated/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/browsepy/tests/deprecated/plugin/__init__.py b/browsepy/tests/deprecated/plugin/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/browsepy/tests/deprecated/plugin/player.py b/browsepy/tests/deprecated/plugin/player.py
deleted file mode 100644
index 07e7ab1..0000000
--- a/browsepy/tests/deprecated/plugin/player.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-
-import os.path
-
-from flask import Blueprint, render_template
-from browsepy.file import File
-
-
-mimetypes = {
-    'mp3': 'audio/mpeg',
-    'ogg': 'audio/ogg',
-    'wav': 'audio/wav'
-}
-
-__basedir__ = os.path.dirname(os.path.abspath(__file__))
-
-player = Blueprint(
-    'deprecated_player', __name__,
-    url_prefix='/play',
-    template_folder=os.path.join(__basedir__, 'templates'),
-    static_folder=os.path.join(__basedir__, 'static'),
-    )
-
-
-class PlayableFile(File):
-    parent_class = File
-    media_map = {
-        'audio/mpeg': 'mp3',
-        'audio/ogg': 'ogg',
-        'audio/wav': 'wav',
-    }
-
-    def __init__(self, duration=None, title=None, **kwargs):
-        self.duration = duration
-        self.title = title
-        super(PlayableFile, self).__init__(**kwargs)
-
-    @property
-    def title(self):
-        return self._title or self.name
-
-    @title.setter
-    def title(self, title):
-        self._title = title
-
-    @property
-    def media_format(self):
-        return self.media_map[self.type]
-
-
-@player.route('/audio/<path:path>')
-def audio(path):
-    f = PlayableFile.from_urlpath(path)
-    return render_template('audio.player.html', file=f)
-
-
-def detect_playable_mimetype(path, os_sep=os.sep):
-    basename = path.rsplit(os_sep)[-1]
-    if '.' in basename:
-        ext = basename.rsplit('.')[-1]
-        return mimetypes.get(ext, None)
-    return None
-
-
-def register_plugin(manager):
-    """
-    Register blueprints and actions using given plugin manager.
-
-    :param manager: plugin manager
-    :type manager: browsepy.manager.PluginManager
-    """
-    manager.register_blueprint(player)
-    manager.register_mimetype_function(detect_playable_mimetype)
-
-    style = manager.style_class(
-        'deprecated_player.static',
-        filename='css/browse.css'
-        )
-    manager.register_widget(style)
-
-    button_widget = manager.button_class(css='play')
-    link_widget = manager.link_class()
-    for widget in (link_widget, button_widget):
-        manager.register_action(
-            'deprecated_player.audio',
-            widget,
-            mimetypes=(
-                'audio/mpeg',
-                'audio/ogg',
-                'audio/wav',
-            ))
diff --git a/browsepy/tests/deprecated/test_plugins.py b/browsepy/tests/deprecated/test_plugins.py
deleted file mode 100644
index 492dfd0..0000000
--- a/browsepy/tests/deprecated/test_plugins.py
+++ /dev/null
@@ -1,292 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-
-import unittest
-
-import flask
-import browsepy
-import browsepy.file as browsepy_file
-import browsepy.widget as browsepy_widget
-import browsepy.manager as browsepy_manager
-
-from browsepy.tests.deprecated.plugin import player as player
-
-
-class ManagerMock(object):
-    def __init__(self):
-        self.blueprints = []
-        self.mimetype_functions = []
-        self.actions = []
-        self.widgets = []
-
-    @staticmethod
-    def style_class(endpoint, **kwargs):
-        return ('style', endpoint, kwargs)
-
-    @staticmethod
-    def button_class(*args, **kwargs):
-        return ('button', args, kwargs)
-
-    @staticmethod
-    def javascript_class(endpoint, **kwargs):
-        return ('javascript', endpoint, kwargs)
-
-    @staticmethod
-    def link_class(*args, **kwargs):
-        return ('link', args, kwargs)
-
-    def register_blueprint(self, blueprint):
-        self.blueprints.append(blueprint)
-
-    def register_mimetype_function(self, fnc):
-        self.mimetype_functions.append(fnc)
-
-    def register_widget(self, widget):
-        self.widgets.append(widget)
-
-    def register_action(self, blueprint, widget, mimetypes=(), **kwargs):
-        self.actions.append((blueprint, widget, mimetypes, kwargs))
-
-
-class FileMock(object):
-    @property
-    def type(self):
-        return self.mimetype.split(';')[0]
-
-    @property
-    def category(self):
-        return self.mimetype.split('/')[0]
-
-    is_directory = False
-    name = 'unnamed'
-
-    def __init__(self, **kwargs):
-        self.__dict__.update(kwargs)
-
-
-class TestPlugins(unittest.TestCase):
-    app_module = browsepy
-    manager_module = browsepy_manager
-
-    def setUp(self):
-        self.app = self.app_module.app
-        self.manager = self.manager_module.PluginManager(self.app)
-        self.original_namespaces = self.app.config['PLUGIN_NAMESPACES']
-        self.plugin_namespace, self.plugin_name = __name__.rsplit('.', 1)
-        self.app.config['PLUGIN_NAMESPACES'] = (self.plugin_namespace,)
-
-    def tearDown(self):
-        self.app.config['PLUGIN_NAMESPACES'] = self.original_namespaces
-        self.manager.clear()
-
-    def test_manager(self):
-        self.manager.load_plugin(self.plugin_name)
-        self.assertTrue(self.manager._plugin_loaded)
-
-        endpoints = sorted(
-            action.endpoint
-            for action in self.manager.get_actions(FileMock(mimetype='a/a'))
-            )
-
-        self.assertEqual(
-            endpoints,
-            sorted(('test_x_x', 'test_a_x', 'test_x_a', 'test_a_a')))
-        self.assertEqual(
-            self.app.view_functions['old_test_plugin.root'](),
-            'old_test_plugin')
-        self.assertIn('old_test_plugin', self.app.blueprints)
-
-        self.assertRaises(
-            self.manager_module.PluginNotFoundError,
-            self.manager.load_plugin,
-            'non_existent_plugin_module'
-            )
-
-
-def register_plugin(manager):
-    widget_class = browsepy_widget.WidgetBase
-
-    manager._plugin_loaded = True
-    manager.register_action('test_x_x', widget_class('test_x_x'), ('*/*',))
-    manager.register_action('test_a_x', widget_class('test_a_x'), ('a/*',))
-    manager.register_action('test_x_a', widget_class('test_x_a'), ('*/a',))
-    manager.register_action('test_a_a', widget_class('test_a_a'), ('a/a',))
-    manager.register_action('test_b_x', widget_class('test_b_x'), ('b/*',))
-
-    test_plugin_blueprint = flask.Blueprint(
-        'old_test_plugin', __name__, url_prefix='/old_test_plugin_blueprint')
-    test_plugin_blueprint.add_url_rule(
-        '/', endpoint='root', view_func=lambda: 'old_test_plugin')
-
-    manager.register_blueprint(test_plugin_blueprint)
-
-
-class TestPlayerBase(unittest.TestCase):
-    module = player
-    scheme = 'test'
-    hostname = 'localhost'
-    urlprefix = '%s://%s' % (scheme, hostname)
-
-    def assertUrlEqual(self, a, b):
-        self.assertIn(a, (b, '%s%s' % (self.urlprefix, b)))
-
-    def setUp(self):
-        self.app = flask.Flask(self.__class__.__name__)
-        self.app.config['DIRECTORY_REMOVE'] = None
-        self.app.config['SERVER_NAME'] = self.hostname
-        self.app.config['PREFERRED_URL_SCHEME'] = self.scheme
-        self.manager = ManagerMock()
-
-
-class TestPlayer(TestPlayerBase):
-    def test_register_plugin(self):
-        self.module.register_plugin(self.manager)
-
-        self.assertIn(self.module.player, self.manager.blueprints)
-        self.assertIn(
-            self.module.detect_playable_mimetype,
-            self.manager.mimetype_functions)
-
-        widgets = [action[1] for action in self.manager.widgets]
-        self.assertIn('deprecated_player.static', widgets)
-
-        widgets = [action[2] for action in self.manager.widgets]
-        self.assertIn({'filename': 'css/browse.css'}, widgets)
-
-        actions = [action[0] for action in self.manager.actions]
-        self.assertIn('deprecated_player.audio', actions)
-
-
-class TestIntegrationBase(TestPlayerBase):
-    player_module = player
-    browsepy_module = browsepy
-    manager_module = browsepy_manager
-    widget_module = browsepy_widget
-    file_module = browsepy_file
-
-
-class TestIntegration(TestIntegrationBase):
-    def test_register_plugin(self):
-        self.app.config.update(self.browsepy_module.app.config)
-        self.app.config.update(
-            SERVER_NAME=self.hostname,
-            PREFERRED_URL_SCHEME=self.scheme,
-            PLUGIN_NAMESPACES=('browsepy.tests.deprecated.plugin',)
-        )
-        manager = self.manager_module.PluginManager(self.app)
-        manager.load_plugin('player')
-        self.assertIn(self.player_module.player, self.app.blueprints.values())
-
-    def test_register_action(self):
-        manager = self.manager_module.MimetypeActionPluginManager(self.app)
-        widget = self.widget_module.WidgetBase()  # empty
-        manager.register_action('browse', widget, mimetypes=('*/*',))
-        actions = manager.get_actions(FileMock(mimetype='text/plain'))
-        self.assertEqual(len(actions), 1)
-        self.assertEqual(actions[0].widget, widget)
-        manager.register_action('browse', widget, mimetypes=('text/*',))
-        actions = manager.get_actions(FileMock(mimetype='text/plain'))
-        self.assertEqual(len(actions), 2)
-        self.assertEqual(actions[1].widget, widget)
-        manager.register_action('browse', widget, mimetypes=('text/plain',))
-        actions = manager.get_actions(FileMock(mimetype='text/plain'))
-        self.assertEqual(len(actions), 3)
-        self.assertEqual(actions[2].widget, widget)
-        widget = self.widget_module.ButtonWidget()
-        manager.register_action('browse', widget, mimetypes=('text/plain',))
-        actions = manager.get_actions(FileMock(mimetype='text/plain'))
-        self.assertEqual(len(actions), 4)
-        self.assertEqual(actions[3].widget, widget)
-        widget = self.widget_module.LinkWidget()
-        manager.register_action('browse', widget, mimetypes=('*/plain',))
-        actions = manager.get_actions(FileMock(mimetype='text/plain'))
-        self.assertEqual(len(actions), 5)
-        self.assertNotEqual(actions[4].widget, widget)
-        widget = self.widget_module.LinkWidget(icon='file', text='something')
-        manager.register_action('browse', widget, mimetypes=('*/plain',))
-        actions = manager.get_actions(FileMock(mimetype='text/plain'))
-        self.assertEqual(len(actions), 6)
-        self.assertEqual(actions[5].widget, widget)
-
-    def test_register_widget(self):
-        file = self.file_module.Node(app=self.app)
-        manager = self.manager_module.MimetypeActionPluginManager(self.app)
-        widget = self.widget_module.StyleWidget('static', filename='a.css')
-        manager.register_widget(widget)
-        widgets = manager.get_widgets('style')
-        self.assertEqual(len(widgets), 1)
-        self.assertIsInstance(widgets[0], self.widget_module.StyleWidget)
-        self.assertEqual(widgets[0], widget)
-
-        widgets = manager.get_widgets(place='style')
-        self.assertEqual(len(widgets), 1)
-        self.assertIsInstance(widgets[0], self.widget_module.StyleWidget)
-        self.assertEqual(widgets[0], widget)
-
-        widgets = manager.get_widgets(file=file, place='styles')
-        self.assertEqual(len(widgets), 1)
-        self.assertIsInstance(widgets[0], manager.widget_types['stylesheet'])
-        self.assertUrlEqual(widgets[0].href, '/static/a.css')
-
-        widget = self.widget_module.JavascriptWidget('static', filename='a.js')
-        manager.register_widget(widget)
-        widgets = manager.get_widgets('javascript')
-        self.assertEqual(len(widgets), 1)
-        self.assertIsInstance(widgets[0], self.widget_module.JavascriptWidget)
-        self.assertEqual(widgets[0], widget)
-
-        widgets = manager.get_widgets(place='javascript')
-        self.assertEqual(len(widgets), 1)
-        self.assertIsInstance(widgets[0], self.widget_module.JavascriptWidget)
-        self.assertEqual(widgets[0], widget)
-
-        widgets = manager.get_widgets(file=file, place='scripts')
-        self.assertEqual(len(widgets), 1)
-        self.assertIsInstance(widgets[0], manager.widget_types['script'])
-        self.assertUrlEqual(widgets[0].src, '/static/a.js')
-
-    def test_for_file(self):
-        manager = self.manager_module.MimetypeActionPluginManager(self.app)
-        widget = self.widget_module.LinkWidget(icon='asdf', text='something')
-        manager.register_action('browse', widget, mimetypes=('*/plain',))
-        file = self.file_module.File('asdf.txt', plugin_manager=manager,
-                                     app=self.app)
-        self.assertEqual(file.link.icon, 'asdf')
-        self.assertEqual(file.link.text, 'something')
-
-        widget = self.widget_module.LinkWidget()
-        manager.register_action('browse', widget, mimetypes=('*/plain',))
-        file = self.file_module.File('asdf.txt', plugin_manager=manager,
-                                     app=self.app)
-        self.assertEqual(file.link.text, 'asdf.txt')
-
-    def test_from_file(self):
-        with self.app.app_context():
-            file = self.file_module.File('asdf.txt')
-            widget = self.widget_module.LinkWidget.from_file(file)
-            self.assertEqual(widget.text, 'asdf.txt')
-
-
-class TestPlayable(TestIntegrationBase):
-    module = player
-
-    def setUp(self):
-        super(TestPlayable, self).setUp()
-        self.manager = self.manager_module.MimetypeActionPluginManager(
-            self.app)
-        self.manager.register_mimetype_function(
-            self.player_module.detect_playable_mimetype)
-
-    def test_playablefile(self):
-        exts = {
-         'mp3': 'mp3',
-         'wav': 'wav',
-         'ogg': 'ogg'
-        }
-        for ext, media_format in exts.items():
-            pf = self.module.PlayableFile(path='asdf.%s' % ext, app=self.app)
-            self.assertEqual(pf.media_format, media_format)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/browsepy/tests/runner.py b/browsepy/tests/runner.py
deleted file mode 100644
index f5801fa..0000000
--- a/browsepy/tests/runner.py
+++ /dev/null
@@ -1,53 +0,0 @@
-
-import os
-import unittest
-
-
-class DebuggerTextTestResult(unittest._TextTestResult):  # pragma: no cover
-    def __init__(self, stream, descriptions, verbosity, debugger):
-        self.debugger = debugger
-        self.shouldStop = True
-        supa = super(DebuggerTextTestResult, self)
-        supa.__init__(stream, descriptions, verbosity)
-
-    def addError(self, test, exc_info):
-        self.debugger(exc_info)
-        super(DebuggerTextTestResult, self).addError(test, exc_info)
-
-    def addFailure(self, test, exc_info):
-        self.debugger(exc_info)
-        super(DebuggerTextTestResult, self).addFailure(test, exc_info)
-
-
-class DebuggerTextTestRunner(unittest.TextTestRunner):  # pragma: no cover
-    debugger = os.environ.get('UNITTEST_DEBUG', 'none')
-    test_result_class = DebuggerTextTestResult
-
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('verbosity', 2)
-        super(DebuggerTextTestRunner, self).__init__(*args, **kwargs)
-
-    @staticmethod
-    def debug_none(exc_info):
-        pass
-
-    @staticmethod
-    def debug_pdb(exc_info):
-        import pdb
-        pdb.post_mortem(exc_info[2])
-
-    @staticmethod
-    def debug_ipdb(exc_info):
-        import ipdb
-        ipdb.post_mortem(exc_info[2])
-
-    @staticmethod
-    def debug_pudb(exc_info):
-        import pudb
-        pudb.post_mortem(exc_info[2], exc_info[1], exc_info[0])
-
-    def _makeResult(self):
-        return self.test_result_class(
-            self.stream, self.descriptions, self.verbosity,
-            getattr(self, 'debug_%s' % self.debugger, self.debug_none)
-            )
diff --git a/browsepy/tests/test_code.py b/browsepy/tests/test_code.py
index 5146df2..4e43de4 100644
--- a/browsepy/tests/test_code.py
+++ b/browsepy/tests/test_code.py
@@ -1,34 +1,42 @@
+import re
 
 import unittest_resources.testing as bases
 
 
-class TypingTestCase(bases.TypingTestCase):
-    """TestCase checking :module:`mypy`."""
+class Rules:
+    """Browsepy module mixin."""
 
     meta_module = 'browsepy'
+    meta_module_pattern = re.compile(r'^([^t]*|t(?!ests?))+$')
+    meta_resource_pattern = re.compile(r'^([^t]*|t(?!ests?))+\.py$')
 
 
-class CodeStyleTestCase(bases.CodeStyleTestCase):
+# class TypingTestCase(Rules, bases.TypingTestCase):
+#     """TestCase checking :module:`mypy`."""
+#
+#     pass
+
+
+class CodeStyleTestCase(Rules, bases.CodeStyleTestCase):
     """TestCase checking :module:`pycodestyle`."""
 
-    meta_module = 'browsepy'
+    pass
 
 
-class DocStyleTestCase(bases.DocStyleTestCase):
+class DocStyleTestCase(Rules, bases.DocStyleTestCase):
     """TestCase checking :module:`pydocstyle`."""
 
-    meta_module = 'browsepy'
+    pass
 
 
-class MaintainabilityIndexTestCase(bases.MaintainabilityIndexTestCase):
+class MaintainabilityIndexTestCase(Rules, bases.MaintainabilityIndexTestCase):
     """TestCase checking :module:`radon` maintainability index."""
 
-    meta_module = 'browsepy'
+    pass
 
 
-class CodeComplexityTestCase(bases.CodeComplexityTestCase):
+class CodeComplexityTestCase(Rules, bases.CodeComplexityTestCase):
     """TestCase checking :module:`radon` code complexity."""
 
-    meta_module = 'browsepy'
     max_class_complexity = 7
     max_function_complexity = 7
diff --git a/browsepy/transform/__init__.py b/browsepy/transform/__init__.py
index 409542d..25f46e0 100755
--- a/browsepy/transform/__init__.py
+++ b/browsepy/transform/__init__.py
@@ -1,15 +1,17 @@
+"""Generic string transform module."""
 
 
 class StateMachine(object):
     """
-    Abstract character-driven finite state machine implementation, used to
-    chop down and transform strings.
+    Character-driven finite state machine.
 
-    Useful for implementig simple transpilators, compressors and so on.
+    Useful for implementig simple string transforms, transpilators,
+    compressors and so on.
 
     Important: when implementing this class, you must set the :attr:`current`
     attribute to a key defined in :attr:`jumps` dict.
     """
+
     jumps = {}  # finite state machine jumps
     start = ''  # character which started current state
     current = ''  # current state (an initial value must be set)
@@ -56,6 +58,8 @@ class StateMachine(object):
 
     def __init__(self, data=''):
         """
+        Initialize.
+
         :param data: content will be added to pending data
         :type data: str
         """
@@ -91,8 +95,7 @@ class StateMachine(object):
 
     def transform(self, data, mark, next):
         """
-        Apply the appropriate transformation function on current state data,
-        which is supposed to end at this point.
+        Apply the appropriate transformation method.
 
         It is expected transformation logic makes use of :attr:`start`,
         :attr:`current` and :attr:`streaming` instance attributes to
@@ -113,8 +116,7 @@ class StateMachine(object):
 
     def feed(self, data=''):
         """
-        Optionally add pending data, switch into streaming mode, and yield
-        result chunks.
+        Add input data and yield partial output results.
 
         :yields: result chunks
         :ytype: str
@@ -126,8 +128,7 @@ class StateMachine(object):
 
     def finish(self, data=''):
         """
-        Optionally add pending data, turn off streaming mode, and yield
-        result chunks, which implies all pending data will be consumed.
+        Add input data, end procesing and yield all remaining output.
 
         :yields: result chunks
         :ytype: str
diff --git a/browsepy/transform/glob.py b/browsepy/transform/glob.py
index 428fb5c..a81806f 100644
--- a/browsepy/transform/glob.py
+++ b/browsepy/transform/glob.py
@@ -1,3 +1,4 @@
+"""Module providing transpilation from glob to regexp."""
 
 import os
 import warnings
@@ -9,6 +10,8 @@ from . import StateMachine
 
 
 class GlobTransform(StateMachine):
+    """Glob to regexp string transpiler."""
+
     jumps = {
         'start': {
             '': 'text',
@@ -127,6 +130,7 @@ class GlobTransform(StateMachine):
     deferred = False
 
     def __init__(self, data, sep=os.sep, base=None):
+        """Initialize."""
         self.sep = sep
         self.base = base or ''
         self.deferred_data = []
@@ -134,6 +138,7 @@ class GlobTransform(StateMachine):
         super(GlobTransform, self).__init__(data)
 
     def transform(self, data, mark, next):
+        """Translate data chunk."""
         data = super(GlobTransform, self).transform(data, mark, next)
         if self.deferred:
             self.deferred_data.append(data)
@@ -144,6 +149,7 @@ class GlobTransform(StateMachine):
         return data
 
     def transform_posix_collating_symbol(self, data, mark, next):
+        """Translate POSIX collating symbol (stub)."""
         warnings.warn(
             'Posix collating symbols (like %s%s) are not supported.'
             % (data, mark),
@@ -152,6 +158,7 @@ class GlobTransform(StateMachine):
         return None
 
     def transform_posix_character_class(self, data, mark, next):
+        """Translate POSIX character class into REGEX ranges."""
         name = data[len(self.start):]
         if name not in self.character_classes:
             warnings.warn(
@@ -167,6 +174,7 @@ class GlobTransform(StateMachine):
             )
 
     def transform_posix_equivalence_class(self, data, mark, next):
+        """Translate POSIX equivalence expression (stub)."""
         warnings.warn(
             'Posix equivalence class expresions (like %s%s) are not supported.'
             % (data, mark),
@@ -175,6 +183,7 @@ class GlobTransform(StateMachine):
         return None
 
     def transform_wildcard(self, data, mark, next):
+        """Translate glob wildcard into non-path-separator REGEX."""
         if self.start == '**':
             return '.*'
         if self.start == '*':
@@ -182,17 +191,21 @@ class GlobTransform(StateMachine):
         return '[^%s]' % re_escape(self.sep)
 
     def transform_text(self, data, mark, next):
+        """Translate glob text into text, filename or directory REGEX."""
         if next is None:
             return '%s(%s|$)' % (re_escape(data), re_escape(self.sep))
         return re_escape(data)
 
     def transform_sep(self, data, mark, next):
+        """Transform path separator into REGEX."""
         return re_escape(self.sep)
 
     def transform_literal(self, data, mark, next):
+        """Transform glob escape into REGEX."""
         return data[len(self.start):]
 
     def transform_range(self, data, mark, next):
+        """Transform glob character range into REGEX."""
         self.deferred = True
         if self.start == '[!':
             return '[^%s' % data[2:]
@@ -201,9 +214,11 @@ class GlobTransform(StateMachine):
         return data
 
     def transform_range_sep(self, data, mark, next):
+        """Translate range path separator into REGEX."""
         return re_escape(self.sep)
 
     def transform_range_close(self, data, mark, next):
+        """Translate range end into REGEX."""
         self.deferred = False
         if None in self.deferred_data:
             self.deferred_data[:] = ()
@@ -211,9 +226,11 @@ class GlobTransform(StateMachine):
         return data
 
     def transform_range_ignore(self, data, mark, next):
+        """Translate character to be ignored on REGEX."""
         return ''
 
     def transform_group(self, data, mark, next):
+        """Transform glob group into REGEX."""
         if self.start == '{':
             self.deep += 1
             return '('
@@ -225,11 +242,13 @@ class GlobTransform(StateMachine):
         return data
 
     def transform_start(self, data, mark, next):
+        """Transform glob start into REGEX."""
         if mark == '/':
             return '^%s' % re_escape(self.base)
         return re_escape(self.sep)
 
 
 def translate(data, sep=os.sep, base=None):
+    """Transform glob string into REGEX."""
     self = GlobTransform(data, sep, base)
     return ''.join(self)
diff --git a/browsepy/transform/htmlcompress.py b/browsepy/transform/htmlcompress.py
index f737d85..9f72ad6 100755
--- a/browsepy/transform/htmlcompress.py
+++ b/browsepy/transform/htmlcompress.py
@@ -1,3 +1,5 @@
+"""Module providing HTML compression extension jinja2."""
+
 import re
 
 import jinja2
@@ -8,6 +10,8 @@ from . import StateMachine
 
 
 class CompressContext(StateMachine):
+    """Base jinja2 template token finite state machine."""
+
     token_class = jinja2.lexer.Token
     block_tokens = {
         'variable_begin': 'variable_end',
@@ -17,6 +21,7 @@ class CompressContext(StateMachine):
     lineno = 0
 
     def feed(self, token):
+        """Process a single token, yielding processed ones."""
         if self.skip_until_token:
             yield token
             if token.type == self.skip_until_token:
@@ -35,11 +40,14 @@ class CompressContext(StateMachine):
                 self.lineno = token.lineno
 
     def finish(self):
+        """Set state machine as finished, yielding remaining tokens."""
         for data in super(CompressContext, self).finish():
             yield self.token_class(self.lineno, 'data', data)
 
 
 class SGMLCompressContext(CompressContext):
+    """Compression context for jinja2 SGML templates."""
+
     re_whitespace = re.compile('[ \\t\\r\\n]+')
     block_tags = {}  # block content will be treated as literal text
     jumps = {  # state machine jumps
@@ -63,6 +71,7 @@ class SGMLCompressContext(CompressContext):
 
     @property
     def nearest(self):
+        """Get next data chunk to be processed."""
         if self.skip_until_text and self.current == 'text':
             mark = self.skip_until_text
             index = self.pending.find(mark, len(self.start))
@@ -72,6 +81,7 @@ class SGMLCompressContext(CompressContext):
         return super(SGMLCompressContext, self).nearest
 
     def transform_tag(self, data, mark, next):
+        """Compress SML tag node."""
         tagstart = self.start == '<'
         data = self.re_whitespace.sub(' ', data[1:] if tagstart else data)
         if tagstart:
@@ -84,6 +94,7 @@ class SGMLCompressContext(CompressContext):
         return self.start if data.strip() == self.start else data
 
     def transform_text(self, data, mark, next):
+        """Compress SGML text node."""
         if not self.skip_until_text:
             return self.start if data.strip() == self.start else data
         elif next is not None:
@@ -92,6 +103,8 @@ class SGMLCompressContext(CompressContext):
 
 
 class HTMLCompressContext(SGMLCompressContext):
+    """Compression context for jinja2 HTML templates."""
+
     block_tags = {
         'textarea': '</textarea>',
         'pre': '</pre>',
@@ -101,9 +114,12 @@ class HTMLCompressContext(SGMLCompressContext):
 
 
 class HTMLCompress(jinja2.ext.Extension):
+    """Jinja2 HTML template compression extension."""
+
     context_class = HTMLCompressContext
 
     def filter_stream(self, stream):
+        """Yield compressed tokens from :class:`~jinja2.lexer.TokenStream`."""
         transform = self.context_class()
 
         for token in stream:
diff --git a/browsepy/utils.py b/browsepy/utils.py
index f7ffa2b..42b5ff2 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Small utility functions for common tasks."""
 
 import sys
 import os
@@ -13,7 +13,7 @@ import flask
 
 def ppath(*args, **kwargs):
     """
-    Get joined file path relative to module location.
+    Join given path components relative to a module location.
 
     :param module: Module name
     :type module: str
@@ -30,10 +30,7 @@ def ppath(*args, **kwargs):
 
 @contextlib.contextmanager
 def dummy_context():
-    """
-    Context manager which does nothing besides exposing the context
-    manger interface
-    """
+    """Get a dummy context manager."""
     yield
 
 
@@ -67,8 +64,10 @@ def random_string(size, sample=tuple(map(chr, range(256)))):
 
 def solve_local(context_local):
     """
-    Resolve given context local to its actual value. If given object
-    it's not a context local nothing happens, just returns the same value.
+    Resolve given context local to its actual value.
+
+    If given object isn't a context local, nothing happens, return the
+    same object.
     """
     if callable(getattr(context_local, '_get_current_object', None)):
         return context_local._get_current_object()
@@ -105,6 +104,9 @@ def defaultsnamedtuple(name, fields, defaults=None):
     """
     Generate namedtuple with default values.
 
+    This somewhat tries to mimic py3.7 namedtuple with keyword-based
+    defaults, in a backwards-compatible way.
+
     :param name: name
     :param fields: iterable with field names
     :param defaults: iterable or mapping with field defaults
@@ -112,9 +114,12 @@ def defaultsnamedtuple(name, fields, defaults=None):
     :rtype: collections.defaultdict
     """
     nt = collections.namedtuple(name, fields)
-    nt.__new__.__defaults__ = (None, ) * len(nt._fields)
-    if isinstance(defaults, collections.Mapping):
-        nt.__new__.__defaults__ = tuple(nt(**defaults))
-    elif defaults:
-        nt.__new__.__defaults__ = tuple(nt(*defaults))
+    nt.__new__.__defaults__ = (None, ) * len(fields)
+    nt.__module__ = __name__
+    if defaults:
+        nt.__new__.__defaults__ = tuple(
+            nt(**defaults)
+            if isinstance(defaults, collections.Mapping) else
+            nt(*defaults)
+            )
     return nt
diff --git a/browsepy/widget.py b/browsepy/widget.py
deleted file mode 100644
index bb43f42..0000000
--- a/browsepy/widget.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: UTF-8 -*-
-"""
-WARNING: deprecated module.
-
-API defined in this module has been deprecated in version 0.5 and it will be
-removed at 0.6.
-"""
-
-import warnings
-
-from markupsafe import Markup
-from flask import url_for
-
-from .compat import deprecated
-
-
-warnings.warn('Deprecated module widget', category=DeprecationWarning)
-
-
-class WidgetBase(object):
-    _type = 'base'
-    place = None
-
-    @deprecated('Deprecated widget API')
-    def __new__(cls, *args, **kwargs):
-        return super(WidgetBase, cls).__new__(cls)
-
-    def __init__(self, *args, **kwargs):
-        self.args = args
-        self.kwargs = kwargs
-
-    def for_file(self, file):
-        return self
-
-    @classmethod
-    def from_file(cls, file):
-        if not hasattr(cls, '__empty__'):
-            cls.__empty__ = cls()
-        return cls.__empty__.for_file(file)
-
-
-class LinkWidget(WidgetBase):
-    _type = 'link'
-    place = 'link'
-
-    def __init__(self, text=None, css=None, icon=None):
-        self.text = text
-        self.css = css
-        self.icon = icon
-        super(LinkWidget, self).__init__()
-
-    def for_file(self, file):
-        if None in (self.text, self.icon):
-            return self.__class__(
-                file.name if self.text is None else self.text,
-                self.css,
-                self.icon if self.icon is not None else
-                'dir-icon' if file.is_directory else
-                'file-icon',
-                )
-        return self
-
-
-class ButtonWidget(WidgetBase):
-    _type = 'button'
-    place = 'button'
-
-    def __init__(self, html='', text='', css=''):
-        self.content = Markup(html) if html else text
-        self.css = css
-        super(ButtonWidget, self).__init__()
-
-
-class StyleWidget(WidgetBase):
-    _type = 'stylesheet'
-    place = 'style'
-
-    @property
-    def href(self):
-        return url_for(*self.args, **self.kwargs)
-
-
-class JavascriptWidget(WidgetBase):
-    _type = 'script'
-    place = 'javascript'
-
-    @property
-    def src(self):
-        return url_for(*self.args, **self.kwargs)
diff --git a/requirements/development.txt b/requirements/development.txt
index 4c2b38a..1acbc38 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -30,6 +30,9 @@ jedi
 sphinx
 pycodestyle
 pydocstyle
+mypy
+radon
+unittest-resources[testing]
 pyyaml
 beautifulsoup4
 
diff --git a/setup.py b/setup.py
index 35441a0..c04000d 100644
--- a/setup.py
+++ b/setup.py
@@ -73,9 +73,13 @@ setup(
     tests_require=[
         'beautifulsoup4',
         'unittest-resources',
+        'pycodestyle',
+        'pydocstyle',
+        'mypy',
+        'radon',
+        'unittest-resources[testing]',
         ],
     test_suite='browsepy.tests',
-    test_runner='browsepy.tests.runner:DebuggerTextTestRunner',
     zip_safe=False,
     platforms='any',
     )
-- 
GitLab


From 6954c4bf97d4bd282d90202507f895ecbaccca95 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 8 Dec 2019 01:55:32 +0000
Subject: [PATCH 149/171] simplify player logic

---
 browsepy/manager.py                           |  13 +-
 browsepy/plugin/player/__init__.py            |  12 +-
 browsepy/plugin/player/playable.py            | 289 ++++--------------
 browsepy/plugin/player/playlist.py            | 102 +++++++
 .../plugin/player/templates/audio.player.html |   6 +-
 5 files changed, 179 insertions(+), 243 deletions(-)
 create mode 100644 browsepy/plugin/player/playlist.py

diff --git a/browsepy/manager.py b/browsepy/manager.py
index c72bbf5..42a5669 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -23,6 +23,7 @@ class PluginManagerBase(object):
     """
     Base plugin manager for plugin module loading and Flask extension logic.
     """
+
     _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
 
     @property
@@ -165,12 +166,12 @@ class PluginManagerBase(object):
         """
         plugin = plugin.replace('-', '_')
         names = [
-            name
-            for ns in self.namespaces
-            for name in (
-                '%s%s' % (ns, plugin),
-                '%s.%s' % (ns.rstrip('.'), plugin),
+            '%s%s%s' % (
+                namespace,
+                '.' if namespace and namespace[-1] not in '._' else '',
+                plugin,
                 )
+            for namespace in self.namespaces
             ]
         names = sorted(frozenset(names), key=names.index)
         for name in names:
@@ -258,7 +259,7 @@ class ExcludePluginManager(PluginManagerBase):
 
     def register_exclude_function(self, exclude_fnc):
         """
-        Register given exclude-function on curren app.
+        Register given exclude-function on current app.
 
         This method is intended to be used on plugin's module-level
         :func:`register_plugin` functions.
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index 5a6a820..ab0cedb 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -5,7 +5,7 @@ from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.utils import ppath
 from browsepy.stream import stream_template
 
-from .playable import Playable, detect_playable_mimetype
+from .playable import PlayableNode, PlayableDirectory, PlayableFile
 
 
 player = Blueprint(
@@ -29,7 +29,7 @@ def play(path):
     """
     sort_property = get_cookie_browse_sorting(path, 'text')
     sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
-    node = Playable.from_urlpath(path)
+    node = PlayableNode.from_urlpath(path)
     if node.is_playable and not node.is_excluded:
         return stream_template(
             'audio.player.html',
@@ -67,7 +67,7 @@ def register_plugin(manager):
     :type manager: browsepy.manager.PluginManager
     """
     manager.register_blueprint(player)
-    manager.register_mimetype_function(detect_playable_mimetype)
+    manager.register_mimetype_function(PlayableFile.detect_mimetype)
 
     # add style tag
     manager.register_widget(
@@ -82,7 +82,7 @@ def register_plugin(manager):
         place='entry-link',
         type='link',
         endpoint='player.play',
-        filter=Playable.playable_check,
+        filter=PlayableFile.detect,
         )
 
     # register action buttons
@@ -91,7 +91,7 @@ def register_plugin(manager):
         css='play',
         type='button',
         endpoint='player.play',
-        filter=Playable.playable_check,
+        filter=PlayableFile.detect,
         )
 
     # check argument (see `register_arguments`) before registering
@@ -102,5 +102,5 @@ def register_plugin(manager):
             type='button',
             endpoint='player.play',
             text='Play directory',
-            filter=Playable.playable_check,
+            filter=PlayableDirectory.detect,
             )
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 93b75a3..9f90b31 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -1,6 +1,5 @@
 # -*- coding: UTF-8 -*-
 
-
 import sys
 import codecs
 import os.path
@@ -11,56 +10,13 @@ import six.moves
 
 from werkzeug.utils import cached_property
 
-from browsepy.file import Node, File, Directory, \
-                          underscore_replace, check_under_base
-
-
-class PLSFileParser(object):
-    """
-    ConfigParser wrapper accepting fallback on get for convenience.
-
-    This wraps instead of inheriting due ConfigParse being classobj on python2.
-    """
-    NOT_SET = type('NotSetType', (object,), {})
-    option_exceptions = (
-        six.moves.configparser.NoSectionError,
-        six.moves.configparser.NoOptionError,
-        ValueError,
-        )
-    parser_class = getattr(
-        six.moves.configparser,
-        'SafeConfigParser',
-        six.moves.configparser.ConfigParser
-        )
-
-    def __init__(self, path):
-        """Initialize."""
-        with warnings.catch_warnings():
-            # We already know about SafeConfigParser deprecation!
-            warnings.simplefilter('ignore', category=DeprecationWarning)
-            self._parser = self.parser_class()
-        self._parser.read(path)
+from browsepy.file import Node, File, Directory
 
-    def getint(self, section, key, fallback=NOT_SET):
-        """Get int from pls file, returning fallback if unable."""
-        try:
-            return self._parser.getint(section, key)
-        except self.option_exceptions:
-            if fallback is self.NOT_SET:
-                raise
-            return fallback
 
-    def get(self, section, key, fallback=NOT_SET):
-        """Get value from pls file, returning fallback if unable."""
-        try:
-            return self._parser.get(section, key)
-        except self.option_exceptions:
-            if fallback is self.NOT_SET:
-                raise
-            return fallback
+from .playlist import iter_pls_entries, iter_m3u_entries
 
 
-class Playable(Node):
+class PlayableNode(Node):
     """Base class for playable nodes."""
 
     playable_list = False
@@ -73,62 +29,69 @@ class Playable(Node):
         :returns: True if node is playable, False otherwise
         :rtype: bool
         """
-        print(self)
-        return self.playable_check(self)
-
-    def normalize_playable_path(self, path):
-        """
-        Fixes the path of playable file from a playlist.
-
-        :param path: absolute or relative path or uri
-        :type path: str
-        :returns: absolute path or uri
-        :rtype: str or None
-        """
-        if '://' in path:
-            return path
-        path = os.path.normpath(path)
-        if not os.path.isabs(path):
-            return os.path.join(self.parent.path, path)
-        drive = os.path.splitdrive(self.path)[0]
-        if drive and not os.path.splitdrive(path)[0]:
-            path = drive + path
-        if check_under_base(path, self.app.config['DIRECTORY_BASE']):
-            return path
-        return None
-
-    def _entries(self):
-        return ()
-
-    def entries(self, sortkey=None, reverse=None):
-        """Get playlist file entries."""
-        for node in self._entries():
-            if node.is_playable and not node.is_excluded:
-                yield node
+        return self.detect(self)
 
     @classmethod
-    def playable_check(cls, node):
+    def detect(cls, node):
         """Check if class supports node."""
         kls = cls.directory_class if node.is_directory else cls.file_class
-        return kls.playable_check(node)
+        return kls.detect(node)
 
 
-@Playable.register_file_class
-class PlayableExtension(Playable):
+@PlayableNode.register_file_class
+class PlayableFile(PlayableNode, File):
     """=Generic node for filenames with extension."""
 
     title = None
     duration = None
+    playable_extensions = {
+        'mp3': 'audio/mpeg',
+        'ogg': 'audio/ogg',
+        'oga': 'audio/ogg',
+        'm4a': 'audio/mp4',
+        'wav': 'audio/wav',
+        'm3u': 'audio/x-mpegurl',
+        'm3u8': 'audio/x-mpegurl',
+        'pls': 'audio/x-scpls',
+         }
+    playable_list_parsers = {
+        'pls': iter_pls_entries,
+        'm3u': iter_m3u_entries,
+        'm3u8': iter_m3u_entries,
+        }
 
-    playable_extensions = {}
-    playable_extension_classes = []  # deferred
+    @cached_property
+    def playable_list(self):
+        """Get whether file is a playlist."""
+        return self.extension in self.playable_list_parsers
 
     @cached_property
     def mimetype(self):
         """Get mimetype."""
-        print(self)
         return self.detect_mimetype(self.path)
 
+    @cached_property
+    def extension(self):
+        """Get filename extension."""
+        return self.detect_extension(self.path)
+
+    def entries(self):
+        """Iter playlist files."""
+        parser = self.playable_list_parsers.get(self.extension)
+        if parser:
+            for options in parser(self):
+                node = self.file_class(**options, app=self.app)
+                if not node.is_excluded:
+                    yield node
+
+    @classmethod
+    def detect(cls, node):
+        """Get whether file is playable."""
+        return (
+            not node.is_directory and
+            cls.detect_extension(node.path) in cls.playable_extensions
+            )
+
     @classmethod
     def detect_extension(cls, path):
         for extension in cls.playable_extensions:
@@ -138,163 +101,33 @@ class PlayableExtension(Playable):
 
     @classmethod
     def detect_mimetype(cls, path):
-        return cls.playable_extensions.get(cls.detect_extension(path))
-
-    @classmethod
-    def playable_check(cls, node):
-        """Get if file is playable."""
-        if cls.generic:
-            return any(
-                kls.playable_check(node)
-                for kls in cls.playable_extension_classes
-                )
-        return cls.detect_extension(node.path) in cls.playable_extensions
-
-    @classmethod
-    def from_node(cls, node, app=None):
-        """Get playable node from given node."""
-        if cls.generic:
-            for kls in cls.playable_classes:
-                playable = kls.from_node(node)
-                if playable:
-                    return playable
-            return node
-        return kls(node.path, node.app)
-
-    @classmethod
-    def from_urlpath(cls, path, app=None):
-        kls = cls.get_extension_class(path)
-        if cls.generic:
-            for kls in cls.playable_extension_classes:
-                if kls.detect_extension(path):
-                    return kls.from_urlpath(path, app=app)
-        return super(PlayableExtension, cls).from_urlpath(path, app=app)
-
-    @classmethod
-    def register_playable_extension_class(cls, kls):
-        cls.playable_extension_classes.append(kls)
-        return kls
-
-
-@PlayableExtension.register_playable_extension_class
-class PlayableAudioFile(PlayableExtension, File):
-    """Audio file node."""
-
-    playable_extensions = {
-        'mp3': 'audio/mpeg',
-        'ogg': 'audio/ogg',
-        'wav': 'audio/wav',
-        }
-
-
-@PlayableExtension.register_playable_extension_class
-class PLSFile(PlayableExtension, File):
-    """PLS playlist file node."""
-
-    playable_list = True
-    playable_extensions = {
-        'pls': 'audio/x-scpls',
-        }
-
-    ini_parser_class = PLSFileParser
-    maxsize = getattr(sys, 'maxint', 0) or getattr(sys, 'maxsize', 0) or 2**32
-
-    def _entries(self):
-        parser = self.ini_parser_class(self.path)
-        maxsize = parser.getint('playlist', 'NumberOfEntries', None)
-        range = six.moves.range
-        for i in range(1, self.maxsize if maxsize is None else maxsize + 1):
-            path = parser.get('playlist', 'File%d' % i, None)
-            if not path:
-                if maxsize:
-                    continue
-                break
-            path = self.normalize_playable_path(path)
-            if not path:
-                continue
-            yield self.playable_class(
-                path=path,
-                app=self.app,
-                duration=parser.getint(
-                    'playlist', 'Length%d' % i,
-                    None
-                    ),
-                title=parser.get(
-                    'playlist',
-                    'Title%d' % i,
-                    None
-                    ),
-                )
-
-
-@PlayableExtension.register_playable_extension_class
-class M3UFile(PlayableExtension, File):
-    """M3U playlist file node."""
-
-    playable_list = True
-    playable_extensions = {
-        'm3u': 'audio/x-mpegurl',
-        'm3u8': 'audio/x-mpegurl',
-        }
-
-    def _iter_lines(self):
-        prefix = '#EXTM3U\n'
-        encoding = 'utf-8' if self.path.endswith('.m3u8') else 'ascii'
-        with codecs.open(
-          self.path, 'r',
-          encoding=encoding,
-          errors=underscore_replace
-          ) as f:
-            if f.read(len(prefix)) != prefix:
-                f.seek(0)
-            for line in f:
-                line = line.rstrip()
-                if line:
-                    yield line
-
-    def _entries(self):
-        data = {}
-        for line in self._iter_lines():
-            if line.startswith('#EXTINF:'):
-                duration, title = line.split(',', 1)
-                data['duration'] = None if duration == '-1' else int(duration)
-                data['title'] = title
-            if not line:
-                continue
-            path = self.normalize_playable_path(line)
-            if path:
-                yield self.playable_class(path=path, app=self.app, **data)
-            data.clear()
+        """Detect mimetype by its extension."""
+        return cls.playable_extensions.get(
+            cls.detect_extension(path),
+            'application/octet-stream'
+            )
 
 
-@Playable.register_directory_class
-class PlayListDirectory(Playable, Directory):
+@PlayableNode.register_directory_class
+class PlayableDirectory(PlayableNode, Directory):
     """Playable directory node."""
 
     playable_list = True
 
-    @cached_property
-    def parent(self):
-        """Get standard directory node."""
-        return self.directory_class(self.path, app=self.app)
-
     def entries(self, sortkey=None, reverse=None):
-        """Get playable directory entries."""
+        """Iter playable directory playable files."""
         for node in self.listdir(sortkey=sortkey, reverse=reverse):
-            if (not node.is_directory) and node.is_playable:
+            if not node.is_directory and node.is_playable:
                 yield node
 
     @classmethod
-    def playable_check(cls, node):
+    def detect(cls, node):
         """Detect if given node contains playable files."""
-        super_check = super(PlayListDirectory, cls).playable_check
+        file_detect = cls.file_class.detect
         return node.is_directory and any(
-            super_check(child)
+            file_detect(child)
             for child in node._listdir()
             if not child.is_directory
             )
 
 
-def detect_playable_mimetype(path):
-    """Detect if path corresponds to a playable file by its extension."""
-    return PlayableExtension.detect_mimetype(path)
diff --git a/browsepy/plugin/player/playlist.py b/browsepy/plugin/player/playlist.py
new file mode 100644
index 0000000..03e70c5
--- /dev/null
+++ b/browsepy/plugin/player/playlist.py
@@ -0,0 +1,102 @@
+# -*- coding: UTF-8 -*-
+
+
+import sys
+import codecs
+import os.path
+import warnings
+
+from six.moves import range, configparser
+
+try:
+    from six.moves.configparser import SafeConfigParser as ConfigParser
+except ImportError:
+    from six.moves.configparser import ConfigParser
+
+from browsepy.file import underscore_replace
+
+
+CONFIGPARSER_OPTION_EXCEPTIONS = (
+    configparser.NoSectionError,
+    configparser.NoOptionError,
+    ValueError,
+    )
+
+def normalize_playable_path(path, node):
+    """
+    Fixes the path of playable file from a playlist.
+
+    :param path: absolute or relative path or uri
+    :type path: str
+    :param node: node where path was found
+    :type node: browsepy.file.Node
+    :returns: absolute path or uri
+    :rtype: str or None
+    """
+    if '://' in path:
+        return path
+    path = os.path.normpath(path)
+    if not os.path.isabs(path):
+        return os.path.join(node.parent.path, path)
+    drive = os.path.splitdrive(self.path)[0]
+    if drive and not os.path.splitdrive(path)[0]:
+        path = drive + path
+    if check_under_base(path, node.app.config['DIRECTORY_BASE']):
+        return path
+    return None
+
+def iter_pls_entries(node):
+    """Iter entries on a PLS playlist file node."""
+    with warnings.catch_warnings():
+        # We already know about SafeConfigParser deprecation!
+        warnings.simplefilter('ignore', category=DeprecationWarning)
+        parser = ConfigParser()
+        parser.read(node.path)
+    try:
+        maxsize = parser.getint('playlist', 'NumberOfEntries')
+    except CONFIGPARSER_OPTION_EXCEPTIONS:
+        maxsize = sys.maxsize
+    failures = 0
+    for i in six.moves.range(1, maxsize):
+        if failures > 5:
+            break
+        data = {}
+        for prop, field, extract in (
+          ('path', 'File%d', parser.get),
+          ('duration', 'Length%d', parser.getint),
+          ('title', 'Title%d', parser.get),
+          ):
+            try:
+                data[prop] = extract('playlist', field % i)
+            except CONFIGPARSER_OPTION_EXCEPTIONS:
+                pass
+        if data.get('path'):
+            failures = 0
+            yield data
+            continue
+        failures += 1
+
+def iter_m3u_entries(node):
+    """Iter entries on a M3U playlist file node."""
+    data = {}
+    with codecs.open(
+      node.path,
+      'r',
+      encoding='utf-8' if node.path.endswith('.m3u8') else 'ascii',
+      errors=underscore_replace
+      ) as f:
+        for line in filter(None, map(str.rstrip, f)):
+            if line.startswith('#EXTINF:'):
+                duration, title = line.split(',', 1)
+                data.update(
+                    duration=None if duration == '-1' else int(duration),
+                    title=title,
+                    )
+            elif not line.startswith('#'):
+                path = normalize_playable_path(line, node)
+                if path:
+                    data['path'] = path
+                    yield dict(data)
+                data.clear()
+
+
diff --git a/browsepy/plugin/player/templates/audio.player.html b/browsepy/plugin/player/templates/audio.player.html
index 1dd98b7..0c5d5a3 100644
--- a/browsepy/plugin/player/templates/audio.player.html
+++ b/browsepy/plugin/player/templates/audio.player.html
@@ -25,14 +25,14 @@
     data-player-urls="
       {%- for entry in file.entries(sortkey=sort_fnc, reverse=sort_reverse) -%}
         {%- if not loop.first -%}|{%- endif -%}
-        {{- entry.mimetype -}}|
+        {{- entry.extension -}}|
         {{- entry.name -}}|
         {{- url_for('open', path=entry.urlpath) -}}
       {%- endfor -%}
     "
   {% else %}
     data-player-title="{{ file.name }}"
-    data-player-format="{{ file.mimetype }}"
+    data-player-format="{{ file.extension }}"
     data-player-url="{{ url_for('open', path=file.urlpath) }}"
   {% endif %}
   ></div>
@@ -84,7 +84,7 @@
     {% endif %}
     <div class="jp-no-solution">
       <span>Update Required</span>
-      In order to get this player working either update your browse or your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
+      In order to get this player working either update your browser or your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
     </div>
   </div>
 </div>
-- 
GitLab


From a6bd2e29adf1917283595c8dfec0eca8e77729d6 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Mon, 9 Dec 2019 21:17:27 +0000
Subject: [PATCH 150/171] continue refactor

---
 browsepy/__init__.py                       |  3 +-
 browsepy/plugin/__init__.py                |  2 +-
 browsepy/plugin/file_actions/__init__.py   | 21 ++++--
 browsepy/plugin/file_actions/exceptions.py | 31 +++++++--
 browsepy/plugin/file_actions/utils.py      |  9 +--
 browsepy/plugin/player/__init__.py         | 10 ++-
 browsepy/plugin/player/playable.py         | 22 ++-----
 browsepy/plugin/player/playlist.py         | 75 ++++++++++++----------
 browsepy/plugin/player/tests.py            | 28 +-------
 9 files changed, 106 insertions(+), 95 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index bf81e8b..2f95d96 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Browsepy simple file server."""
 
 __version__ = '0.6.0'
 
@@ -11,7 +11,6 @@ import cookieman
 from flask import request, render_template, redirect, \
                   url_for, send_from_directory, \
                   session, abort
-from werkzeug.exceptions import NotFound
 
 from .appconfig import Flask
 from .manager import PluginManager
diff --git a/browsepy/plugin/__init__.py b/browsepy/plugin/__init__.py
index 8d98fed..348dc20 100644
--- a/browsepy/plugin/__init__.py
+++ b/browsepy/plugin/__init__.py
@@ -1 +1 @@
-# -*- coding: UTF-8 -*-
+"""Browsepy builtin plugin submodule."""
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index f27b8c5..d375c9b 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Plugin module with filesystem functionality."""
 
 from flask import Blueprint, render_template, request, redirect, url_for, \
                   session, current_app, g
@@ -37,6 +37,7 @@ re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
                defaults={'path': ''})
 @actions.route('/create/directory/<path:path>', methods=('GET', 'POST'))
 def create_directory(path):
+    """Handle request to create directory."""
     try:
         directory = Node.from_urlpath(path)
     except OutsideDirectoryBase:
@@ -60,6 +61,7 @@ def create_directory(path):
 @actions.route('/selection', methods=('GET', 'POST'), defaults={'path': ''})
 @actions.route('/selection/<path:path>', methods=('GET', 'POST'))
 def selection(path):
+    """Handle file selection clipboard request."""
     sort_property = get_cookie_browse_sorting(path, 'text')
     sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
 
@@ -105,6 +107,7 @@ def selection(path):
 @actions.route('/clipboard/paste', defaults={'path': ''})
 @actions.route('/clipboard/paste/<path:path>')
 def clipboard_paste(path):
+    """Handle clipboard paste-here request."""
     try:
         directory = Node.from_urlpath(path)
     except OutsideDirectoryBase:
@@ -141,13 +144,15 @@ def clipboard_paste(path):
 @actions.route('/clipboard/clear', defaults={'path': ''})
 @actions.route('/clipboard/clear/<path:path>')
 def clipboard_clear(path):
+    """Handle clear clipboard request."""
     session.pop('clipboard:mode', None)
     session.pop('clipboard:items', None)
     return redirect(url_for('browse', path=path))
 
 
 @actions.errorhandler(FileActionsException)
-def clipboard_error(e):
+def file_actions_error(e):
+    """Serve informative error page on plugin errors."""
     file = Node(e.path) if hasattr(e, 'path') else None
     issues = getattr(e, 'issues', ())
 
@@ -174,6 +179,7 @@ def clipboard_error(e):
 
 
 def shrink_session(data, last):
+    """Session shrinking logic (only obeys final attempt)."""
     if last:
         raise InvalidClipboardSizeError(
             mode=data.pop('clipboard:mode', None),
@@ -183,21 +189,26 @@ def shrink_session(data, last):
 
 
 def detect_upload(directory):
+    """Detect if directory node can be used as clipboard target."""
     return directory.is_directory and directory.can_upload
 
 
 def detect_clipboard(directory):
+    """Detect if clipboard is available on given directory node."""
     return directory.is_directory and session.get('clipboard:mode')
 
 
 def detect_selection(directory):
-    return directory.is_directory and \
-            current_app.config.get('DIRECTORY_UPLOAD')
+    """Detect if file selection is available on given directory node."""
+    return (
+        directory.is_directory and
+        current_app.config.get('DIRECTORY_UPLOAD')
+        )
 
 
 def excluded_clipboard(path):
     """
-    Exclusion function for files in clipboard.
+    Check if given path should be ignored when pasting clipboard.
 
     :param path: path to check
     :type path: str
diff --git a/browsepy/plugin/file_actions/exceptions.py b/browsepy/plugin/file_actions/exceptions.py
index d2f0db4..ac53f7c 100644
--- a/browsepy/plugin/file_actions/exceptions.py
+++ b/browsepy/plugin/file_actions/exceptions.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Exception classes for file action errors."""
 
 import os
 import errno
@@ -6,14 +6,16 @@ import errno
 
 class FileActionsException(Exception):
     """
-    Base class for file-actions exceptions
+    Base class for file-actions exceptions.
 
     :property path: item path which raised this Exception
     """
+
     code = None
     template = 'Unhandled error.'
 
     def __init__(self, message=None, path=None):
+        """Initialize."""
         self.path = path
         message = self.template.format(self) if message is None else message
         super(FileActionsException, self).__init__(message)
@@ -26,10 +28,12 @@ class InvalidDirnameError(FileActionsException):
     :property path: item path which raised this Exception
     :property name: name which raised this Exception
     """
+
     code = 'directory-invalid-name'
     template = 'Clipboard item {0.name!r} is not valid.'
 
     def __init__(self, message=None, path=None, name=None):
+        """Initialize."""
         self.name = name
         super(InvalidDirnameError, self).__init__(message, path)
 
@@ -41,19 +45,23 @@ class DirectoryCreationError(FileActionsException):
     :property path: item path which raised this Exception
     :property name: name which raised this Exception
     """
+
     code = 'directory-mkdir-error'
     template = 'Clipboard item {0.name!r} is not valid.'
 
     def __init__(self, message=None, path=None, name=None):
+        """Initialize."""
         self.name = name
         super(DirectoryCreationError, self).__init__(message, path)
 
     @property
     def message(self):
+        """Get error message."""
         return self.args[0]
 
     @classmethod
     def from_exception(cls, exception, *args, **kwargs):
+        """Generate exception from another."""
         message = None
         if isinstance(exception, OSError):
             message = '%s (%s)' % (
@@ -71,29 +79,33 @@ class ClipboardException(FileActionsException):
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
     """
+
     code = 'clipboard-invalid'
     template = 'Clipboard is invalid.'
 
     def __init__(self, message=None, path=None, mode=None, clipboard=None):
+        """Initialize."""
         self.mode = mode
         self.clipboard = clipboard
         super(ClipboardException, self).__init__(message, path)
 
 
 class ItemIssue(tuple):
-    """
-    Item/error issue
-    """
+    """Item/error issue pair."""
+
     @property
     def item(self):
+        """Get item."""
         return self[0]
 
     @property
     def error(self):
+        """Get error."""
         return self[1]
 
     @property
     def message(self):
+        """Get file error message."""
         if isinstance(self.error, OSError):
             return '%s (%s)' % (
                 os.strerror(self.error.errno),
@@ -115,17 +127,20 @@ class InvalidClipboardItemsError(ClipboardException):
     :property clipboard: :class Clipboard: instance
     :property issues: iterable of issues
     """
+
     pair_class = ItemIssue
     code = 'clipboard-invalid-items'
     template = 'Clipboard has invalid items.'
 
     def __init__(self, message=None, path=None, mode=None, clipboard=None,
                  issues=()):
+        """Initialize."""
         self.issues = list(map(self.pair_class, issues))
         supa = super(InvalidClipboardItemsError, self)
         supa.__init__(message, path, mode, clipboard)
 
     def append(self, item, error):
+        """Add item/error pair to issue list."""
         self.issues.append(self.pair_class((item, error)))
 
 
@@ -137,10 +152,12 @@ class InvalidClipboardModeError(ClipboardException):
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
     """
+
     code = 'clipboard-invalid-mode'
     template = 'Clipboard mode {0.mode!r} is not valid.'
 
     def __init__(self, message=None, path=None, mode=None, clipboard=None):
+        """Initialize."""
         supa = super(InvalidClipboardModeError, self)
         supa.__init__(message, path, mode, clipboard)
 
@@ -153,10 +170,12 @@ class InvalidEmptyClipboardError(ClipboardException):
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
     """
+
     code = 'clipboard-invalid-empty'
     template = 'Clipboard action {0.mode!r} cannot be performed without items.'
 
     def __init__(self, message=None, path=None, mode=None, clipboard=None):
+        """Initialize."""
         supa = super(InvalidEmptyClipboardError, self)
         supa.__init__(message, path, mode, clipboard)
 
@@ -169,9 +188,11 @@ class InvalidClipboardSizeError(ClipboardException):
     :property mode: mode which raised this Exception
     :property clipboard: :class Clipboard: instance
     """
+
     code = 'clipboard-invalid-size'
     template = 'Clipboard evicted due session size limit.'
 
     def __init__(self, message=None, path=None, mode=None, clipboard=None):
+        """Initialize."""
         supa = super(InvalidClipboardSizeError, self)
         supa.__init__(message, path, mode, clipboard)
diff --git a/browsepy/plugin/file_actions/utils.py b/browsepy/plugin/file_actions/utils.py
index 2979c64..c36a74a 100644
--- a/browsepy/plugin/file_actions/utils.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Filesystem utility functions."""
 
 import os
 import os.path
@@ -15,6 +15,7 @@ from .exceptions import InvalidClipboardModeError, \
 
 
 def copy(target, node, join_fnc=os.path.join):
+    """Copy node into target path."""
     if node.is_excluded:
         raise OSError(2, os.strerror(2))
 
@@ -32,6 +33,7 @@ def copy(target, node, join_fnc=os.path.join):
 
 
 def move(target, node, join_fnc=os.path.join):
+    """Move node into target path."""
     if node.is_excluded or not node.can_remove:
         code = 2 if node.is_excluded else 1
         raise OSError(code, os.strerror(code))
@@ -46,9 +48,7 @@ def move(target, node, join_fnc=os.path.join):
 
 
 def paste(target, mode, clipboard):
-    """
-    Get pasting function for given directory and keyboard.
-    """
+    """Get pasting function for given directory and keyboard."""
     if mode == 'cut':
         paste_fnc = functools.partial(move, target)
     elif mode == 'copy':
@@ -78,6 +78,7 @@ def paste(target, mode, clipboard):
 
 
 def mkdir(path, name):
+    """Create directory under path with given nam."""
     if secure_filename(name) != name or not name:
         raise InvalidDirnameError(path=path, name=name)
 
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index ab0cedb..7f00f11 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -1,5 +1,13 @@
-# -*- coding: UTF-8 -*-
+"""
+Player plugin.
 
+This plugin is both functional and simple enough to server as example for:
+- Blueprint registration.
+- Widget with filtering function.
+- Custom file nodes.
+- Sorting cookie retrieval and usage.
+
+"""
 from flask import Blueprint, abort
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.utils import ppath
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 9f90b31..4fd9418 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -1,12 +1,4 @@
-# -*- coding: UTF-8 -*-
-
-import sys
-import codecs
-import os.path
-import warnings
-
-import six
-import six.moves
+"""Playable file classes."""
 
 from werkzeug.utils import cached_property
 
@@ -40,7 +32,7 @@ class PlayableNode(Node):
 
 @PlayableNode.register_file_class
 class PlayableFile(PlayableNode, File):
-    """=Generic node for filenames with extension."""
+    """Generic node for filenames with extension."""
 
     title = None
     duration = None
@@ -76,7 +68,7 @@ class PlayableFile(PlayableNode, File):
         return self.detect_extension(self.path)
 
     def entries(self):
-        """Iter playlist files."""
+        """Iterate playlist files."""
         parser = self.playable_list_parsers.get(self.extension)
         if parser:
             for options in parser(self):
@@ -94,6 +86,7 @@ class PlayableFile(PlayableNode, File):
 
     @classmethod
     def detect_extension(cls, path):
+        """Detect extension from given path."""
         for extension in cls.playable_extensions:
             if path.endswith('.%s' % extension):
                 return extension
@@ -115,7 +108,7 @@ class PlayableDirectory(PlayableNode, Directory):
     playable_list = True
 
     def entries(self, sortkey=None, reverse=None):
-        """Iter playable directory playable files."""
+        """Iterate playable directory playable files."""
         for node in self.listdir(sortkey=sortkey, reverse=reverse):
             if not node.is_directory and node.is_playable:
                 yield node
@@ -123,11 +116,8 @@ class PlayableDirectory(PlayableNode, Directory):
     @classmethod
     def detect(cls, node):
         """Detect if given node contains playable files."""
-        file_detect = cls.file_class.detect
         return node.is_directory and any(
-            file_detect(child)
+            child.is_playable
             for child in node._listdir()
             if not child.is_directory
             )
-
-
diff --git a/browsepy/plugin/player/playlist.py b/browsepy/plugin/player/playlist.py
index 03e70c5..e359b49 100644
--- a/browsepy/plugin/player/playlist.py
+++ b/browsepy/plugin/player/playlist.py
@@ -1,30 +1,30 @@
-# -*- coding: UTF-8 -*-
-
+"""Utility functions for playlist files."""
 
 import sys
 import codecs
 import os.path
 import warnings
 
-from six.moves import range, configparser
-
-try:
-    from six.moves.configparser import SafeConfigParser as ConfigParser
-except ImportError:
-    from six.moves.configparser import ConfigParser
+from six.moves import configparser, range
 
-from browsepy.file import underscore_replace
+from browsepy.file import underscore_replace, check_under_base
 
 
-CONFIGPARSER_OPTION_EXCEPTIONS = (
+configparser_class = getattr(
+    configparser,
+    'SafeConfigParser',
+    configparser.ConfigParser
+    )
+configparser_option_exceptions = (
     configparser.NoSectionError,
     configparser.NoOptionError,
     ValueError,
     )
 
+
 def normalize_playable_path(path, node):
     """
-    Fixes the path of playable file from a playlist.
+    Fix path of playable file from a playlist.
 
     :param path: absolute or relative path or uri
     :type path: str
@@ -38,53 +38,61 @@ def normalize_playable_path(path, node):
     path = os.path.normpath(path)
     if not os.path.isabs(path):
         return os.path.join(node.parent.path, path)
-    drive = os.path.splitdrive(self.path)[0]
+    drive = os.path.splitdrive(path)[0]
     if drive and not os.path.splitdrive(path)[0]:
         path = drive + path
     if check_under_base(path, node.app.config['DIRECTORY_BASE']):
         return path
     return None
 
+
+def iter_pls_fields(parser, index):
+    """Iterate pls entry fields from parser and entry index."""
+    for prop, get_value, entry in (
+      ('path', parser.get, 'File%d' % index),
+      ('duration', parser.getint, 'Length%d' % index),
+      ('title', parser.get, 'Title%d' % index),
+      ):
+        try:
+            yield prop, get_value('playlist', entry)
+        except configparser_option_exceptions:
+            pass
+
+
 def iter_pls_entries(node):
-    """Iter entries on a PLS playlist file node."""
+    """Iterate entries on a PLS playlist file node."""
     with warnings.catch_warnings():
         # We already know about SafeConfigParser deprecation!
         warnings.simplefilter('ignore', category=DeprecationWarning)
-        parser = ConfigParser()
+        parser = configparser_class()
         parser.read(node.path)
     try:
         maxsize = parser.getint('playlist', 'NumberOfEntries')
-    except CONFIGPARSER_OPTION_EXCEPTIONS:
+    except configparser_option_exceptions:
         maxsize = sys.maxsize
     failures = 0
-    for i in six.moves.range(1, maxsize):
+    for i in range(1, maxsize):
         if failures > 5:
             break
-        data = {}
-        for prop, field, extract in (
-          ('path', 'File%d', parser.get),
-          ('duration', 'Length%d', parser.getint),
-          ('title', 'Title%d', parser.get),
-          ):
-            try:
-                data[prop] = extract('playlist', field % i)
-            except CONFIGPARSER_OPTION_EXCEPTIONS:
-                pass
-        if data.get('path'):
+        data = dict(iter_pls_fields(parser, i))
+        if not data.get('path'):
+            failures += 1
+            continue
+        data['path'] = normalize_playable_path(data['path'])
+        if data['path']:
             failures = 0
             yield data
-            continue
-        failures += 1
+
 
 def iter_m3u_entries(node):
-    """Iter entries on a M3U playlist file node."""
-    data = {}
+    """Iterate entries on a M3U playlist file node."""
     with codecs.open(
       node.path,
       'r',
       encoding='utf-8' if node.path.endswith('.m3u8') else 'ascii',
       errors=underscore_replace
       ) as f:
+        data = {}
         for line in filter(None, map(str.rstrip, f)):
             if line.startswith('#EXTINF:'):
                 duration, title = line.split(',', 1)
@@ -95,8 +103,5 @@ def iter_m3u_entries(node):
             elif not line.startswith('#'):
                 path = normalize_playable_path(line, node)
                 if path:
-                    data['path'] = path
-                    yield dict(data)
+                    yield dict(path=path, **data)
                 data.clear()
-
-
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index e358337..26d2a51 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -44,30 +44,6 @@ class ManagerMock(object):
         return self.argument_values.get(name, default)
 
 
-class TestPLSFileParser(unittest.TestCase):
-    module = player_playable
-    exceptions = player_playable.PLSFileParser.option_exceptions
-
-    def get_parser(self, content=''):
-        with compat.mkdtemp() as path:
-            name = os.path.join(path, 'file.pls')
-            with open(name, 'w') as f:
-                f.write(content)
-            return self.module.PLSFileParser(name)
-
-    def test_getint(self):
-        parser = self.get_parser()
-        self.assertEqual(parser.getint('a', 'a', 2), 2)
-        with self.assertRaises(self.exceptions):
-            parser.getint('a', 'a')
-
-    def test_get(self):
-        parser = self.get_parser()
-        self.assertEqual(parser.get('a', 'a', 2), 2)
-        with self.assertRaises(self.exceptions):
-            parser.get('a', 'a')
-
-
 class TestPlayerBase(unittest.TestCase):
     module = player
 
@@ -263,7 +239,7 @@ class TestPlayable(TestIntegrationBase):
             file = p(tmpdir, 'playable.m3u')
             with open(file, 'w') as f:
                 f.write(data)
-            playlist = self.module.M3UFile(path=file, app=self.app)
+            playlist = self.module.PlayableFile(path=file, app=self.app)
             self.assertPathListEqual(
                 [a.path for a in playlist.entries()],
                 [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
@@ -281,7 +257,7 @@ class TestPlayable(TestIntegrationBase):
             file = p(tmpdir, 'playable.pls')
             with open(file, 'w') as f:
                 f.write(data)
-            playlist = self.module.PLSFile(path=file, app=self.app)
+            playlist = self.module.PlayableFile(path=file, app=self.app)
             self.assertPathListEqual(
                 [a.path for a in playlist.entries()],
                 [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
-- 
GitLab


From 97460e11a1efe086b8e8e424836c94bf19180de0 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Dec 2019 16:57:43 +0000
Subject: [PATCH 151/171] more cleanup and fixes

---
 browsepy/__init__.py                          |  54 +++++++++++---
 browsepy/compat.py                            |  31 +++++++-
 browsepy/http.py                              |  29 ++++----
 browsepy/manager.py                           |  55 +++++++--------
 browsepy/plugin/file_actions/__init__.py      |   5 +-
 browsepy/plugin/player/__init__.py            |   5 +-
 browsepy/static/icon/android-icon-144x144.png | Bin 0 -> 10616 bytes
 browsepy/static/icon/android-icon-192x192.png | Bin 0 -> 13594 bytes
 browsepy/static/icon/android-icon-36x36.png   | Bin 0 -> 2228 bytes
 browsepy/static/icon/android-icon-48x48.png   | Bin 0 -> 2915 bytes
 browsepy/static/icon/android-icon-72x72.png   | Bin 0 -> 4423 bytes
 browsepy/static/icon/android-icon-96x96.png   | Bin 0 -> 6313 bytes
 browsepy/static/icon/apple-icon-114x114.png   | Bin 0 -> 7865 bytes
 browsepy/static/icon/apple-icon-120x120.png   | Bin 0 -> 8352 bytes
 browsepy/static/icon/apple-icon-144x144.png   | Bin 0 -> 10616 bytes
 browsepy/static/icon/apple-icon-152x152.png   | Bin 0 -> 11226 bytes
 browsepy/static/icon/apple-icon-180x180.png   | Bin 0 -> 14039 bytes
 browsepy/static/icon/apple-icon-57x57.png     | Bin 0 -> 3432 bytes
 browsepy/static/icon/apple-icon-60x60.png     | Bin 0 -> 3594 bytes
 browsepy/static/icon/apple-icon-72x72.png     | Bin 0 -> 4423 bytes
 browsepy/static/icon/apple-icon-76x76.png     | Bin 0 -> 4758 bytes
 .../static/icon/apple-icon-precomposed.png    | Bin 0 -> 14168 bytes
 browsepy/static/icon/apple-icon.png           | Bin 0 -> 14168 bytes
 browsepy/static/icon/favicon-16x16.png        | Bin 0 -> 1340 bytes
 browsepy/static/icon/favicon-32x32.png        | Bin 0 -> 1964 bytes
 browsepy/static/icon/favicon-96x96.png        | Bin 0 -> 6313 bytes
 browsepy/static/icon/favicon.ico              | Bin 0 -> 1150 bytes
 browsepy/static/icon/ms-icon-144x144.png      | Bin 0 -> 10616 bytes
 browsepy/static/icon/ms-icon-150x150.png      | Bin 0 -> 11052 bytes
 browsepy/static/icon/ms-icon-310x310.png      | Bin 0 -> 27734 bytes
 browsepy/static/icon/ms-icon-70x70.png        | Bin 0 -> 4284 bytes
 browsepy/stream.py                            |  13 +++-
 browsepy/templates/base.html                  |  21 +++++-
 browsepy/templates/browserconfig.xml          |  11 +++
 browsepy/templates/manifest.json              |  41 +++++++++++
 browsepy/tests/test_utils.py                  |  66 +-----------------
 browsepy/utils.py                             |  57 ---------------
 doc/conf.py                                   |   2 +-
 requirements/doc.txt                          |   1 +
 setup.cfg                                     |   3 +
 40 files changed, 211 insertions(+), 183 deletions(-)
 create mode 100644 browsepy/static/icon/android-icon-144x144.png
 create mode 100644 browsepy/static/icon/android-icon-192x192.png
 create mode 100644 browsepy/static/icon/android-icon-36x36.png
 create mode 100644 browsepy/static/icon/android-icon-48x48.png
 create mode 100644 browsepy/static/icon/android-icon-72x72.png
 create mode 100644 browsepy/static/icon/android-icon-96x96.png
 create mode 100644 browsepy/static/icon/apple-icon-114x114.png
 create mode 100644 browsepy/static/icon/apple-icon-120x120.png
 create mode 100644 browsepy/static/icon/apple-icon-144x144.png
 create mode 100644 browsepy/static/icon/apple-icon-152x152.png
 create mode 100644 browsepy/static/icon/apple-icon-180x180.png
 create mode 100644 browsepy/static/icon/apple-icon-57x57.png
 create mode 100644 browsepy/static/icon/apple-icon-60x60.png
 create mode 100644 browsepy/static/icon/apple-icon-72x72.png
 create mode 100644 browsepy/static/icon/apple-icon-76x76.png
 create mode 100644 browsepy/static/icon/apple-icon-precomposed.png
 create mode 100644 browsepy/static/icon/apple-icon.png
 create mode 100644 browsepy/static/icon/favicon-16x16.png
 create mode 100644 browsepy/static/icon/favicon-32x32.png
 create mode 100644 browsepy/static/icon/favicon-96x96.png
 create mode 100644 browsepy/static/icon/favicon.ico
 create mode 100644 browsepy/static/icon/ms-icon-144x144.png
 create mode 100644 browsepy/static/icon/ms-icon-150x150.png
 create mode 100644 browsepy/static/icon/ms-icon-310x310.png
 create mode 100644 browsepy/static/icon/ms-icon-70x70.png
 create mode 100644 browsepy/templates/browserconfig.xml
 create mode 100644 browsepy/templates/manifest.json

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 2f95d96..737cfaf 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -5,40 +5,42 @@ __version__ = '0.6.0'
 import logging
 import os
 import os.path
+import time
 
 import cookieman
 
-from flask import request, render_template, redirect, \
+from flask import request, render_template, jsonify, redirect, \
                   url_for, send_from_directory, \
                   session, abort
 
 from .appconfig import Flask
 from .manager import PluginManager
 from .file import Node, secure_filename
-from .stream import stream_template
+from .stream import tarfile_extension, stream_template
 from .http import etag
 from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
                         InvalidFilenameError, InvalidPathError
+
 from . import compat
-from . import utils
 
 logger = logging.getLogger(__name__)
 
 app = Flask(
     __name__,
-    static_url_path='/static',
-    static_folder=utils.ppath('static'),
-    template_folder=utils.ppath('templates'),
+    template_folder='templates',
+    static_folder='static',
     )
 app.config.update(
-    SECRET_KEY=utils.random_string(4096),
+    SECRET_KEY=os.urandom(4096),
     APPLICATION_NAME='browsepy',
+    APPLICATION_TIME=None,
     DIRECTORY_BASE=compat.getcwd(),
     DIRECTORY_START=None,
     DIRECTORY_REMOVE=None,
     DIRECTORY_UPLOAD=None,
     DIRECTORY_TAR_BUFFSIZE=262144,
     DIRECTORY_TAR_COMPRESSION='gzip',
+    DIRECTORY_TAR_EXTENSION=None,
     DIRECTORY_TAR_COMPRESSLEVEL=1,
     DIRECTORY_DOWNLOADABLE=True,
     USE_BINARY_MULTIPLES=True,
@@ -59,6 +61,22 @@ if 'BROWSEPY_SETTINGS' in os.environ:
 plugin_manager = PluginManager(app)
 
 
+@app.before_first_request
+def prepare():
+    config = app.config
+    if config['APPLICATION_TIME'] is None:
+        config['APPLICATION_TIME'] = time.time()
+
+
+@app.url_defaults
+def default_download_extension(endpoint, values):
+    if endpoint == 'download_directory':
+        values.setdefault(
+            'extension',
+            tarfile_extension(app.config['DIRECTORY_TAR_EXTENSION']),
+            )
+
+
 @app.session_interface.register('browse:sort')
 def shrink_browse_sort(data, last):
     """Session `browse:short` size reduction logic."""
@@ -158,9 +176,12 @@ def browse(path):
             file=directory,
             sort_property=sort_property,
             sort_fnc=sort_fnc,
-            sort_reverse=sort_reverse
+            sort_reverse=sort_reverse,
+            )
+        response.last_modified = max(
+            directory.content_mtime,
+            app.config['APPLICATION_TIME'],
             )
-        response.last_modified = directory.content_mtime
         response.set_etag(
             etag(
                 content_mtime=directory.content_mtime,
@@ -188,8 +209,11 @@ def download_file(path):
     abort(404)
 
 
-@app.route('/download/directory/<path:path>.tgz')
-def download_directory(path):
+@app.route('/download/directory.<string:extension>', defaults={'path': ''})
+@app.route('/download/directory/?<path:path>.<string:extension>')
+def download_directory(path, extension):
+    if extension != tarfile_extension(app.config['DIRECTORY_TAR_COMPRESSION']):
+        abort(404)
     directory = Node.from_urlpath(path)
     if directory.is_directory and not directory.is_excluded:
         return directory.download()
@@ -234,6 +258,14 @@ def upload(path):
     abort(404)
 
 
+@app.route('/<any("manifest.json", "browserconfig.xml"):filename>')
+def metadata(filename):
+    response = app.response_class(render_template(filename))
+    response.last_modified = app.config['APPLICATION_TIME']
+    response.make_conditional(request)
+    return response
+
+
 @app.route('/')
 def index():
     path = app.config['DIRECTORY_START'] or app.config['DIRECTORY_BASE']
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 049727c..d75b0b0 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Module providing runtime and platform compatibility workarounds."""
 
 import os
 import os.path
@@ -15,6 +15,7 @@ import warnings
 import posixpath
 import ntpath
 import argparse
+import types
 
 try:
     import builtins  # python 3+
@@ -46,6 +47,16 @@ try:
 except ImportError:
     from collections import Iterator as BaseIterator  # noqa
 
+try:
+    from importlib import import_module as _import_module  # python 3.3+
+except ImportError:
+    _import_module = None  # noqa
+
+try:
+    import typing  # python 3.5+
+except ImportError:
+    typing = None  # noqa
+
 
 FS_ENCODING = sys.getfilesystemencoding()
 PY_LEGACY = sys.version_info < (3, )
@@ -112,6 +123,7 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
 
 @contextlib.contextmanager
 def scandir(path):
+    # type: (str) -> typing.Generator[typing.Iterator[os.DirEntry], None, None]
     """
     Get iterable of :class:`os.DirEntry` as context manager.
 
@@ -130,7 +142,23 @@ def scandir(path):
             files.close()
 
 
+def import_module(name):
+    # type: (str) -> types.ModuleType
+    """
+    Import a module by absolute name.
+
+    The 'package' argument is required when performing a relative import. It
+    specifies the package to use as the anchor point from which to resolve the
+    relative import to an absolute import.
+    """
+    if _import_module:
+        return _import_module(name)
+    __import__(name)
+    return sys.modules[name]
+
+
 def _unsafe_rmtree(path):
+    # type: (str) -> None
     """
     Remove directory tree, without error handling.
 
@@ -152,6 +180,7 @@ def _unsafe_rmtree(path):
 
 
 def rmtree(path):
+    # type: (str) -> None
     """
     Remove directory tree, with platform-specific fixes.
 
diff --git a/browsepy/http.py b/browsepy/http.py
index ec81a9c..875e351 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""HTTP utility module."""
 
 import re
 import logging
@@ -8,32 +8,34 @@ import msgpack
 from werkzeug.http import dump_header, dump_options_header, generate_etag
 from werkzeug.datastructures import Headers as BaseHeaders
 
+from .compat import typing
+
 
 logger = logging.getLogger(__name__)
 
 
 class Headers(BaseHeaders):
     """
-    A wrapper around :class:`werkzeug.datastructures.Headers`, allowing
-    to specify headers with options on initialization.
+    Covenience :class:`werkzeug.datastructures.Headers` wrapper.
 
-    Headers are provided as keyword arguments while values can be either
-    :type:`str` (no options) or tuple of :type:`str` and :type:`dict`.
+    This datastructure allows specifying initial values, as keyword
+    arguments while values can be either :type:`str` (no options)
+    or tuple of :type:`str` and :type:`dict`.
     """
+
     snake_replace = staticmethod(re.compile(r'(^|-)[a-z]').sub)
 
     @classmethod
-    def genpair(cls, key, value):
+    def genpair(cls,
+                key,  # type: str
+                value,  # type: typing.Union[str, typing.Mapping]
+                ):  # type: (...) -> typing.Tuple[str, str]
         """
-        Extract value and options from values dict based on given key and
-        options-key.
+        Fix header name and options to be passed to werkzeug.
 
         :param key: value key
-        :type key: str
         :param value: value or value/options pair
-        :type value: str or pair of (str, dict)
         :returns: tuple with key and value
-        :rtype: tuple of (str, str)
         """
         rkey = cls.snake_replace(
             lambda x: x.group(0).upper(),
@@ -47,9 +49,11 @@ class Headers(BaseHeaders):
         return rkey, rvalue
 
     def __init__(self, **kwargs):
+        # type: (**typing.Union[str, typing.Mapping]) -> None
         """
+        Initialize.
+
         :param **kwargs: header and values as keyword arguments
-        :type **kwargs: str or (str, dict)
         """
         items = [
             self.genpair(key, value)
@@ -59,5 +63,6 @@ class Headers(BaseHeaders):
 
 
 def etag(*args, **kwargs):
+    # type: (*typing.Any, **typing.Any) -> str
     """Generate etag identifier from given parameters."""
     return generate_etag(msgpack.dumps((args, kwargs)))
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 42a5669..22c3c9b 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -12,24 +12,23 @@ from cookieman import CookieMan
 from . import mimetype
 from . import compat
 from . import file
-from . import utils
 
+from .compat import typing, types
 from .utils import defaultsnamedtuple
 from .exceptions import PluginNotFoundError, InvalidArgumentError, \
                         WidgetParameterException
 
 
 class PluginManagerBase(object):
-    """
-    Base plugin manager for plugin module loading and Flask extension logic.
-    """
+    """Base plugin manager with loading and Flask extension logic."""
 
     _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
 
     @property
     def namespaces(self):
+        # type: () -> typing.Iterable[str]
         """
-        List of plugin namespaces taken from app config.
+        List plugin namespaces taken from app config.
 
         :returns: list of plugin namespaces
         :rtype: typing.List[str]
@@ -37,9 +36,11 @@ class PluginManagerBase(object):
         return self.app.config.get('PLUGIN_NAMESPACES', []) if self.app else []
 
     def __init__(self, app=None):
+        # type app: typing.Optional[flask.Flask]
         """
+        Initialize.
+
         :param app: flask application
-        :type app: flask.Flask
         """
         self.plugin_filters = []
 
@@ -49,11 +50,11 @@ class PluginManagerBase(object):
             self.init_app(app)
 
     def init_app(self, app):
+        # type app: flask.Flask
         """
         Initialize this Flask extension for given app.
 
         :param app: flask application
-        :type app: flask.Flask
         """
         self.app = app
         if not hasattr(app, 'extensions'):
@@ -74,23 +75,18 @@ class PluginManagerBase(object):
             self.load_plugin(plugin)
 
     def clear(self):
-        """
-        Clear plugin manager state.
-        """
+        """Clear plugin manager state."""
         pass
 
     def _iter_modules(self, prefix):
-        """
-        Iterate thru all root modules containing given prefix.
-        """
+        """Iterate thru all root modules containing given prefix."""
         for finder, name, ispkg in pkgutil.iter_modules():
             if name.startswith(prefix):
                 yield name
 
     def _content_import_name(self, module, item, prefix):
-        """
-        Get importable module contnt import name..
-        """
+        # type: (str, str, str) -> typing.Optional[str]
+        """Get importable module contnt import name."""
         res = compat.res
         name = '%s.%s' % (module, item)
         if name.startswith(prefix):
@@ -99,11 +95,11 @@ class PluginManagerBase(object):
                     return name[:-len(ext)]
             if not res.is_resource(module, item):
                 return name
+        return None
 
     def _iter_submodules(self, prefix):
-        """
-        Iterate thru all modules which full name contains given prefix.
-        """
+        # type: (str) -> typing.Generator[str, None, None]
+        """Iterate thru all modules with an absolute prefix."""
         res = compat.res
         parent = prefix.rsplit('.', 1)[0]
         for base in (prefix, parent):
@@ -115,13 +111,15 @@ class PluginManagerBase(object):
             except ImportError:
                 pass
 
-    def _iter_plugin_modules(self, get_module_fnc=utils.get_module):
+    def _iter_plugin_modules(self, get_module_fnc=compat.import_module):
         """
-        Iterate plugin modules, yielding both full qualified name and
-        short plugin name as tuple.
+        Iterate plugin modules.
+
+        This generator yields both full qualified name and short plugin
+        names.
         """
-        nameset = set()
-        shortset = set()
+        nameset = set()  # type: typing.Set[str]
+        shortset = set()  # type: typing.Set[str]
         filters = self.plugin_filters
         for prefix in filter(None, self.namespaces):
             name_iter_fnc = (
@@ -151,12 +149,12 @@ class PluginManagerBase(object):
 
     @cached_property
     def available_plugins(self):
-        """
-        Iterate through all loadable plugins on default import locations
-        """
+        # type: () -> typing.List[types.ModuleType]
+        """Iterate through all loadable plugins on typical paths."""
         return list(self._iter_plugin_modules())
 
-    def import_plugin(self, plugin, get_module_fnc=utils.get_module):
+    def import_plugin(self, plugin, get_module_fnc=compat.import_module):
+        # type: (str) -> types.ModuleType
         """
         Import plugin by given name, looking at :attr:`namespaces`.
 
@@ -184,6 +182,7 @@ class PluginManagerBase(object):
             plugin, names)
 
     def load_plugin(self, plugin):
+        # type: (str) -> types.ModuleType
         """
         Import plugin (see :meth:`import_plugin`) and load related data.
 
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index d375c9b..9599648 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -9,7 +9,6 @@ from browsepy.file import Node, abspath_to_urlpath, current_restricted_chars, \
                           common_path_separators
 from browsepy.compat import re_escape, FileNotFoundError
 from browsepy.exceptions import OutsideDirectoryBase
-from browsepy.utils import ppath
 from browsepy.stream import stream_template
 
 from .exceptions import FileActionsException, \
@@ -24,8 +23,8 @@ actions = Blueprint(
     'file_actions',
     __name__,
     url_prefix='/file-actions',
-    template_folder=ppath('templates', module=__name__),
-    static_folder=ppath('static', module=__name__),
+    template_folder='templates',
+    static_folder='static',
 )
 
 re_basename = '^[^ {0}]([^{0}]*[^ {0}])?$'.format(
diff --git a/browsepy/plugin/player/__init__.py b/browsepy/plugin/player/__init__.py
index 7f00f11..8186cb1 100644
--- a/browsepy/plugin/player/__init__.py
+++ b/browsepy/plugin/player/__init__.py
@@ -10,7 +10,6 @@ This plugin is both functional and simple enough to server as example for:
 """
 from flask import Blueprint, abort
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
-from browsepy.utils import ppath
 from browsepy.stream import stream_template
 
 from .playable import PlayableNode, PlayableDirectory, PlayableFile
@@ -20,8 +19,8 @@ player = Blueprint(
     'player',
     __name__,
     url_prefix='/play',
-    template_folder=ppath('templates', module=__name__),
-    static_folder=ppath('static', module=__name__),
+    template_folder='templates',
+    static_folder='static',
     )
 
 
diff --git a/browsepy/static/icon/android-icon-144x144.png b/browsepy/static/icon/android-icon-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb24422d9ac18370f3a878c3f20845ae27737c7d
GIT binary patch
literal 10616
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/android-icon-192x192.png b/browsepy/static/icon/android-icon-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b2f194b2aab1555a1a7cf7b84f019bbd472f18f
GIT binary patch
literal 13594
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
DJm)oo

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/android-icon-36x36.png b/browsepy/static/icon/android-icon-36x36.png
new file mode 100644
index 0000000000000000000000000000000000000000..97aeced9efa68f0c8bd22dab4d69e75bafa46fca
GIT binary patch
literal 2228
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
K=d#Wzp$Pz@b<+g^

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/android-icon-48x48.png b/browsepy/static/icon/android-icon-48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..374448741ac3ddf81768c2d3365ce46793428f5b
GIT binary patch
literal 2915
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIEa{HEjtmSN`?>!lvNA9*
zFct^7J29*~C-ahlfk7eJBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a
z><YADU|?WN@^*J&_z!{$_AZ~yz`(#+;1OBOz`%C|gc+x5^GP!>a9s0raSX}0_jXpk
zPe{7hvHI`#b{d>{&~QLu(Uyjg2~kdKUz$Zni>}qZ>$dsE63$7zD_>sX&)qg_S)GAN
zp29BQ?Iuadp1XRzZf)u`jnq}VR_1$GbOjsZ(M_zf{}~oP_>te1n5Ji3eE+Y3>h7(F
z&)neKGW(5Zp4v>y_r>Rp-`CzRKKD7UbEU3e1ltm(rW?KtcMm+RmiWBbx9dZ6n~JAy
z*y^n+mX?+h+z|#6DJdx~*G=B?AJ{ijA)&)XPf_vUmeSYPmVEkDRAU$KqTm{M!KC-q
ztE|1dci%q16M011bCOG0nb~yx__Xu$Y+0BZH`F<CaB*?n*i&h&HaT-yQomn<(GKnK
zbsv5{pa1y#@8w^lB_$s|ogP2$;seGf5pz^LyIv`uF7m0f=WdMO^mqP&^SS>&v!vzh
zSDRuo^}QXdz>|AMe|m&w@SI_K!l>%NIDu1wQNBRdg8z$vmi3+eB1}vhn50!bSNV8)
zYR)sykE<#xD@&@X+LdB7^TW>?3mLw|?YB*L-+foGGbX)NK%UvX;kLawqhy7yy}kX;
zMT-vYNjod`?A+XLozp-5)-@ee=vuU3)v6`0cNJDtSS(+<RQ36Vh0dqnmi;bNJmR;2
z`9k`f27#t0Pf}hkogOzUI5xId=d_G%)s*%7eswKes2HOsUbkPq`JjWB7uU|6JJ&>Q
z?Rxbp%Pi-{ggx2U*WH(~tJ!hm_18T1e_TF)rc|tPTm12j`urLtDQW4}RjZmVJQn<>
zrK>CY{QP`zSy|afxAXUlnwpv_+1tl!bO{yCS+#1>iWMGLu3zuw7T4>zbt`J(tXWmE
zKWrDA(_q|vSMS_hYxQ}R&t|UpS03-SI56kN2FEYozjtrHUl$#rGcEf-{$f_i?d~3v
zRH~}0SFT?D_(-Slcbj|9KVQ6ar|0_Xr)#(0ODZWbS-o)K!+v35;pdITm+hE8KR++d
zZ~te*gw&t&{{7so?;3by_4<8UY;0^Uk&!d`Y8YlL=Q7Hhc_VN8<;$0w*B#$d>63Xd
zVM6WiZx?UgJULA_T4nXsD8@fkTK{+0IywDOU+Fc;B`Qj)TU=jFU!UJKP(n&-(e~}r
zFJ8R3Lgo0eV>h;Di~s)qKK*EyXeK+K%n#WMd_Dfsjh?|Gt)D&>ZOggo6c#2X*UzrV
zqBgm6<3>X%Y3a<oJh#hRIxK8$ZA(f@0wN<%ipSS%{B&-vHS2+yyZ=6lJF_-=dtdpz
z%JzT%>dbO)iNx%$+nfFO*Vl8aR%!j89$)9_>&q)`p63!crNd&@vcd-k7`wW<A~qx(
zlzFhRfHycMT|r&F-TYofv$A{Nhi9|%<I1h(zGpn%_~5~V2g<dzwd;HP`=9UqbV_^6
z_U)H%-<B3!zk9dz_S<JCse1D)_n#l9*^<Gu=du}d_VsnDnwp*8@7Ko{Tg|m@uxI?w
zaI4|&tYx{kcbBif{IVn{FtAa_ec#`;(c5=ad{pwDuBWP~xKO}j_ign&mL50d)YQ~1
z+qW0LytMT5f%^^r!x&i#Qc6m;JioCqc}>K|rkk77-H%)`>1}Le6w`@lIGS{lsm?$l
zk3~m}`}6bj%QtTp_Pu<LVR7P}IZhq()~(aKbouhh6DK;lvNzxK@b*5OW2SC6*EnHg
zgn?8q4?jP5Lc@pF8GJE&s=ls@4-`o|J4;mb`>n0nD^__01x@nucs56l$!)QqYv6~U
zHBAA&_E*#DZ@(>LFNy8<WGUW#*JD!4s#Qjcd&{ageDVtKt8Vd#T4gu$#3J2C@8_t0
zR6Ufjvru_Krqr%=i&w2;Ig^z2uwvTDlpqz)L$ANO9W|Zl!=cE*!en*-zQ`l*18>V7
zfB(HPYOT<O(^o9jj%RIE^XcnM3tKH3d;R0j8ped2TO2!L^kn$hRaI3_Y>IK3!OA|P
z;pow$M|a%K%e%WvRMgzuTzvZJ*5i*aHpugINH>1`SZHN!9l0$>GBPrfpJ_kW<FKra
z5ptT^+KYGZo;}+<-|dKr1dmS4jtK`3I>zW-@6A+IXnFA9U~@`J%7;6}=a-(?v`03=
z*<;}e207-e`Bkr0R<^db*8F<8+{ecyuTocxo0XMyj%6`h|M6l~nZ_O0oc8YBYhrHx
z`Pb|9kH7z(Ui0l{y1eDwbBT&B7jn$f*T?KM%KrWB?UrrZE?vARD7t>Z0*2LBPpu4I
z&ho+k(3-{_LL4kiCMG5eR%u0V&zl-o^U?M7g9i&jua|Dxy!qtGlMi29T>R$FPT~IJ
z!h+t@Qm?IzKHe*B{^I@n{mv_v{c4;f{=M$N%aTpW$N8e7qbon1RIhx{$Q~fl`uKQ%
z@uMT0esirvFTX3kU;8~UF3vAFSXfzEIrhN*LqC1Hx4iiL^T)5(>n$rksjOP1<S8U9
zEPVg<Ev1<U6A~^j^L??)&)d7(pX1|1ozv!rN{b4kkE~p|G9@jo?!C1li?Fb8#w@Yo
z4-BWL>pyQ5k6W;Dqu}hb*Z5>+uHx;LZv6dz|NL3Aq>74)>V*6X3k|n!-MVG#*1``D
z4oW+9*fT2!|2)1`ENXX|?$@thpFDl~SEFarB%!kR_j*r1U9@hU-|pJqWy}RSmuAf1
zIAZkIiK9ip=HHLUH9sD<uZi0`>&THK5*H5Un0@~9`TXYc_i;6L^0UqJ`EKNFt36Qd
zaO9o+GS`@p5SP$U(MAV_H=aw@y?*lasbWjQ?QOX>ACCyXxw*Oh+qbe=vu9gYf79_>
zF1-JKzd+I^8#P_sUU&K0DW^_(d3k$V*8DJdzwh_D@{EiZ%nSM?mVEPgzUbPKBS-dM
zzk1d7%bU&T-KILGL>_zoIWRW1_iWl{`@df<x2;;GwQ|D-f&SyohaVnzSn%L$m7!Gc
znVH7zXU_QaxGBfR#+sO#c5d6YP5bfV$6pWB9S}V|U;1rqr}N8~FZpMleKzBXS?u+l
zb$_b@E^p~?xN_ynm8(C0{+!t@rfVc3E^b`@E@slCNgt~A-gsNK@8>h=U%!6+nXVVR
z%gW5`8rL6I3vQOAo$)42S|1c9oY}j7ZBgTei5Hy`G&fvHFwilQ;MuI|8Pp=+xc`2=
zu>{XIM)k(a4ZRmGUbemIBfD0blXHuk(`!8kkNcA9r<8ir{<DQ1d-*K9tL_v71A}Ub
zYeY#(Vo9o1a#3nxNh*VpfuW_Yp^>hkQHY_5m4T_1k)gJMft7*5EUu=nC>nC}Q!>*k
zacg)TZsp0qz~Bb5p*TOSq&%@GmBBMNF+J5cF+DRmTft1vT+c$+Qo+c;&_vh3RM*f*
zA<)oFA)}<Ez)D}gyu4g56Qnv9tXeO>DE&^`TLuOO1__XfAsMB)Nmf=a`N^fZsd*(<
zRso6Wsl^P2%m44zM^gi~)5<C%H8VY<gu&3#h@YXTm4Sgl9LXH0n()k&k_?cN%WD)l
z7#J8Nk(Bsm=BAcZ7NjzOU8P@;mu|l)%n!{R-;m7QR0cy+b2CFzOH(7m{F{GN85kJ&
zk<1CstV(4taB`Zm$nFgT149^+RA`VVLt17|s+GRJer{e#PJX(6T4Gsda(-U1J|bfD
z4NQ{^4b4+c63vY)O_S2hk}T6K3{sQL49rt3k}NC}^)i$5^$PORWxAw}fdb6a)z4*}
HQ$iB}aWgGG

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/android-icon-72x72.png b/browsepy/static/icon/android-icon-72x72.png
new file mode 100644
index 0000000000000000000000000000000000000000..b72780ec6fdc46f78468d6799bb6076dbe9cf2f7
GIT binary patch
literal 4423
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
YzFt9Ix=feUF;IYcy85}Sb4q9e0Jcu_1^@s6

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/android-icon-96x96.png b/browsepy/static/icon/android-icon-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bed499c3bce1f97511cdf11a5c52ce1155b11c4
GIT binary patch
literal 6313
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-114x114.png b/browsepy/static/icon/apple-icon-114x114.png
new file mode 100644
index 0000000000000000000000000000000000000000..3186726c070df3ceb50fc4e2d13897af44ea31f0
GIT binary patch
literal 7865
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
GLK6U7YrKsB

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-120x120.png b/browsepy/static/icon/apple-icon-120x120.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e34a6aff9c76e617878d4494eecd93d6fcdefc0
GIT binary patch
literal 8352
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-144x144.png b/browsepy/static/icon/apple-icon-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb24422d9ac18370f3a878c3f20845ae27737c7d
GIT binary patch
literal 10616
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-152x152.png b/browsepy/static/icon/apple-icon-152x152.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b3a10d5e94ed7dd9ba3ed8d0091308f573623ba
GIT binary patch
literal 11226
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
B62AZd

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-180x180.png b/browsepy/static/icon/apple-icon-180x180.png
new file mode 100644
index 0000000000000000000000000000000000000000..93d88f178666d693c6039f6756be1fa778277e7b
GIT binary patch
literal 14039
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-57x57.png b/browsepy/static/icon/apple-icon-57x57.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e53b728232f3d116966ab7c682d92ac03a878c5
GIT binary patch
literal 3432
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
a%S_JKE67Wi>5@7I3NTMsKbLh*2~7YqO()?1

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-60x60.png b/browsepy/static/icon/apple-icon-60x60.png
new file mode 100644
index 0000000000000000000000000000000000000000..039d0a1253a6a51d6cf0491d694d90bacc02e9af
GIT binary patch
literal 3594
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-72x72.png b/browsepy/static/icon/apple-icon-72x72.png
new file mode 100644
index 0000000000000000000000000000000000000000..b72780ec6fdc46f78468d6799bb6076dbe9cf2f7
GIT binary patch
literal 4423
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
YzFt9Ix=feUF;IYcy85}Sb4q9e0Jcu_1^@s6

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-76x76.png b/browsepy/static/icon/apple-icon-76x76.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ffd5c740509e66963fc437117d9254ef18982a
GIT binary patch
literal 4758
zcmeAS@N?(olHy`uVBq!ia0y~yVDJH94mJh`hU3!%wHX)~SkfJR9T^xl_H+M9WMyDr
zU@Q)DcVbv~PUa;81A{`cN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-
z*%fHRz`($k<n8Xl@E-&h>|H*Yfq{Xuz$3Dlfr0M`2s2LA=96Y%5a9H5aSW-r^>$8m
zLCE#m<M!p{@9n<C=te0jDr+aOm<e(;_Amz9AJX8sX<)F)R`J^e#dVi$R?g+~H7dQ8
zImzhojF%NbLFHH6*lxZ&(Q`NIMl$m{UbgP(tZJJCI956t2{~Qb<fQ%f@w<C}zxJ;V
zmF;JIs}!;Gsde$c+n;~E+4+6W{l_t_AH5la7)|@E9#7@tVZJ!~!nc-FLdWyh9!N|0
z`GQ5=OYMQohw=kQQ<!(od&HQ=_Ds9$Q-Yfto7rq$LC+n@u7MpcN-;Z&SYxkmW~knj
z*yH|@fqBA~EhcrJCeJUpU;Dk+*Cwu$qifNHix&^Bum78^7q@4I#n0$96^#p5X?2U~
zCS6?>%EQYm$iw#dT}Wu?96$B5XU{HKwoGldV@#KHgpb|)e)0I4iO%hOiAFPz#p+A-
z28DziIbZi}bIN&JMO7Z3%O-wvEDqk=Tm5+5?fdu7fA~<~)L*>G^xx8tteRay*H8VL
z>?gd&T=L6R*~&>J(h+lZ@#^^9WfNPT$J`yfz47SE+Xo(9$xSGHWwya$>W0h`?xhTT
z3c`n3mn8kUnCQT~u7G=P|76aHGe;Nq96HJF)v&wqr32ptz8eNL#fk^`c^K{<kbIz0
zAh+Yp5i3h|S%ZTSrsWL$%-W4X39DAEdbw)VtXwl`zINu_cl%DJI9)bjYGi11VDP=H
zBE#3;af0Cj%O37M{9BUO9Qj{-;8J7n0iy+1(l)1xh=>@ZpOf+O^3u@KQnI(7f8|QZ
zny}Y1wwp=t6urEpdh6D$DU;Rxm(8`SwOYG(@7{uxloZwrJa43Q=lWbwwvKG5<^8ex
z%a@Ydi(I=S_EwpGzh7^^Iqj^Hs%mPEX{(dsp@#-aO-GXsW^E0Mi8-U(Z{wsQv~ct0
z$^CY}I=0`dI$ikU!a`TM{&c+nzCXgpR(0RMZ7JC}^K6=TWaP}$$H#g@!ons^p4@!=
z@xvP%ljm5Kb`?KAck$-U&f|{{zW=`XwH04`^O-X~%lzk`TNAliLr-tnmMv3wrOh^!
zy^Z?z_O`pPZ|~#7{Pus`3?y`z;+R%7{#&nOAb9X;QD9);LH@cA%<p!+*0Zv*y0Nd;
zdUyHzWlNW~?%QXlH1UM#ZNr&9DXFP}At6UjP1TOvoW>g(8mbeyspZwHtgNi8W#7Mi
z`6F|JbsLj--qAln4gX7a#(a7<JHPAr<B6rOuW=sZwqCcX;Gt7yX6D3s^W;{pUoXD?
zy0%=u`>NHeQ%_D(P1=52I7?h0G&J?zp2|;$xb;sQ?G``!{=0W>?%Fdmjol5(u4eU|
zeY%?6$HnD(Dae%fb>DYCDzOq~`+9WJv}tPoHXmC|%*?u$Wp1keo;TAxKaS^?JyY<$
zNeB4k?R2!m)(CVTHA>u&bTq~2<fhcqPn!AdCKOoceEs@0C?rHhqW$jvXKKft)Mai=
zRCZ7K`RVB*jZ-a$e<jub{{CLv_wtfu%iM~Ji&-Bx>}Gqsz$Q=i=(G@#)@RSs=GFhJ
z<dd_ha2EXXamB`s6XXAVnm)&_cGhwE`Z>MQ=1JRczi0U;G^29!uelpU%bw3IKUMqv
zuKKD~_pVI+`ZLLFcIw|>UoYLhtvz?{+@QcfMTzH|_8&Faer)NIH5=Bg)9aJ7^|G*8
z7<Srp>1(U}eLvN#%ipP(n@@jV`@Z_g)2BBZzDlIs*fB*UL8<7n{9*meCr)sfnwrkB
zC~Rt%ubbg6SIOcUn8x&4;yIgvrr$5aqkIdD)6OWEn~S#}Zd~`8hmY^l&6_7%xy6M}
zJ^iug+&tUUeX`a!w&hCu+k9kszvpw`&qJ-;QxEKCR^MlI;M3>Nk$bC5r%s)EW}fYA
z&ERDT+izbim7Rayy}aDqy-()h*6VSPZ){9%aa!2&tJ7`qo12^4zrMa692RzrncwEX
z>h=4qgd-Sh4wd$NS;8DF(%Q-`{;50uPt&JQMIx@CEYQ}*wk~F8)6pbFd;9sj-|gz2
zG)X9IUChb+`rpx6Sy>-`)^L8kdGqGUcXxMdYHKfEw5aLVud3DOpH~aq;QZou<&Ij;
z^glJ4nwk^;{{HT5Av3M5jji(8%=DCRZ*ESSJ6Ct+%$bv>PF4N+^XI1r&HSg{*L}B^
zl#meUKdyY<?)RD-IoqVIW^diP)iXPL^^~boIWI8(x#^<U#>qZy@?_<$Tek}FwLe|E
z{obUXpPzRx(hyw0dxQH5<9|jOR<_HRFQ;B!=6mV>ef{U>=l9F<3TgQ*500z-8p_$~
z^y$lGe{KPWdC5%Xhd9}{B_3vzl#!X@Z}-#X-QMqUjBX9n8<#qWxd|0X6{vp@KQMF4
z7L%L1N>^vhQrlhjR%rX}xds2v+kT(Z;-pyla_MvxRaMu9TNf+iLOr{so<4c9q3mr`
zj+wNnsi}#XnOo!C1D_q3AIP#=^gJ~D8=i3b!-s<ZeX`aWSy_)3w#zMAvqtBkp^2&K
z!;cj+?Cb3$B_$bJB{nvnWY78b=B7^Eo*BmJ=QfnTk1L6N&-Rb?#~ZCsB?sFL&+qIk
zesg<!|CcW%VQV59SE)_oynpZBxdR6ncJAEiGuw<eL8|S1P7$N=Odp+?9RkZQdnP9<
z%gV|!$S3B!zCKC3BK-1}gUsxF55E7NX<u)5^X5&?-ovlIUb=hN*UgQswY4>2&AOG7
z`DPqVTDW7!j0}@gD}$GFv^ohscpRv3{j%qR<$L$eefKVpi;HW=<Gv$*8fPuLc=c-Q
z;fD(P`ush+Io^4)>zJBO{qv{BX`#ULb90?t*c$)KrGNEyIRD^*!t?X<kH0N@T(<jo
z<X3-DzV@9ZFNIdEdQ`MC$);$>v7aWI2aJr2PMkQQAi{O=`gQgP(yWGZnFn0=-}jG?
zzaL?sBIv3lXd`$2#*8y*n>mxq=fxa&Q)XSZdv1Y+jB#O;#O{X`OPHM>7DTwYxdn)*
zK8*RFVbXQ~y}QeX+ixRu#8?k=>|YgZsCgjAOge1!)C2>GZjM&T`ZEFSZb}n7SeP0O
z6FSq<j^_lezS?y&hwZR=+0|o{wt3I;QCoB|<IGv*BjPjrx;k7IyG^~=skS6Sx@*yq
zcf2u^J%buDXSFTMypgl*MoQ?h_g_sI`8MBNbK`9rx3&O>%A5GjQEMAEGQQZwcg*_J
zs$Nyr2m=Wf5w66oQOWIoQ(w<eiI*r|wQ5z@;fD?`5|Wah95WVa+<03i;_7(Wq$F0n
zXU&3>tT`zuEfXgSt_jojTQ1Bq`=aT&S6UO2x8I(+W{u9FhX&5h&YZo6bIc}Bo!Yuc
zgNL7AxYLD2;*r$KAWud!6BC#Edi%27wq=LT9Xi1%-EY+J=gXIpW&ZQ~uD_PGmO7#x
z8d|vf?u%W0*I&E3ERxtM9?ol~@>cfRty^73lM>(E**W8E8hb#`#LNoYvy7iUefp%K
zqqAi9?%Cbq!n;qbUZwT(=TDYq$6vpHAB>1(_SxnhbiGtcTKb|%@1;vYMMXsn@7TH4
z1z+W|NidqZ4AkmbvqmQ>I$D@*+N@b#j*g6W^ZU=8^J{Qi@II<^(zCTczFhXVtp28>
zs;X)ze%97O^!hzrafa2!MMY<xK7IOP*SU82x{mwr{WEyV?-a7<ZI@nu-8(#7T%!Ek
z`j?CRq(J5Ly~^jZMn*<IzHQ%s_R7lOw+H4k`!k(8-|Ks@;^K4$d-It-<>4VA8%kaV
z&6+*?=KlKnL+)KWi=RI#+nt%4d-V0!ripB&z6qY(O&PO}y<WfHFEv$lb=cZPD_3@k
z$Jc!Hn}7a0zl7kN#S;DPypQ*8bqbtPd3u_z@&6yk?cG8{<0_v{osq4Pck^wTmzP(8
zg^Y}KS<l0ViL%OPjW_Ck_cnQ`m$mt(j=$~KDPO*P>A3!S>e}e-r)<C9QRZt`KK1|B
zbmg?omT$^-Kizm-Zt`OHeoz&fe7r9r$kQqH*_oL|UtR>heEoWIe%<HUO%J1@s%<$u
zc{jh@bq?gvsw%75=J{!tm-$YaKE3$E1IMLXw_bhr`Daer=9zo;*nrBoX*!WkQBhL)
zdp@#7Z_8P@-TY%mL}a97@v}1ze|&swVrts>Fz#1L5Hs_K-+%x7`@Vnq;>FF&=hw|z
z>OK9_-}m+Mf{H?&2}UzFMCh<IJ4QuE-`tulzIE%?nr}DLIlsRwv8w!X(S761oIT&~
zRmbcq@oZp@xoc}z+0dA%wfFbC-7@xdb1q#9+V}74`rv>7hpH;8i5@Nc_Sr>6M`z~b
zELppj*Y|SXiv35s#Xnzg=D&FF-nn_U)fY<l@++_Zze{eiCnHY}%hbk3#&7TLp00ks
zxBY6?(WH$EN*S}v5@*`!P48BpUo+{=o1Cod?99weM&)@06*gbhc{iNbmg>D%aOvdq
zlPN~MZ%^s!>R!2eRgi~GKRKpOVtVb=DaA7`zf5^`W##riyG4&4J^JT`yZxcO?VmrL
z*1vq^ipl}I2m6oRb_;3{6%+e(SpJ_uTE%@K-`Qrp^Z$KWt`o7LVf+2M*}HaG9eVho
zvWMa04t;AC))_Z*($3B@&AGQ{=AAotr1L*m743|%`Tb^dNNDKAJ9o}(%f0>L<;#!E
zrUw>Q-153*eI{$`r@8NI*kiBX+?2|F_wHTurSs>^kul4?b;S6*jdOm!{{CNA*Z=tO
zxPS41+lvpV{Y$l6HG9%>c@CD8=jY}I#l+Y=eEHls{oItdx3_nne?Iy1^Yf?Mc%_eI
zZRI+)ZpVkT#$Q1R%*@Q2%HG~;Q45NS($dw{ef0U~lEsUiofb}zv8f1<tA1m6^30h%
zi2*BDt_+Hd)U5vYM$q^2lQT1oKdsHL)t=^GCiH`?@Y(a@Q$8q5o_6mo-`?%E*k`5@
zYiQ`pSFawK@BayEgocEKY^eQR_UiTPm8(}jesXehh0VMjHiCZ3CqH_WBv=2Z@Y>qw
z_S<it9cX0Exw~sBzugZ9rHLnwAGpu(duQ9^4^dt1MO+`)r=Q-sY}vB3GlwtSzAY_o
zAgE|;JeieS?83Ec$99#z=3r~K`FbTd=f;LcN#nGFpPy2tq@*lrei*3x%~`N`G4uTM
z=3+Mm1<#}zi*>h7nIf{xf4*O4rl$9Fz0{wdp8CwSnmTWu+^biwR;*jMZ13J!;fa3_
z+)rK-q&nx2>~}6<!M3(G2`Q;X8#Wj`T<mBdky21FA;aWUE4MhPG4_7{f4k7o&?(cW
z2L}coTot<dL)G4xeKj-h-HZG6`?sW|q~rC{prD|FoiRSM&3ZM1mpv%jxgkQQq@*Mu
zHuh}x`n|_KK0f~O_usz<<Qv{f%<MIv@?P#cS8!<Q*}LWU=N2%Xh&bNWbpH9{{`x=4
zjSdUsEx6BYjanPIIqhuH#YL_<(c5|+JxbcNdGpCLXO5(8UbyPj4bf)-8b>~SFkoh8
z-m+!Og$oxBOjLHaD1OG%=y0HY<E($YHx9G>-1&&{8N)xx6)BJGy>GGnk(t40!*yr9
zhF9O+yzSO={XTvAbmH`BWo2dN_QQ=QQ>2=&-oEW!UT!Ye-|nEWz;*FO#s?N|W{>51
z^!a>l=yp{!%rvl>e^c19;iBP>hRYI;A?nALi;E@4Wd4+zV18@;ubqb6$K=gB9)`VR
z@Jp1qIKOD_i}Pz4%2qE;*u!>b@rF4PoQL>&-iIBr+0-m?f8~xA#=1-Oxj+6-{m0I5
zrT8Al#_5R+3=FCzt`Q|Ei6yC4$wjG&C8-QX28NcphDN%EMj?hKRtBb4Muyr3237_J
zv$&eRqG-s?PsvQH#I50VxRoaZ1A`mLhT{CRlJdl&R0hx7#Pn3(#PrPMYy~qtb3F@P
zO9dkXLla#CQ(Z$Ng+N0yg^ZGt0xNy}^73-MOpxkauxh>hqVzj$Zy6XE7$iU@hGdlH
zCRtgz<R_QrrskDcSp_7frxr69F8{w<A59I|PAjX7)XemZ5(Yy{BYuXWRt5$JaU^q~
zYQi&9N-{u7F0WDKU|?X7L{j3LnVVWtS&+&Ac9niXUb_9JFh4YNd_yvGQyC0R&CLu=
zElrIK^Kbr9Wnf_7M=~ckvnrLrz{zRKBD*&X3=CmNQlUYf3~8A;saE>>`nh=}Ir-`O
zX^CZ-$@zK3`iO|pH!w{yG&D~&Ni;XIG)+n~OR`L}Fi1@{GcZrFNV2d@)XPlH*DJ_N
Tm+6u^1`04wS3j3^P6<r_fG*jy

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon-precomposed.png b/browsepy/static/icon/apple-icon-precomposed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0adf90d9b504d8dbf2b9c5e0895f61e6a140f5e
GIT binary patch
literal 14168
zcmeAS@N?(olHy`uVBq!ia0y~yU^oE69Bd2>3_*8t*cliYSkfJR9T^xl_H+M9WMyDr
zU@Q)DcVbv~PUa;81A{`cN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-
z*%fHRz`($k<n8Xl@E-&h>|H*Yfq{Xuz$3Dlfr0M`2s2LA=96Y%FnQ?d;uunK>+Rl`
z!L!q6{r`QjO~t`O;oH?Wv*+HBxSg;&Q|P$g96zhR%P(K9d^Iz8|EifQS5_K+tuDSd
zXVqu-Gu@WK%d?iPN`F~WzOD1|<;N02`5*TsNavhM+I%C2sl|b5i}&-RXFo>>Sr~3~
z*i>m3>hCD>@VVoi`_((&z5W-s00cIe2C6=&v(&!6`ix8h`yU63i~Nf}<ZPK;V=wz*
z`hojuzr^n+{A2mUH^ZsJLDBPO4&#bOr3Ho;_y1rEW_xk-k6>8h+!ewF=ht3P{?!n$
zNZ#q;anBY85s^u4XXi1kJ(OS&5E$r~m#62p*zjWiX1zak_Ql1;U%r0bxM$Ct7smsC
zaH_;GWM*b=*|KFr_4mA@;$q>y7O#^sGdrulzcaM6TgUN0RrMj0fdtQ$YuAb%9AG?k
z>XZ;jMPef3)~LUidSkf!J$Eo%$uiB%%uGp3OWGI#l6G2rF~Ml&g$$F<I+51-9*0;N
z1h`r`*qT4pw;xVqYGi11Xeh9-{5CN}OH`_tZEaY0lx`CH!Gs9`9-QCyoKb0INcvc{
z*FuJG*|KFHDr}0Hy+s}tNX+$fFDo+(TRrv5moF~$E?k95nyd!)_UGT;-v0C1?EDS4
z->wMhyz9@^et5>&v~Tb4`)6mbR%!_ESR&GJ`Q?)B+o$XA`_a_d+38}>$6#q``QmHU
zs@1Dku36*r<*~*Q&QxWeMDNL0m^{ARv7hAPe^|t<?MY@L7Z<04V8fwlZUafEY2IBZ
zy6A!eS5J1hUg?pgT{{nHhig2_=HO5`b@^B0gI{_7vleqG?7YaBrXYWU*{HGPK!e7S
zxtl(P3VASmV4Bx)n)e2y^rE7_e@<141h7oddC?HFfaBtYwGFHne;9}DJI`>b;?{?y
zf{yJHs#iMh-IFi=+2ERx__SzU%x8{3pLH?DIlW5H0yUU!)P!`%*_1vtVq$eLy}%H{
zxU?hAUijjT$DRy|EuIeqFYtd^TVv0v!|bg+UH_u|HMhka37-v_z8=Uv@LK!6xI$Hh
z@}l<X%S@#M>w>xk!lVM2wkRy~@@vtkYRo?1`@nGh4h|8<9GOIyeC|c!`s`VayQZ#|
zxyZmR$oqfig_k8SO02d-=|-&$`<E{es@;50p>F?t2Ze_7&kw(jE#9@>t;dP&h>7<i
zt`#mFpA-xjc-F-z3+_L!-K^Bm>&%{_ELASKfj@(JR-??ki@TRES(0EN;o<2yQF^=I
za_9BelTD-yXZlF+uzji8`zLO19KVBtz=8MQAAha-ShaV@-Ml$|>fYYo6?^0U)Y;eV
zj~8n@{`lbg{#oCo1({Z`++#V`5Pd-Pft5j5gtd+`%fCyDIT9Y9VEU$1b;-8FE#K|T
z@A)@>czb!RShsH3nl(Lt{?vT>^y$R;^Xlg2;+t>w_$_x{8@4!Xb>Pa7PvHVrb(U(2
za0zm?a<DL2%=Jr4OWSZW=SGg%vE#=pzq}A+W@hf`??2w<;KVMXyv)10q40st2VN%;
z@6LY>j~kU5dLNcP_|KpvaCz>ft@l!lW@_l_F5R(X#-T$_U0q!oIyy@hEMQoDwd-ci
zu^hAHjS&Vjee^?&&ps{MxM4%X<(Eeu79?!GIb+V8l%k?Zot>N@OaJ^ZJbd`@#LH^3
zN=&JaE-Q?}>!wF*U$;%ryD0yydjUs6a)y&mQE=yt-0;;`C3x6;)P!%|yg6n1^v%W3
z{kG-b_lu2{6%`eo;j@glQepDREzkDv-Ld1ug$n|E_wK#3v$$Q_JnzGklfq(RVg);6
zD)z=XEfnb37Stc1zJ=*N<MM{xHobCtOEj2nNG$R23(54{eA6d3R@VOi&-0nNxl6Zg
z6PtXp<zmK>43ksEKhLV@>h{i>CFSMiWl`}#fv>&!-o3bWF*^?}^`0&vBa@PtsQAf!
z$;ylE2l5`66bK1ga;ZLh{O={m@F#8SuV!g#X)Rj0((~QR*RNi!ShMCxj+y;u`3cY7
z@wGR%wz5|K+O%Uw$Mx4!7u(eBpPyjhp&>G9u~Sfs$NKBZMl(;GIB_7yZ1Tj3jaRc&
zjg5on`K=7m;$dTEYi>Mq#;2>hTT?@0!J0Ka%a*BCRaNaMe$H3^?oMJ^Sy<H`kt0m@
z!h)Ws+<bcXxwizx&tl!A)WEBxs>-_grcY#~WcBxVPp9wyqw4GH`{c=!HC6cr5=S0?
zd{DN#aQ9suU0p+CW99SbbIqiKgM)qi{gb!fj*N?&w%8_az4-j|?gkPns;aDuFM4=+
zacOF5E?Ks0(&Wj`d3k!3m6cDPJ`D^Ca`N=#3|l?*%9W5FH|3QpSHAdKWg@lF?EJZN
zYSz}Xr%e-cb938K@lh!<GV;rpFA1A(Mnps?Nbod8oH18$+BucOFviWL-)0YsQvk~b
z#tajwuI}#2?{~{BYknA5m%mdnHlBRt$`#Z5_QuACA3RV1#rppG`3Da=9y@j{A}(%P
zb*1JJNe-4L9Q`71Co0)%P3>xJWwo?g61G}WMyBVM^@Z18mn>f%92Ddf8Y;@m%e&{>
zt?ZES@Z_yg;kMC%fr9V%{ni78(66trOG-*ET)fzLHm$oRnoTJvgkuhaopa8Lox*>&
z|1cC`JknSYQBsn%b=IRtNwa3pwygM|@cY}_#ryWnJ9FktsJ*eR?b!nd7;0;4ZEAi@
zm^e|;Qp(uW^ysHgzphW2q%g02;X=h<zkcng{cR?$7qei~rb)AANkJ-+DMuGvetF{5
zDJ5;~?w%f=qM{-VZSBWzZf*vp@1;vs1-NU4l^%&Yy-}}WEK&Z(J4wuyLBHe5k6t%r
zRaMn3Tep6E*e-wR-o3ty8B>zKFyw8Y{qtvKT6+4+moFbaI@%qxqoDEO!-w;)Jcw^O
zdel`+TpUyqFo<=x-ntdVCu8A|ovq#5+xz6nlL-?iI(l_^xSu+IUftSy_OWAbT-@A-
z5<E5)9~gGum6No}bx`@-m=V97LELkfLl}zy`;{!y-rn9nzpn3pHn;rV!ZmAhLLc+9
zFn#&<?b6MgCvR>}mz0u9s;iTme!BJi^dBYC%P)KS`|}?@e0YvkY1gk`Rrjjj+upi$
zYsH#1Q|>RnnsxH@>Bo=z?UyZF*m&OVch9+Ver#-PO8+gjKg^!GUhRR55~Kdh0G1C;
zPo6#d^srq%C?@92!^7<>SFW5WKAFMW+uNq<OULW$>x<vsGTpUn*NfM$Z-0^df1IP$
zNk?CQ^PW9tzI-tW4i2`E;d^&~zkhMDF)03a?1+f-Pf1VToPJ(zOO$Td>ZyHwe0lfx
z>GrZjxm0~WFUb8=KxyisZ<ps6BnPm3V9MAU<>l@D^KE{;x1S#$D=X`#|DS*VJ#+T#
z#oM<}?<{_9QTT|3nVEUVUC;e`EC(JI6nuLVxog+19fgnC%689XX6Flti_?4WwS3vK
zq6Y^U*Mw<{b+hijfBwJ$2EFOtztX!Jm2GT0%NRE%PBXcz=*pnqa4}=af&~qG_SkH>
z^`gJ1sA!VE{og5leSGik?ruN)up%riE$DI4&K;$%#r)^lJiN9xy5_?{_AT4DyT47G
zGJSgSn;V8cYQpuuF3-0pe&+Ke=?>4IrseF#leGFh1P^d8xR|kMnYDu0uGrYvl9G~w
zUtcn-s;iZ&k4*0i&^U7GlF;G9hgp~y#l*xU<mH#IUEBNi_IBn4*I#Su>OTGO@bIT&
zw|;(pzVv={vj<O(yUfuTw-%4dNqj3f6#Q727@s|V{_^eHr<eWhpRQiN?@-!iL5@9E
znqU0q*(9c=wJltzC?+O$;bqB`Y15KSq%LNdOqn|MV|V-?rpYH;4nKVG?(S|KJv}e`
zIL<x&H#EN~x(KKooSoXm@aV{!H#*bxVjtcA_x3)>+r`Dj>q8z-|4_B}%lGe}=l}mX
zzo)<d^Y{Ay->+P~dNTOHn>RV%-rw&({q)gff4hfgW*SelpU3`3-{tUpwlvQViqftO
z`W_l0htf7*ym;}Tczn&lr>CbUPd*-}dFY`*-uBrC4?6y-v)9zrl(8=B*<1ZR$w1;l
z*48J_pBKNlpg6}*U2l5#ym@jqa{L`Ki?|--9#Q<G?^$5ARjEN-L4d=+*7j^GxA>1Y
zo6rAvHamZb%*^n44hjc8d@$Jm|L^;cKWij-*rcSSJpBFLS6|(fd)ur}#<J=9>!VML
zj?Oc_(RxDk6?5L?1Fjn%@qA}GbLLFJ!$Yk9p2q)ceZT*I-D#7$&IE&wyLr!FuiyU+
z<nPKaF9NS@S-)x1r0@6Z=WoAXH+$2jO(*1i*`*r$8)Q5G$W9SVn7iU?meWFk;^N|(
z-*317`Pg6o<lEcZ`lU;ryK=BK_w@D_{`*tO#m)Wm#p3>qygar82?ha?ktaVsJ{}nn
zk&u<ub@ZsK)4~Z-g)U!m6PPNRB7}2x=}%N@C|wY=lB4~wj*d>j*H@wY{(SP@_w(88
z=Y9^=p`7i9KkaM3n4w~AJ$un2r4lPyw&q4=c0L0$vtt)72*k$52BmoPTO@vCGib3$
zG~0jk{5p<=xfM2YzkdJzdA<H`_`d)De(T=<q57xJJ~=sgjzu9;!~Vaw_fIW9W-7&-
zo144iZr-wG%aT5~eN(XMd<SaJa<(5XDJ?a$vO3i(Z9Zdm^~&?j$EOxp^qha5oRH9P
z?wp^LloY6v|M~N0!wHqU`|Iu7`Q_CFI1EfoRQ|3Iy}|j${f$U}?z3WTrV2l%Muy<v
zU>-icOP4PnK6A!rk-Vm6WK0aGUoctSKgnq3iBqR0@jn(37YF6GwDfdIdHLhdKMV4;
zhj#pJEU(CVusc&arHf&n@buG1cNRbY@Uvz|%)0QR$=Y$C;CgjM^V8?gE7z=9vSrJZ
zDN{r)UAlB*d%pblcXuCudwaX5ug_~?pm37z2ZqFx8R?VFPE0X)QT*up@0qh^CFSMu
z?Z2-t-x3(%Yao%5meyvRey-rr5l$ICb_JyjwaJ~=u7&l<SUOcz?fRlDb>v{xNn8Eg
z&GSM98xFNyynOj^czo^FSAU#qYi-^8<x+2N%iS1e(0d^8NMw_5=Iky85i_3o=Z}B*
zV6fbO{<8J!{p)OPZRhUVWp(S;tt9gkp9FRv5#<Qp$m<R=PLQvC<L$R|>}qGtHqYO*
zWs8f3h|}7z$+Kslwtl}yd3nhC1<nyi-@ETf&$j>>EYg4c@ZH_zJImfmF*7rN`uY6I
zm5^_5Zy!H5*ZSnCQ(ZRU6Wc7TH!uq>3H&?dx1Byn%bWy*6K7|eTULI0vWm4ZIa#^-
z`#V)#-?;C~l$JT(7G%#f+tRC*c)?fA)^=`F6H`%f@y4jNDJdxvrcG;$TkpR7^1`5%
zDbdB-Z=ZeiNXc)x@b0^M)<^d0JnvGTDD$jO&bI4nma3{M>(;2V-`?J?eB5jP;@!Jr
zFG~&u_b;q!Ir%}gW$mf91sn;@7c)#GdfkkSj82?8w`|FhmRq-?R;^m4p{c28Za)3Y
z8J|m+FJFB9bw!9))4>IM?k8-&J#*f?XCEIQ2PL5U_s{?MVNqOMY%$l*M((`##J-0m
zR+17D3wH00-qysfp{<>Ke_ySLsHmZ}wREOnaPx|_7kZT%rcYn9MyKq}je`rF+cWa=
zmhIUiv-qM$c;m#L993=Sil`TdvbF}r#OO#rtg?~2dFIuvt=XX5ZBy~#!BWeH$0b%j
z-|c>{p{qNURY8>X=H6;^V`Jl<o*s|<`)vjD&pD*@<Z*N{m~m{rd1jt%^^M)-`n${C
zE?T&-G57X1+spDLx+?nTBS1X>J-ubywoQxPo>%zyS83k;eRIDAFJ8J-bzR)vQy`7|
z>+RhZ3vP|_O-obL)z$s-{kuDtg6Knw*gk=VV&!?Bf(~;oW^H})<jI9ASB~V@eU`p;
z>z0OYY^;Ks2-m~UKR^7eVPRst`AEj))>f~jPKz%txco9@d-};tJ!R$Qxz^>Iil6(<
znmv2viWLsaFN2crpFcI1{5qG^HnQ`}8CY3)rKT>8`MqZ4O3!UwJr)ruZXvfN-2@#z
zDc@xK_bPn<BmMuM^jEG}aUf~qnxFStTUn1CJ0>A5eK>9N!xF2HzyG#4DVj+2=B%GL
zf4+ZarY0*ZYf4JWnqTFoPM-!9hAY;teF~~TKvmh(BGt7V3~X#{JBpriRaRCOZQQ?V
zmDZ`#rwwPHov7sJ?9=>Csn7qItSdvI)9R~1VPVHUK0a<)_C~_j*SF|rQ0K>wg};9N
zl8}*k^6~NU8#!i`hP(Id@iCB?l6!7zl<vxvD`%WdTN9?u%E~%r+O(kHVCURi-JLsk
zHhg%ZsiSiw#Ym8c?c&RlIX0C>*Y?@0oUlfzU&gZOYL@HTuw)Y{O@004>(=${E`RT}
z?sAaF78ya=uHCCd8ILed^>QsNG|b=kQ?35*^?F}t=jJ^Ncv+Zs#OSH1sqLuyYn6U}
z-qTZ4wQVXtrNsIbW@cuBI%4(z>u%k?otc-nY{7ztD_24+m)*N}ukU0^Qd(Nu`~Cmz
zGS6$@$T6#`uAVt}?$QMd9JYmM>g%VUpJ&U%$LGc5;W%Z6uB%VGSjT1#vqeHb`4_rM
zEc@qEbuh=Q_`w0jtgNgQ`P$ug{p#!Oudj=poOIZ;+iR(ksp-_@<9#2?>%W(WgonH9
z#w=gHd}qZ+rT<_2{~viizuvFB9F&G%m$gjuQnRi4(y?xxURzt+iL+-_wY9mM4=UKj
ztPRsUkiPwPvVWW^@56!_Q>KWNy}997SGRAD=&Gw(k#TX)E-m#wbN;+{ez<a<51*1w
z$fH?mYkL^<J))wda&vQKEQ?y+-rjz?*HD1t!;g>2`~H55_M2yO^6Ba6^()-@6xT5Q
z)xN)4aBsYp_DY6_1rq(on~y(EEGrXhKiqi!`QsZKlecW&e)=U#+UA+lrirz+w@XS&
zF5JIA{?ijrsY4G9{FYC?y*)oTIM_KZPENt;SZHWygpSzHKVP|6J8B!<kL-Naqtqbo
zu>5jhOw5^f`8o}0=Yy9oC*QC8ty}-&u)Ib2yO=lqRf5O=$8@y4kJxF$!I&Ws8fGN;
zlELlBy9_I(#GcMhPP_kqitpr^gBmY36#-(7etvwvzrRnfshM;0W~7>$+N5`Xnr^>+
zc5bdUbQI6w4d;_5PXZz$BrJKEPPlVC$k{XBS?~b&gvpbgi;Iodu3Z~=?L~2Mam?<r
z-unOF>zD7|ZT;=|o&(MgxE3wA!;q9Qy{ewm^pK?@dtm8Pg$qp^WUe=IXwS2)7Mp**
z{c2X~_jh+CdfgbLq@*go-!0!+@=|E?=FOhZeROAX`}p~}?aechTDflBvi<wx*To$U
zW|VmJSEh?0u3^_Mt3DY^CGkE6!TaxDy?V6yyxrq_d#fit+rZE-__bued(KCGrE>@V
zT{z^|-qCFD(!zY-MMmj7>x}vHpI=)W{pWlAfAgxn^K7fXF(}>Mv}#pXGdsVLwY7JB
zef=W)bs8$+drzM96cZDBGK;xt@4Q*Fq&|KAtjwC=rqgz|Lo@MCo3Sf{J>yIMufJZe
zzkKbQ+WU8GOpI#k>X!BYY-D9+C-&NR%y=}1{a=T`fzQvj|7g58bv3u*3<jkM6WCTf
zfA-9x@{@|Hs_K>N*H2Ge*we$qCu?<Nv3tLSjEv8!y^NW@pnl?w8xo<Rp)bBx@vt#p
zy?S-i>?2%3v5#VoXb5aCZJ5OOSNOu~uUD>Ky?En>gy^x^^XEUmvNAYkXA$f2%aS)A
zJQIBC{GTD_$@1z%D}m6P_Rc*j-U{cm?d$%`m~Eba>FQNgd3zsk@8tLQ_L`WPO`11P
zuRU!t=Sg*ss1@E!6U2^9l($xrnI(GuxB7kcPeK!B&GITPHa0aiE$VWzkeSBcWMA<?
zp~$*k@L}19|B5pFbN+mZC==KiXVEWkMMZ$C{cy$JxOaDU9xlIMtKM&uwN+~KO`p<I
z)30B@ep0fXx#4DxP0f!0v4$<P=gpm~n|^%V1SXM%910(2_^5q*clY$R+}lsCFVQ*s
z?p@xp<;#`t|C0!mer<I~$VQGwc@4{ZB{$ZOk3JYo*NaW6s<Jw@ZRw&#O}5qFT;!}g
zrIzpnWKLWcw9-JT7c_uuHe1<U_vMZys`I{wvwRTV5TRpYX6AM_xV^1yN7>t`Cv1H#
z;vY-}c}@M!Fx+Rby~Hio->&XI@51%#>ht$7O)TD@eSKYN>Y_X`zV_yi9}EBd%ZQKZ
zKI)X1n3!VKX~LAU?z5PEhf+gn(#8l4eSLLxb#<-l=@}Uv(&l+CdNqGLOzu^8Xa?+g
zJi+fs)gtl0qK*KKBZm$#mA}82T2m8KmmC%*cJ=Djl(aOrt9pKH)22_~cr#~p&`x7x
zV@(~MDcvQ?ZVgUT1Qj+udHy^&I$Hbq?T0Vd<>%+;KUue${o)Vy%8ix(H-AucTHM@m
zQGvnVe1@C5`%`l%9=1=PKWl1ebX2`daagt1%-&u;G~Q9j!9{(s^BeYvN0s%i46jx6
z_4`+?(yDZn<Y5D~<CBt_R<2xmV&`|Gq+iCH8vBKvTHLF{-nHL;yKMV*^DGty#ip(<
zF3WC{nIC@E`1ty|&dr&;%t27O;fY+jTHo6+!2?z&PoC^7GWq<orYNhpCv}nZMT7Y{
zAC!9)-K5Mr<gTV|PTYJmMP5!IlkN7lTxDx(>x=RawN!4O^kAIfqgGT@r1V;UwZQ8J
z6PLb_m|N>Wp}I9nQ&V$dwc7gYr!QOx$a$jPa^r=Ro5bEcmB}3?T>Lh=N#@4JhrfK;
zVzYL_xqDG-uesE>tma^0I&<!v+uK>omo81*7!h_g(aq%Fj$WoNhHIW_Y0F~%vdrsa
zD60;!{;pJ(Bb#$Tu}>mRz^VJx`fa!0+SL7t;L~5WWJy3sh|2Og>cW>yj4s(<$uLO*
zr6dMUPliIzr{O`0^Mqes3378|Te)&&k;&2LpA8KS1*QMZVL#Sc{OX<Y2c=hU^%Trb
znJAPkRaaMk`eBjZa%FS#^0UcPJJWO-C3xCy)G}}?7m73(G1;hRZJo7djgF66aEM0W
ztm5MllPv_8Zme09-_0R-Vqw_w%aU6amtD-*5VdxO&oY+!NvkKa2uN~WeOWTYXIbcR
zuRxXw5?i8lBO@ax&imFN&~P`e|Lm`ljXOgxFn6q+Fel-8(asrj=T3EJ(9~73wXI!S
zS?Uz&&7e@U?%IvL)0R0D&fKfPRN-eL#j7?sGt>^$XQ->Q`*!83((H(*DNpT+wZF3-
zVGB;liM7hmmn>4f+!kRVF{PJL>0;K_B}<nc?PID6+m!IQFyEEod}q|!V+jUpq$V{V
zT=3?FK%?}=pIalRZg$rGK6!V*`s>o7Y*R11ERpCvwnX^ArAwDq6<@lvOFK!Q;Yizz
zc@{g}K>ex^t*f(`I9Qlge~J(&u76qaI87jG=lnkkjSdX!ukT*Q@TICYXsKKK;lw|6
z|5xqG)|$#S*H7F!HCWkY0Y`%IM81PZxDGu3yted$i_n2I*&|a~6t*kuzu$lTb!@3v
z#HMJUWr7Yu4rere=`dz=Cf{WMIofNf)B5Y~N0&M;ys-Js%)cESXVQ8Z9!~vzQn}&&
z`}of{m%Ms=(t>G?D#O|^X>A7HB=-ox18JMCaVYFGTmNu}fJ2T??lTSnRfbHiFI;^L
zQd2Z9JX2oFsN~*|{&f=vW6m=v1)nog4?-mwRk(k0h%l-&ZEbs;VBn!35RuKoq2#h5
zQrV&6X<bov{k6@RCQ@6Xaxe8VEDXq)8ll?$Mq=Zta6MOs*}h9!EjuzNx-E`eZMd@I
zvHVNRi!S%xN1hksYE2Qom*Tjoxxe;WI)}24jJ236!+B2)ktkE2?5(%bbG0%%A3MFZ
zoUlgZ>CQu&=lN>wpOV8Ak-Smczc-0Rz{Th5qfgwR1fU{6`^1d>TNcD5+pTr}aXshS
z^VLy1?_d7he167j?}rytK5<NX_UpWm!<l~#N)0XoT&*9f_69Ot$S^tIwc<$W_D_}*
zazvgAI^6ouRcn@6I44K>fYe2~Lk|ra9ULSXCoyKSbiC<ZvbWLHjX`&jV;(5L8q$0H
z>;-muN!XjQc6IU{H9fF^<AG&lHVebW%j*g=oM$oRKI2G;*tz~s3|n*JS;2(0e;Zvs
zB?m7sWm(X}FuV83J~3^E%w`=n&E&$(pZcz9f1ey2I)5u$MOa^e(nKNN<Vp89+7JJz
z*>~f-&AQn=puV<dvf;I~7%eYB<))C9+T&@Q4&4Slljg2payfhA-c=@Ds<$~5rdD+M
zn)0_g>FDVl<2uk?aG=9`*;=KB=Psvy$7`q8_BI<ya>V~XYgM$$HKOgr@x4B3!eOgJ
z=gn(9oH%Xz^y@y>ekM_C#k!AfI<@oM>#v)3?2xc#{UqQ%Ulo+rp2R#Ta@{@ab&1uc
z&6|_^rDh4L`Ryvb^T^f1F{1snmXE)G|0dDOYoFDbFKI|=GOYX_@4V)8$LI5fmN`o}
z9#~HNr=T}oTdQZq<(C>dIz4OI=eWA4PUlrieOedzJVjTG`{&P}MW5mn1QOEH)G}E?
zL(Wg5o`0<>w3@s69ESqmUk^40{T`);(g)vv&zwI$Jugr1RQ~cEJ7%m|qjCKmPfLF)
zoAiFZ6AWG*GyXS!VAj>sn<hSO($6bW&-QY<OED_3ZrHQu%%MYvqPj~nSprxlaJ(tA
z_Mc}nvHjVUDI%v%ow`;Ovsr=5YRUTde6Q8`SGc*%OSxwBq3Y8U&!B63*D_2Zbf&Ff
z{*bp_dimv@TFz4}<jq4_Hu$|MvtGP-@g{~ZRkos{qEDVaJ$md;aATAU^IeZF0oN}*
zAGREDiHn;TQ_ejvY~swhbA7+K@8Fv2=U!K5m$o^wPWRf?q*jF_mIxQlX0^7LFEiWP
z+MX1w@LRrk!GeZEhYm$3FAsT8>QcD9*Qr|~RVq@jA#VNhRjaxV9Xhl^V8!jXX(=fx
z*AD7wUU>agL`1}8X4z4xYQ;r%L79=M@(O`Ietws(Ul)IxxEL~<vuv4~(X_d2Zy2@A
zUIdzS+^AO#IO?S|=VC_6?{9BK#KqnB-h5eNWMeaDN;artv{Pl$5h<n#uXK-m6%Sz9
z;3vb!?(FP*=KT576BVX<xmH$M?k;=V6?5XHz{CYrF3P??J<V&(+*%GSdD$=Jl6-4#
zwfWPhPXo`}*x2;k&5PGwH7TISP5I`{n@g51b$uIUEyJg#rlxdwL0yYrL5%iW4W<Zn
zx&HQ(Cq3QV-4{D`rKYC7xw)CW`>4`d){u_O3)vl$mVGpN8lwE@Up`~$rEX14%_q;F
zZ?66QZN(?w<mBX%^78e!j(D@_h<Q)Bx#5VEasz)ViwB>WxcJV($865d&Y!Y>{`|S;
z->=t!3y+JIG3|E|spuA0J96TZ+Yzb78#YW>woL8Q=g*6u{SW%NZ0XYZQFBWlcko_s
zx=}oH{`})<n_c@NE{S+ZG75o)Tf*1J^{z?L%kTL6Cf$DVBBiWb^Euxz^(l(2*6$KC
z{Q6TgsaDZ{&g<8&D_^hO4jNAL-oEQ@o}68cM|t^ot@meB6wJ-1pE`AFMVEEiZrR;;
z`)<GOI}>?pf@woi|3Be^-FLry`Eud<_4dmzr*sFTr=%48_>k!4<|ZL0*XLt(+TA2V
zbK>c?j`a2FlNLID`SbKZ^#T2enPHhGQbxwcpz)C3-``Jv{L*fI|HFrgzkdIgl$ZBk
z#bVLf)WnpPmGy*m!}ZsxDJd;8XU@Fw{Hv18_Njsj7h9YZpFMlFqx`+x_Po23o?lzJ
za;1r>>BU>Oq`tblez|0NAiwc{Z-n@o?HTJ?Gg$xmKX7*W)y(Gd=r(8!CpTABUEO`&
zKa073R@T-p-@WrYb!>gm$`j|$_pjRd>}!>zghWD7k<que-5s+|pR2HIHe&k2vSe{p
z`MWy{7cXvp^(w1U#KYeoG$McVW@O#>-S-V`Y<T?7zqzI)b}Z7t+@Pf+=M1BFN1$R$
z#tk=@{(RS*vQXt^LAo7hO+`5_UcG+(^Fem`55HcoKYcR4ZvXs^8x7CRwH7xG^%h$a
zsBLdQ|I8Vm$SrdH?Tw9$%a$!uy8q7Uic_&b`te*>2K@sUE(kn7KmYmK?e~;GbCp#l
zCME)W?UGVbN)kLqhK7o|&w>OLFLEuAeG$F$m|)qf?hgA6d>4Og7VN&mc7$V+^4(~o
zSF6^qe|}=3@|LYz14BYo>~CMWB4VC*2Q=#Mx%0R7+XdnxA}+2Cck;}eo11UsY&)^t
zU-{I*W3_^dIUcZn`2ClMpTGFg5ze6C;LO}y)+3DlU0q!NKFa@}xMq!x-S0P>ZwRf@
zI<o6P&kfygAFtfd+VknZsm<1KL!rW3+%C+k)~<c3|L>9hkFV?NWkdg&$nX_EJtg|@
z$8mcjW8=v$`ZIld+?0EJdsmyiiO~~xc6JV&`cClcwI@yuA6*0wa0~FY7h1@al$A}I
zJ{?prsj8|LCAPo4z5Vm+`2SMfM-Tn{{QTv+cYSYqw|2zU-8Jp@^76{a%X@ZVq4SpQ
z+k?ZtncP0~_~V7ES6$Q7)yv=A@jP{cpM%lF)O2I+ZL^<SfBvj=b9bLPdv^ET4YQek
z1+q-2sn{F$>({Rz-)`rFrpVrIzd!Bshv1-~jLgi1Yu5BETBNjT^X8q!&-wh83va*O
zd;Iawz{y%$qkO%*xY(K-w`?)lv}sdDX6C~e7Z-yjhC*w<RM>!KDfRdLXzCW%KlW{r
zXLH!<qgh)wB_HSG;+mJ&-_zfJ`R-lW-SL7BE%xmlD;mYNr+a>B|G28)^E2N+b@pt{
zjpp|%l(X#SO`d#sWAgEg+}zZHf(g>*c^58U22IpHe*9QRPj6kNN9?J|`ntMHmo00%
z9$!EA*|Rh)Ev*wLPez7*$V*6Q5LWm5@ZA3Y%!v~xy40(jKa#XDAUN3B(b4e=+l>z&
z49xTI^@uo3ST1U=exqShFlh4U(Ichu_xGOe|Mz-7sCR#1q4Sk1S5BmD30p0?`l?r9
zp&_UoyuF=&_Sv?>4=21%_DtJ0DKI1}ODk=&<m#(lb#-=2moCk@y)F0Z&B*@ahe0cV
zKF|MuW@Yel2}#Mw(hB>T8hUzZ*Vo0)IGbkKY9qj5U}Gb*JMlTA9E0+aD~^5QT?~&-
zJbI)gD=TX;*KgXiX%<CKI8swn1E1O%8yVf$S*&hd{%%VBxyK(*v|nvLs36trHt*As
zs8*LpU#lV`A{Ol5KmWY_|2chqe7}DE68dZSM<HwLtXHqHzP-Dv%^hjA&eF!_%;V$z
z%KQg)7_SRnp3mzj=r9K~ol#zHY-{Tq9xncV-)}w87#=GtYqn$t<B53|8_!*~fAaAC
z*D6UVsYhR4UIxvs{{H@6J#~k%(8+&G_U)UuY?+#6&YnGc&b+<7T~bc2&z5l;%N?dR
z^H(!P7;~Ugryh1!uUx+DoSdv28X5`;Az#Bk5zXv|K|Ve{1|}v)9z0mENBHjT+q0*%
z-%U1@>V0!(=j67wwiQQzfBIxJT|Yi8Awl8Qb=Nb0<(1Ac<bwv3C%k-_d2Wv7;j62|
zSFT^beCN)YcXyYAhP?dz_}mr;nzi<R{WQJi<5I0D-rn9mzP=wH9AwVBv*X~}=<SRA
zmhI)4aW?JN?b|EYub&?O`S;%&Ic9nH_M8L-&V4)PFG`=5{dv9n^5?}I3E&Fg+czUC
zt5fFpYn-#Pw07>?DIz8|Y4&Vw>Fk#!R#&pNzIph*Xy=UCvk#|jHng-n`Q?jA-uBr`
zmo7DpeKl$BoH;Ue-!{(=jE&XZZ)R+Kc&>H1gp^d5?fMTKJGy4D<w|rhm@#VV-h5kj
z`tz4|e)*)05hqTZP|(%oZ9b^b&lI$7;*}fXVqy^y5fP^qA1+<EWJycy?{9%|adN5k
zMiv$)b{0RMF?Vin4D(L`O{H+bmx|JDN)0RzzyF>&bEfC5kk$&tt3Rv$e!Xs4^rYj>
ze3hBJ_ji}~pPsJo{_S6#%cI-1F8|KA&3hPfX`!f@$kr&|urRUeZ*LwxxBtI$Pv!Hk
zRh3^}2!4New|mn}$0gSDojDQ?^BZU@Hymo4G;P{3>HIy8-rn9*DsMb`q%?Q#+>+AL
zqw7+iHGb~UywJ9|hk;Al&C82RRaJG*_j}cEZfta}i?#Z?_1LkyMoAy5r3?L%4hOO<
z*pMh9BC?_Wf8DIvvlmzWpEyzQ+<bfg`g;5B?!fFjaSx(hI7)&8SU$}0_-V7T(t>OC
zM84N=?(Uxc_;`PCP>|B{CYEN$clY+5UKzZ6!_AzaC+a;f{_YlFy0M{meZ&;g1I3H3
zzh1d+U0P;l=kb2|^`Sc)6Iu7h`Nzh}=I{L~_V(@DPd778&i`_1s&>rYDpR9Rk6mRd
zcD7k)?aGv2qtx(R#ng1_^|)%@%{O(9ubX@^%|P<R*|SgA|9iFm$ua%61=ccrp!rC>
z*j*yom5&(yNl*N-ZROrBP&?o2Nmg#|)2-LzlGD=Kc9*|Db}n(dO=@at(fRnOC@u4U
zJ9k=wRua5;kx)=zP;@z4u<+JvCWBo!&#&fqV9D8jn5EhA)TvV%IyxySDJ=cRo&Ej!
z>-O7g=DM2+pA>(2ppm)e%SHE1S3AG#w5|Bi5WL*4@cX;FCng%Vc$C`p3mjaQ{za21
zLj7REgg0+;>VDt8FT}wzWA^OioSdA{pI6qlolJRj*8KjHA0HpfSQI$uNlEaq&73(C
zG>2XD^Xc@7$4!>DzGr<9++uoW*<y}_xh+nLTcUJtZ_9oB_xpWy37$_spU?mN;^Jam
zZKjh`-+@+EEM2O4>iPYL1s}d%kH38L=E)m3BA)c?GTvVs!+-NY&v|(#!2{eEu3T}c
zs<P6X-rd*77s(QxYNaCC`1aP;?)ZP7rps8Bbj*>txvS&n&q`2kTt2_<)Z5$JmFur`
z-}vy0X~#h}+434W5ym|XT2s3=Z8G}zQ2rld_t8V@^J|1=U;pGadD^sN|Nj2|c{ac9
z@WsXMi}`l4G&`P~YkmBE-S^#F*W7Fu{P=G*$K};63ppOJ8cOh7xpL*hL3a5C7c+kR
zdcD5#!vn{lsENlXH#IRuMMqoK{jp%@m+LWl76lp3pJP$jbb7kJvAMarYpqj9%69Jq
z;T>zvx15s}WjxXuySwb<Q9~X!=I`(C*N4qKKV53BpL<xCSZ;3aAJF{J+U@tcR!!Wq
zV~0n6zCL)6z4)0=%C2&Wjfbn5UpRdE$EhE_m_wmYL{#*ndHrW|klU_?#~1$k@^Xoe
z_pji<l_4VH;-5brmoNVEBCzb;9m%Z^c-s%(*;6^${_jiwIhMt0*B(Z0viMmqIB|Z9
zd0haDK==|N*WBFPCCip2ZH@Z*@Avzi_5bTGU40g%KXc~HO|p+?=kN23jg6gRIQ{g~
zM~{wngFJZdoZqqI$Cc}!D=d2cU$}tPL+UpdXrajc_tX2WmMvR$idV_re*X4*Ro#ys
zB^4DH8%p)|^z}U|u=r5%C@+6!;))QhOP4R7JbO0vc%Q6{echb$`?ccTN0n~RY(Jd%
z?D_MZwZF~&f0X}!u$5bU#*7&qf70)CoL#qGFmV2o%s&e_9<)Zp#4Opre}1>PKB&FG
zCu^m0d#=a3vpaY0l(8si`2TbM|Am`3Pp<y{Zm-B|rj;MJZ`tzUob~$)_wJqBmV4V^
z_SwMR`pnGE%gg;g|Gxi!-fZ*yV^zYf0_*brGtF^}IG`TNmUxNFVH1m|7*iv|!T=4e
zWAa?BGiJ^N85+Gk&(Pl9zq)#NjOo1$lOz+VlV{ExNihlx3_RE?Z4PRU^UK@$+)CNi
z)WjquEe&ehpFMjPyy`0~%uV#(=L#FpDxuBk=Zjul(Oeg|x9jl3jz2Xu2Yer}Bwe)j
znsny3vZohghKbarOP5ZZJ9q5)XV;%kRhkMcbY@?46Dz)uVe+HKPR_38#FZ-|#>U1i
zPKw{&-Sv)(lgrG^+$8Yr%}wXnSXo_N-J0)r%VYM{%-pxn?%DI_kufnx-j=EB?2TG}
zdE&HbZ6{L>Wo-q`XWpxL%*!Wh<&v0~c;&e~WN<bip}{!)+=r9u^9>9PHiWr;uXE`-
zoZb;pf627YBZv{So-H)==<WRdy?68e2Oi(jt0uygxH00!#^m-lSqh4#eA{oI1uc7+
zIrHI%hllt4|M&aNy}i-rIw#hx|Mjb?tE;Qx{od~qQc{mDE%lDsS=4&(Ufi3q-^;oo
zlTA9}H*W8(Ha~jw=%!Tfoae^o=EqkCF9*$Ggs+Q9EGsiJV@;9V!TiVmfa|0kADt(0
zDJUy9x3#eu85tGqzRM}@U?JnS{`%zU)7!6R#eV&-sxQC%^2xo`-#=9C_3`z+c=ztv
zdwZ*I?yIf7l96B{b@KG-#XEM)Xli0Adwc8Xix(Qg!oog&enxh7=bk)KDcdbO{j})z
zl?&V!A57YKVp&XUYpaNeNI+1KQ);T})vH&hOr5$`D~k8ffmO?ww`+&511*pNO+|e9
zvdZ_4r_191#!82aU%AU`9aLG$&;wpDH)YBcm0y9^d^JQC?cYED;lsq6`#!w5xHu#{
zeDc((u2E65_5_&C^Z|9{u3S;ER<W=7F@c?5?!x{1=N}*MpE++{T3#OC`s>~I->XaT
z2=TCSwjcg9%Oxsgb%<7o*3>t~tHM@a%-Z^*#Oh1c-k7O-7cFYqwae<&>(`q4`u$o#
z;+^2dJ&BudzIgfa;gyxaph98W9pR26+c=MOt~=l8XSQJ8b+-vqm?}gkWPPdobW$CZ
zh??2?FWtL$?%mzpC(oXZP3>EKHS6TblZwj9&A)zC?W_VVYbh)g+<jNCJ25kpv;TPW
z_18yVe?7JBRn*!rxx_D3d-wF6I(znL*49bjwGhV>3{FgsTOYsq<L??fH#awn>Tf#t
zYro5We}Dftcs4v)x}M?TqXMRjAKWAAd7rdQEMRN_4a3^Y^{Z#Tj<n_8e!KVj>)N!4
z%dfv0+1mEr%{%_Ez`(-dL@T%WinVK(Zre6()v8r1gdC&RhON`zc5UyHUCeU*?ECNQ
zOF#E&HC<BVWi{9D-B({VVM$5Jz_OO}hn{~nw6Z#N-~a=^yj@B{Lc_avd2%)t4R`bU
zYpXdbm}>avIOY`aPD)8UC$IdFX@bn5b@BV<Uh~cQ;!&xeos(B7XuDW2fW6s~jh$Um
zMrO(8&6984ii(Pg%E--Kx^W|@SJ>mG%+~DqZf~;q{Gju4`b`HF;?{@1tC%)@`pg+K
z9y~icJ7!l&=el*Esqkx7j~_Tc`O>5Ksj{x$;>5f^|K4P8xcSkQ`9nSP|LI?v!d6es
zezR`t53jVQg9~yhq%Q}s30&-#?Fd?NQNHP*LsgZPq@-j@YHDC$pkr;V?bokgO-xKS
z<lZ*BbosKm&L3$Wwn7UT9$wy)uY1|~<qT|W&fK{(CuUP-@3HspM?U*2R{g!*F*kPQ
zf$!e#hgd&!eKJ+Lzn3NO$u7CT4^f-1&EC9elZKYoq754+ELx;wc`L<i_DS&a;bgPf
zhBJMNOeHf5XHS~c<hIyxZJ00z3uIZv&)-j<rpD-r`z;SHn>i0WLStxZs_H&ZO-(H#
zqGFkBzqI13-5qDwMt2<9_C&{dC!dfZtJj-#*Pa>l-T3=Okt=aOqY1OCgViFl4KaVR
z^YZ$3?zF6`s$vjacjn9)6?OIYJ$r0+vK5w<ZPQ`OG|V=U^7Qm{TpDz8r{|?ZH{O;R
z+uNUi^G3&Pwr}1SV`F0rnLhbj#T<&8%*6$N{#NebIp^oH{(q6E+7CvdeQXu3fr{4{
z%pT}0y7+`?JtKQVbH~Ml8?Nzt2a8NUeRQ(A{}b1>VXJ$&3cVElHUDU~x+ouBd@vy(
zPRBc3LEy(mUUT(D$M^Tlc>Z1KQ^m8&Rw?_Oy8JcF_n7bbe$n4|aL)70Pt#4z!x&o~
zcmudYlw1NjBqTpIY$?63X{V!LwpLA``?lf{$FGh@Zr)vT>OqhCY+VM?344q7p0W@y
zldrqh*S@-;W`Wd3yNrmR`&bm2Y!_|5py-zQ^7s5*s&Y}4V)jWXllFc8P|{`G@#5us
zWvRcbizhv2_c&4$bJ|#}dA-2Fsju73nzwYc<;Cp0)F87!<VKr>pwjx71BZUO3OM=1
zE)xtkdik1V(ZYTusozFU0;fAN&v{E;jnt1$bo^zskad%Q@{-D@r#gN}Sz2XOT3LBy
z?-cN_{=twW_|9>OmW5!j?DJDk9XbyFd))u^)gq1uPY*W;IG#Ec&g{f;>Co-=7YA(x
zuX|6NHi1KganGC;g7wy+N4_ga?J8-#p>$b-6$Dzpe*VwA`xsOHNfrww1_lPz64!{5
zl*E!$tK_28#FA77BLhQAT|*;XL!%Hw6DtE#D<eZ~0|P4qgIQcnUr{vV=BH$)RpQq0
zI^4>Wfq}sdWJ7U&T1k0gQ7VIHZen_>Z(@38a<+n*p1GcduBC#JfuV`6fvK*ckwT!M
znL<WMNr9EVetCJhUM5I&E?Bi*eo^|Jwzmun3=9$=6GJjebCayBT=J7kb5rw5tgHeO
z(^HEX4441kt&gS#Y^Rk~MrvkyMhSzVkp+*UQvd@4gE*2oP&MJ1DJ2;oB^P=H?=mnj
zNFpim&CE?LsVqok0J}=RATQm1Q<xu`Ildv8xv30>rsigbrk18ghWR)Ds4_4x@FSTM
zoLQC1VBq95Ws%(*1_lNPB&pCKPlmM2oK!1)ef^T$0{yhavdrZCykdO=(<DPf^Hh^W
qb0bUBq%^Z6%QOpv)MPUQ^Aw9D3(Ld_??s-0g2vO;&t;ucLK6Vhn&1-v

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/apple-icon.png b/browsepy/static/icon/apple-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0adf90d9b504d8dbf2b9c5e0895f61e6a140f5e
GIT binary patch
literal 14168
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/favicon-16x16.png b/browsepy/static/icon/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..742da968b1855e29f1eabad972ef0db1ecce1395
GIT binary patch
literal 1340
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*TmUKs7M+SzC{oH>NSs54@
z7>k44ofy`glX=O&z@U)q5#-CjP^HGe(9pub@QZ<gq2UDsL#Y7+!>a@a2CEqi4B`cI
zb_LonFff(}_=LDJFfjc8|DT74M?yk^i;K(B(vpdZNk&E{GBUEKr>D8OxwN#@)YO!d
zlarmDorQ(P*w{EJDJd~AF*!LoC@6@Rmp3jhE-x=nO-(H}Ha0OaQCnL(DJe-sMMX(T
z$-uxsQBjeJi76u^BQ`cRH8nLpJ|049X=$aWr>m){#l^)jFfiog<Rm92r-Ff+np$LJ
zq^m2)ZLzVjp`oE}Zf=Q*iMqPF{{H@cetz-s@#f~{p`oGP-rmW{$yQcYIXO9Tad8$F
z7H)2Ck&%&UX=yAhEXm2quCA_OVPSrLe!;=P9UUF%>FH@{X?}iw3=9l%a&qqO?mj*~
zzP`RDCMH^1T47;fadB~>p`k`bMxmjh8X6jghK3dv77Ppw?Ck8UtgJ;vMGg)QTwGi%
zEG)ddyi80?e0+T3;^LZ`n*99yPEJljLPCs;jCOW*Y;0`a-rnx+?*9J%Zf<Vo=H@CY
zDz2`sA|fJLSy})8|9{5u(wl*SA+{vQ4-}^i$e{kxx$}p0=6p1p^U>^sqn4d6_s{b$
zzrNaJal>Q{=i|Mf-kSbNWuNyi{*zTn(RcTztTnNhet7-+dr9hN&YXY${{DF1%;i~G
zUQwJhYs)O3&N~-off7lQx4R4De<s~~3=9mM1s;*b3=DinK$vl=HlH*D1H%bV7sn8Z
z%gG4|A_5{pVuGnj4UBFZZ|tZj<V<U6NO4M<G{t0AL(iHydzzHEog6$PT|<3in+4S-
z%$YQ6+PsOYRvzUNJ#psLxs$#=XD(k$Z01mT_Ttsc=jv$^5}TY^xO#egeYk~%&z`YV
zU~(0kCKGnFv-9Y+IRcF(($RXmCmlHwRGqg%GL^5-udwswIX#<zMw9UEpUxcND(8=z
z5Z@4`^;uY0c(u)52fgGk>%M*b`gy&MJ~s!?BW6yP_LjC*cNaI;<1;=O8!#}O=QHUG
zxc+)A0|SF<iEBhjN@7W>RdP{kVo554k%6J5uAz~xp;3sTiIst=m64&gfq|8Q!7Q$(
zuP7RF^HVa@DsgLg9d6~xz`)=JvY|LXt)x7$D3!r8H!(fcH!(dkIa|R@&s@(!*HXdA
zz|ch3z*N`JNFmVBOd+GBq`*pFzr4I$FB7CX7pz(@zbO4q+gng7kN}w&l2MwQWM$=&
zpIn-onpa|F6_A*oTFhX${Qqu!1_lOXHDEiftTIwF(=$pK3@wfL8H!pN7#PHn%z>&2
z&rB)F04ce=Mv;Sofk6^UiEn0ZYDr~5Dg)S6`UQFE_M5^$`2^V<-;m7QR0cy+b2CFz
zOH(7m{F{GN85kJ&k<1CstV(4taB`Zm$nFgT149^+RA`VVLt17|s+GRJer{e#PJX(6
zT4Gsda(-U1J|bfD4NQ{^4b4+c63vY)O_S2hk}T6K3{sQL49rt3k}NC}^)i$5^$POR
TWxAw}fdb6a)z4*}Q$iB}lPsd6

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/favicon-32x32.png b/browsepy/static/icon/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..e82936ed5841b91c4e7c4b690eed48429b03cca2
GIT binary patch
literal 1964
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
IIVCg!03MN)SO5S3

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/favicon-96x96.png b/browsepy/static/icon/favicon-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bed499c3bce1f97511cdf11a5c52ce1155b11c4
GIT binary patch
literal 6313
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/favicon.ico b/browsepy/static/icon/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b2722282ba237bc020e87019e57ffea5850dbf23
GIT binary patch
literal 1150
zcmZQzU}Ruq5D);-3Je)63=Con3=A3!3=9Gc3=9ek5OD?&U}0c5%m=|BE)4(w|DQot
zR@T$a&8^bg+q>M`+q=Tp*tl3rODicXENoV6Z0wfM(9l_ihKAk@3=Hhd%*-&YU>c-9
zG&FQhR#w)3UtiyU!NI}*IyyT3rl+U>bai$8Z*Fe>-_6bKe|mcQ2R}c*W(EcZE_QZy
zuwD=W(jOZeJJ-U(;y(ie!+#bQmj57qLPA1dK1d9Ng@uLxCnqO^%*+Al0qF%{5IZI&
zW-iDckU9|N;^G3?`7bIe>Mux~iHQkpmWqnX|FpEUOU%s7QXCu{Angp;^n=`+l9IB<
z($X?EH#hf^y1F`8KgezI@$o;*&CNZHjEu1AhpPE*W@hGAUtiA<8XDT<?(PoO4|1Eo
zzyE)4Z||(4q9UyN+1S|rCnO|%*3r?i3J(uw@b~vG@$vD2>j$y@{rw9&Iy$iGXJlmj
z9~Bk#$JNy}m4ShQEiNu@o}HZ?Tz_b2=s#Ci*Z8ooFs%APZq(G&{GXGP^CTrDWp8R~
z>L*xS@bdEhPfbmItE#GMA}uYARX-@K`S|$$i;Ii@2bsgq&kwiT$;s(|TwL5*1_lOB
zMn*=g`dL|7{}&Y%{daJ1_z#LlW@hI9AbUal^z`(bAiK@Y&B1y>1bX~|!Y?Bu<7aGa
z?D@2`w3qSm@n2I@Q(wo&$8XZo(y{=l2kC=h5Fa`Hu(PxOPfSewsI08)sHmu@Wnf@n
zr=Xyq%f!UQ&B@6L(*~z;>DScMG!qpSg{#BG0O<#%|IpCT|DbecU|{e+FE8(-s;Vl{
z`i+f^>ywg_E+r-=o=;9rJ|7embeM;SM~91x3zxNE@dNA(3<sE@n2~|u00=iSFdP73
S5F3U;YCvlF85j=yM_>TbWJUY{

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/ms-icon-144x144.png b/browsepy/static/icon/ms-icon-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb24422d9ac18370f3a878c3f20845ae27737c7d
GIT binary patch
literal 10616
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/ms-icon-150x150.png b/browsepy/static/icon/ms-icon-150x150.png
new file mode 100644
index 0000000000000000000000000000000000000000..5012e62bb66ba380002e9ed2a7592bde7f84ee8c
GIT binary patch
literal 11052
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
X*DJ_Nm+6u^1`04wS3j3^P6<r_W=g51

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/ms-icon-310x310.png b/browsepy/static/icon/ms-icon-310x310.png
new file mode 100644
index 0000000000000000000000000000000000000000..99db385b4c1f86ea75b65739c54bba4ccba73927
GIT binary patch
literal 27734
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

literal 0
HcmV?d00001

diff --git a/browsepy/static/icon/ms-icon-70x70.png b/browsepy/static/icon/ms-icon-70x70.png
new file mode 100644
index 0000000000000000000000000000000000000000..58f2868b7a16eb9470d9d67bde3933c43cdfafff
GIT binary patch
literal 4284
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
N^K|udS?83{1OSmMzi9vf

literal 0
HcmV?d00001

diff --git a/browsepy/stream.py b/browsepy/stream.py
index 6094230..29c70f8 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -254,6 +254,17 @@ class TarFileStream(compat.Iterator):
                 raise self._thread_exception
 
 
+def tarfile_extension(compress, tarfile_class=TarFileStream):
+    """
+    Get file extension for given compression mode (as in contructor).
+
+    :param compress: compression mode
+    :returns: file extension
+    """
+    _, extension = tarfile_class.compresion_modes[compress]
+    return extension
+
+
 def stream_template(template_name, **context):
     """
     Get streaming response rendering a jinja template.
@@ -270,4 +281,4 @@ def stream_template(template_name, **context):
     app.update_template_context(context)
     template = app.jinja_env.get_template(template_name)
     stream = template.generate(context)
-    return flask.Response(flask.stream_with_context(stream))
+    return app.response_class(flask.stream_with_context(stream))
diff --git a/browsepy/templates/base.html b/browsepy/templates/base.html
index 6f581b9..979dba0 100644
--- a/browsepy/templates/base.html
+++ b/browsepy/templates/base.html
@@ -22,9 +22,28 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <meta name="viewport" content="width=device-width, user-scalable=no"/>
-  <title>{% block title %}{{ config.get('title', 'browsepy') }}{% endblock %}</title>
+  <title>{% block title %}{{ config.get('APPLICATION_NAME', 'browsepy') }}{% endblock %}</title>
   {% block styles %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='base.css') }}"/>
+    {% block icon %}
+      <link rel="apple-touch-icon" sizes="57x57" href="{{ url_for('static', filename='icon/apple-icon-57x57.png') }}">
+      <link rel="apple-touch-icon" sizes="60x60" href="{{ url_for('static', filename='icon/apple-icon-60x60.png') }}">
+      <link rel="apple-touch-icon" sizes="72x72" href="{{ url_for('static', filename='icon/apple-icon-72x72.png') }}">
+      <link rel="apple-touch-icon" sizes="76x76" href="{{ url_for('static', filename='icon/apple-icon-76x76.png') }}">
+      <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='icon/apple-icon-114x114.png') }}">
+      <link rel="apple-touch-icon" sizes="120x120" href="{{ url_for('static', filename='icon/apple-icon-120x120.png') }}">
+      <link rel="apple-touch-icon" sizes="144x144" href="{{ url_for('static', filename='icon/apple-icon-144x144.png') }}">
+      <link rel="apple-touch-icon" sizes="152x152" href="{{ url_for('static', filename='icon/apple-icon-152x152.png') }}">
+      <link rel="apple-touch-icon" sizes="180x180" href="{{ url_for('static', filename='icon/apple-icon-180x180.png') }}">
+      <link rel="icon" type="image/png" sizes="192x192" href="{{ url_for('static', filename='icon/android-icon-192x192.png') }}">
+      <link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='icon/favicon-32x32.png') }}">
+      <link rel="icon" type="image/png" sizes="96x96" href="{{ url_for('static', filename='icon/favicon-96x96.png') }}">
+      <link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename='icon/favicon-16x16.png') }}">
+      <link rel="manifest" href="{{ url_for('metadata', filename='manifest.json') }}">
+      <meta name="msapplication-TileColor" content="#ffffff">
+      <meta name="msapplication-TileImage" content="{{ url_for('static', filename='icon/ms-icon-144x144.png') }}">
+      <meta name="theme-color" content="#ffffff">
+    {% endblock %}
   {% endblock %}
   {% block head %}{% endblock %}
 </head>
diff --git a/browsepy/templates/browserconfig.xml b/browsepy/templates/browserconfig.xml
new file mode 100644
index 0000000..e416410
--- /dev/null
+++ b/browsepy/templates/browserconfig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="{{ url_for('static', filename='icon/ms-icon-70x70.png') }}"/>
+            <square150x150logo src="{{ url_for('static', filename='icon/ms-icon-150x150.png') }}"/>
+            <square310x310logo src="{{ url_for('static', filename='icon/ms-icon-310x310.png') }}"/>
+            <TileColor>#ffffff</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/browsepy/templates/manifest.json b/browsepy/templates/manifest.json
new file mode 100644
index 0000000..a14216c
--- /dev/null
+++ b/browsepy/templates/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "{{ config.get('APPLICATION_NAME', 'browsepy') }}",
+ "icons": [
+  {
+   "src": "{{ url_for('static', filename='icon/android-icon-36x36.png') }}",
+   "sizes": "36x36",
+   "type": "image/png",
+   "density": "0.75"
+  },
+  {
+   "src": "{{ url_for('static', filename='/android-icon-48x48.png') }}",
+   "sizes": "48x48",
+   "type": "image/png",
+   "density": "1.0"
+  },
+  {
+   "src": "{{ url_for('static', filename='/android-icon-72x72.png') }}",
+   "sizes": "72x72",
+   "type": "image/png",
+   "density": "1.5"
+  },
+  {
+   "src": "{{ url_for('static', filename='/android-icon-96x96.png') }}",
+   "sizes": "96x96",
+   "type": "image/png",
+   "density": "2.0"
+  },
+  {
+   "src": "{{ url_for('static', filename='/android-icon-144x144.png') }}",
+   "sizes": "144x144",
+   "type": "image/png",
+   "density": "3.0"
+  },
+  {
+   "src": "{{ url_for('static', filename='/android-icon-192x192.png') }}",
+   "sizes": "192x192",
+   "type": "image/png",
+   "density": "4.0"
+  }
+ ]
+}
diff --git a/browsepy/tests/test_utils.py b/browsepy/tests/test_utils.py
index 4d1fc9b..235131a 100644
--- a/browsepy/tests/test_utils.py
+++ b/browsepy/tests/test_utils.py
@@ -1,67 +1,3 @@
 # -*- coding: UTF-8 -*-
 
-import sys
-import os
-import os.path
-import functools
-import unittest
-
-import browsepy.utils as utils
-import browsepy.compat as compat
-
-
-class TestPPath(unittest.TestCase):
-    module = utils
-
-    def test_bad_kwarg(self):
-        with self.assertRaises(TypeError) as e:
-            self.module.ppath('a', 'b', bad=1)
-            self.assertIn('\'bad\'', e.args[0])
-
-    def test_defaultsnamedtuple(self):
-        dnt = self.module.defaultsnamedtuple
-
-        tup = dnt('a', ('a', 'b', 'c'))
-        self.assertListEqual(list(tup(1, 2, 3)), [1, 2, 3])
-
-        tup = dnt('a', ('a', 'b', 'c'), {'b': 2})
-        self.assertListEqual(list(tup(1, c=3)), [1, 2, 3])
-
-        tup = dnt('a', ('a', 'b', 'c'), (1, 2, 3))
-        self.assertListEqual(list(tup(c=10)), [1, 2, 10])
-
-    def test_join(self):
-        self.assertTrue(
-            self.module
-            .ppath('a', 'b', module=__name__)
-            .endswith(os.path.join('browsepy', 'tests', 'a', 'b'))
-            )
-        self.assertTrue(
-            self.module
-            .ppath('a', 'b')
-            .endswith(os.path.join('browsepy', 'a', 'b'))
-            )
-
-    def test_get_module(self):
-        oldpath = sys.path[:]
-        try:
-            with compat.mkdtemp() as base:
-                p = functools.partial(os.path.join, base)
-                sys.path[:] = [base]
-
-                with open(p('_test_zderr.py'), 'w') as f:
-                    f.write('\na = 1 / 0\n')
-                with self.assertRaises(ZeroDivisionError):
-                    self.module.get_module('_test_zderr')
-
-                with open(p('_test_importerr.py'), 'w') as f:
-                    f.write(
-                        '\n'
-                        'import browsepy.tests.test_utils.failing\n'
-                        'm.something()\n'
-                        )
-                with self.assertRaises(ImportError):
-                    self.module.get_module('_test_importerr')
-
-        finally:
-            sys.path[:] = oldpath
+pass
diff --git a/browsepy/utils.py b/browsepy/utils.py
index 42b5ff2..e7e1720 100644
--- a/browsepy/utils.py
+++ b/browsepy/utils.py
@@ -1,67 +1,10 @@
 """Small utility functions for common tasks."""
 
-import sys
-import os
-import os.path
-import random
-import functools
-import contextlib
 import collections
 
 import flask
 
 
-def ppath(*args, **kwargs):
-    """
-    Join given path components relative to a module location.
-
-    :param module: Module name
-    :type module: str
-    """
-    module = get_module(kwargs.pop('module', __name__))
-    if kwargs:
-        raise TypeError(
-            'ppath() got an unexpected keyword argument \'%s\''
-            % next(iter(kwargs))
-            )
-    path = os.path.realpath(module.__file__)
-    return os.path.join(os.path.dirname(path), *args)
-
-
-@contextlib.contextmanager
-def dummy_context():
-    """Get a dummy context manager."""
-    yield
-
-
-def get_module(name):
-    """
-    Get module object by name.
-
-    :param name: module name
-    :type name: str
-    :return: module or None if not found
-    :rtype: module or None
-    """
-    __import__(name)
-    return sys.modules.get(name, None)
-
-
-def random_string(size, sample=tuple(map(chr, range(256)))):
-    """
-    Get random string of given size.
-
-    :param size: length of the returned string
-    :type size: int
-    :param sample: character space, defaults to full 8-bit utf-8
-    :type sample: tuple of str
-    :returns: random string of specified size
-    :rtype: str
-    """
-    randrange = functools.partial(random.randrange, 0, len(sample))
-    return ''.join(sample[randrange()] for i in range(size))
-
-
 def solve_local(context_local):
     """
     Resolve given context local to its actual value.
diff --git a/doc/conf.py b/doc/conf.py
index 4781e48..ffb45b5 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -44,7 +44,7 @@ extensions = [
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
-    'sphinx.ext.githubpages',
+    'sphinx_autodoc_typehints',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/requirements/doc.txt b/requirements/doc.txt
index 1617bb9..910ecb5 100644
--- a/requirements/doc.txt
+++ b/requirements/doc.txt
@@ -23,3 +23,4 @@
 -r base.txt
 
 sphinx
+sphinx_autodoc_typehints[type_comments]
diff --git a/setup.cfg b/setup.cfg
index 73203c0..724b42b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,9 @@ show-source = True
 [yapf]
 align_closing_bracket_with_visual_indent = true
 
+[mypy]
+allow_redefinition = true
+
 [coverage:run]
 branch = True
 source = browsepy
-- 
GitLab


From fff8dc269115f9b29752e05efb461d0789315674 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Dec 2019 17:35:10 +0000
Subject: [PATCH 152/171] make compress extension filename aware

---
 CHANGELOG                                     | 11 ++-
 browsepy/__init__.py                          |  8 +-
 browsepy/templates/manifest.json              | 78 +++++++++----------
 .../{htmlcompress.py => compress.py}          | 28 ++++++-
 4 files changed, 77 insertions(+), 48 deletions(-)
 rename browsepy/transform/{htmlcompress.py => compress.py} (85%)

diff --git a/CHANGELOG b/CHANGELOG
index e38dc75..64b0a73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,14 +1,19 @@
 ## [0.6.0] - Upcoming
 ### Added
 - Plugin discovery.
-- New plugin `file-actions for copy/cut/paste and directory creation.
-- Smart cookie sessions.
+- New plugin file-actions providing copy/cut/paste and directory creation.
+- Smart cookie-baked sessions.
+- Directory browsing cache headers.
+- Favicon statics and metadata.
 
 ### Changes
 - Faster directory tarball streaming with more options.
+- Code simplification.
+- Base directory is downloadable now.
+- Directory entries stats are retrieved first and foremost.
 
 ### Removed
-- Python 3.3 and 3.4 support have been dropped.
+- Python 2.7, 3.3 and 3.4 support have been dropped.
 
 ## [0.5.6] - 2017-09-09
 ### Added
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 737cfaf..7948223 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -21,6 +21,7 @@ from .http import etag
 from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
                         InvalidFilenameError, InvalidPathError
 
+from . import mimetype
 from . import compat
 
 logger = logging.getLogger(__name__)
@@ -52,7 +53,7 @@ app.config.update(
         ),
     EXCLUDE_FNC=None,
     )
-app.jinja_env.add_extension('browsepy.transform.htmlcompress.HTMLCompress')
+app.jinja_env.add_extension('browsepy.transform.compress.TemplateCompress')
 app.session_interface = cookieman.CookieMan()
 
 if 'BROWSEPY_SETTINGS' in os.environ:
@@ -260,7 +261,10 @@ def upload(path):
 
 @app.route('/<any("manifest.json", "browserconfig.xml"):filename>')
 def metadata(filename):
-    response = app.response_class(render_template(filename))
+    response = app.response_class(
+        render_template(filename),
+        content_type=mimetype.by_python(filename),
+        )
     response.last_modified = app.config['APPLICATION_TIME']
     response.make_conditional(request)
     return response
diff --git a/browsepy/templates/manifest.json b/browsepy/templates/manifest.json
index a14216c..c0fecd3 100644
--- a/browsepy/templates/manifest.json
+++ b/browsepy/templates/manifest.json
@@ -1,41 +1,41 @@
 {
- "name": "{{ config.get('APPLICATION_NAME', 'browsepy') }}",
- "icons": [
-  {
-   "src": "{{ url_for('static', filename='icon/android-icon-36x36.png') }}",
-   "sizes": "36x36",
-   "type": "image/png",
-   "density": "0.75"
-  },
-  {
-   "src": "{{ url_for('static', filename='/android-icon-48x48.png') }}",
-   "sizes": "48x48",
-   "type": "image/png",
-   "density": "1.0"
-  },
-  {
-   "src": "{{ url_for('static', filename='/android-icon-72x72.png') }}",
-   "sizes": "72x72",
-   "type": "image/png",
-   "density": "1.5"
-  },
-  {
-   "src": "{{ url_for('static', filename='/android-icon-96x96.png') }}",
-   "sizes": "96x96",
-   "type": "image/png",
-   "density": "2.0"
-  },
-  {
-   "src": "{{ url_for('static', filename='/android-icon-144x144.png') }}",
-   "sizes": "144x144",
-   "type": "image/png",
-   "density": "3.0"
-  },
-  {
-   "src": "{{ url_for('static', filename='/android-icon-192x192.png') }}",
-   "sizes": "192x192",
-   "type": "image/png",
-   "density": "4.0"
-  }
- ]
+    "name": "{{ config.get('APPLICATION_NAME', 'browsepy') }}",
+    "icons": [
+        {
+            "src": "{{ url_for('static', filename='icon/android-icon-36x36.png') }}",
+            "sizes": "36x36",
+            "type": "image/png",
+            "density": "0.75"
+        },
+        {
+            "src": "{{ url_for('static', filename='icon/android-icon-48x48.png') }}",
+            "sizes": "48x48",
+            "type": "image/png",
+            "density": "1.0"
+        },
+        {
+            "src": "{{ url_for('static', filename='icon/android-icon-72x72.png') }}",
+            "sizes": "72x72",
+            "type": "image/png",
+            "density": "1.5"
+        },
+        {
+            "src": "{{ url_for('static', filename='icon/android-icon-96x96.png') }}",
+            "sizes": "96x96",
+            "type": "image/png",
+            "density": "2.0"
+        },
+        {
+            "src": "{{ url_for('static', filename='icon/android-icon-144x144.png') }}",
+            "sizes": "144x144",
+            "type": "image/png",
+            "density": "3.0"
+        },
+        {
+            "src": "{{ url_for('static', filename='icon/android-icon-192x192.png') }}",
+            "sizes": "192x192",
+            "type": "image/png",
+            "density": "4.0"
+        }
+    ]
 }
diff --git a/browsepy/transform/htmlcompress.py b/browsepy/transform/compress.py
similarity index 85%
rename from browsepy/transform/htmlcompress.py
rename to browsepy/transform/compress.py
index 9f72ad6..174d61a 100755
--- a/browsepy/transform/htmlcompress.py
+++ b/browsepy/transform/compress.py
@@ -9,7 +9,16 @@ import jinja2.lexer
 from . import StateMachine
 
 
-class CompressContext(StateMachine):
+class Context(object):
+    def feed(self, token):
+        yield token
+
+    def finish(self):
+        return
+        yield
+
+
+class CompressContext(Context, StateMachine):
     """Base jinja2 template token finite state machine."""
 
     token_class = jinja2.lexer.Token
@@ -113,14 +122,25 @@ class HTMLCompressContext(SGMLCompressContext):
         }
 
 
-class HTMLCompress(jinja2.ext.Extension):
+class TemplateCompress(jinja2.ext.Extension):
     """Jinja2 HTML template compression extension."""
 
-    context_class = HTMLCompressContext
+    default_context_class = Context
+    context_classes = {
+        '.xhtml': HTMLCompressContext,
+        '.html': HTMLCompressContext,
+        '.htm': HTMLCompressContext,
+        }
+
+    def get_context(self, filename):
+        for extension, context_class in self.context_classes.items():
+            if filename.endswith(extension):
+                return context_class()
+        return self.default_context_class()
 
     def filter_stream(self, stream):
         """Yield compressed tokens from :class:`~jinja2.lexer.TokenStream`."""
-        transform = self.context_class()
+        transform = self.get_context(stream.name)
 
         for token in stream:
             for compressed in transform.feed(token):
-- 
GitLab


From 43f7c843b0388c02fdfdb0715dd0b8981b107f8c Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 12 Dec 2019 17:59:51 +0000
Subject: [PATCH 153/171] wip

---
 browsepy/plugin/player/tests.py   |  6 +++++-
 browsepy/templates/base.html      | 19 ++++++-------------
 browsepy/tests/test_extensions.py |  6 +++---
 browsepy/transform/compress.py    |  9 +++++----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 26d2a51..5f301cf 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -286,7 +286,11 @@ class TestBlueprint(TestPlayerBase):
     def setUp(self):
         super(TestBlueprint, self).setUp()
         app = self.app
-        app.template_folder = utils.ppath('templates')
+        app.template_folder = os.path.join(
+            # FIXME: get a better way
+            os.path.dirname(browsepy.__path__),
+            'templates',
+            )
         app.config['DIRECTORY_BASE'] = tempfile.mkdtemp()
         app.register_blueprint(self.module.player)
 
diff --git a/browsepy/templates/base.html b/browsepy/templates/base.html
index 979dba0..62b85cc 100644
--- a/browsepy/templates/base.html
+++ b/browsepy/templates/base.html
@@ -26,19 +26,12 @@
   {% block styles %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='base.css') }}"/>
     {% block icon %}
-      <link rel="apple-touch-icon" sizes="57x57" href="{{ url_for('static', filename='icon/apple-icon-57x57.png') }}">
-      <link rel="apple-touch-icon" sizes="60x60" href="{{ url_for('static', filename='icon/apple-icon-60x60.png') }}">
-      <link rel="apple-touch-icon" sizes="72x72" href="{{ url_for('static', filename='icon/apple-icon-72x72.png') }}">
-      <link rel="apple-touch-icon" sizes="76x76" href="{{ url_for('static', filename='icon/apple-icon-76x76.png') }}">
-      <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='icon/apple-icon-114x114.png') }}">
-      <link rel="apple-touch-icon" sizes="120x120" href="{{ url_for('static', filename='icon/apple-icon-120x120.png') }}">
-      <link rel="apple-touch-icon" sizes="144x144" href="{{ url_for('static', filename='icon/apple-icon-144x144.png') }}">
-      <link rel="apple-touch-icon" sizes="152x152" href="{{ url_for('static', filename='icon/apple-icon-152x152.png') }}">
-      <link rel="apple-touch-icon" sizes="180x180" href="{{ url_for('static', filename='icon/apple-icon-180x180.png') }}">
-      <link rel="icon" type="image/png" sizes="192x192" href="{{ url_for('static', filename='icon/android-icon-192x192.png') }}">
-      <link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='icon/favicon-32x32.png') }}">
-      <link rel="icon" type="image/png" sizes="96x96" href="{{ url_for('static', filename='icon/favicon-96x96.png') }}">
-      <link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename='icon/favicon-16x16.png') }}">
+      {% for i in (57, 60, 72, 76, 114, 120, 144, 152, 180) %}
+        <link rel="apple-touch-icon" sizes="{{ i }}x{{ i }}" href="{{ url_for('static', filename='icon/apple-icon-{0}x{0}.png'.format(i)) }}">
+      {% endfor %}
+      {% for i in (192, 96, 32, 16) %}
+        <link rel="icon" type="image/png" sizes="{{ i }}x{{ i }}" href="{{ url_for('static', filename='icon/android-icon-{0}x{0}.png'.format(i)) }}">
+      {% endfor %}
       <link rel="manifest" href="{{ url_for('metadata', filename='manifest.json') }}">
       <meta name="msapplication-TileColor" content="#ffffff">
       <meta name="msapplication-TileImage" content="{{ url_for('static', filename='icon/ms-icon-144x144.png') }}">
diff --git a/browsepy/tests/test_extensions.py b/browsepy/tests/test_extensions.py
index 0aaaf82..63621cf 100644
--- a/browsepy/tests/test_extensions.py
+++ b/browsepy/tests/test_extensions.py
@@ -2,16 +2,16 @@
 import unittest
 import jinja2
 
-import browsepy.transform.htmlcompress
+import browsepy.transform.compress
 
 
 class TestHTMLCompress(unittest.TestCase):
-    extension = browsepy.transform.htmlcompress.HTMLCompress
+    extension = browsepy.transform.compress.TemplateCompress
 
     def setUp(self):
         self.env = jinja2.Environment(
             autoescape=True,
-            extensions=[self.extension]
+            extensions=[self.extension],
             )
 
     def render(self, html, **kwargs):
diff --git a/browsepy/transform/compress.py b/browsepy/transform/compress.py
index 174d61a..2c0ce0b 100755
--- a/browsepy/transform/compress.py
+++ b/browsepy/transform/compress.py
@@ -132,10 +132,11 @@ class TemplateCompress(jinja2.ext.Extension):
         '.htm': HTMLCompressContext,
         }
 
-    def get_context(self, filename):
-        for extension, context_class in self.context_classes.items():
-            if filename.endswith(extension):
-                return context_class()
+    def get_context(self, filename=None):
+        if filename:
+            for extension, context_class in self.context_classes.items():
+                if filename.endswith(extension):
+                    return context_class()
         return self.default_context_class()
 
     def filter_stream(self, stream):
-- 
GitLab


From 1897fbf9824ab441b7c6d02c5f5ed8db37ce092d Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Mon, 23 Dec 2019 17:58:03 +0000
Subject: [PATCH 154/171] implement root browsepy blueprint and create_app

---
 browsepy/__init__.py                          | 277 ++++++++++--------
 browsepy/appconfig.py                         |  72 ++++-
 browsepy/compat.py                            |  10 +-
 browsepy/file.py                              |  50 ++--
 browsepy/manager.py                           |  78 +++--
 browsepy/plugin/file_actions/__init__.py      |  10 +-
 .../templates/400.file_actions.html           |  10 +-
 .../create_directory.file_actions.html        |  10 +-
 .../templates/selection.file_actions.html     |   5 +-
 browsepy/plugin/file_actions/tests.py         |   8 +-
 browsepy/plugin/player/playable.py            |   3 +-
 browsepy/plugin/player/tests.py               |   7 +-
 browsepy/templates/400.html                   |   4 +-
 browsepy/templates/404.html                   |   4 +-
 browsepy/templates/base.html                  |  26 +-
 browsepy/templates/browse.html                |   2 +-
 browsepy/templates/browserconfig.xml          |   6 +-
 browsepy/templates/manifest.json              |  12 +-
 browsepy/templates/remove.html                |   6 +-
 browsepy/tests/test_compat.py                 |   5 +-
 browsepy/tests/test_module.py                 | 147 ++++++----
 browsepy/transform/compress.py                |   5 +
 requirements.txt                              |  10 +-
 requirements/base.txt                         |   1 +
 requirements/development.txt                  |   7 +-
 requirements/doc.txt                          |   7 +-
 26 files changed, 471 insertions(+), 311 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 7948223..1b33cee 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -7,13 +7,15 @@ import os
 import os.path
 import time
 
+import flask
 import cookieman
 
-from flask import request, render_template, jsonify, redirect, \
+from flask import request, render_template, redirect, \
                   url_for, send_from_directory, \
-                  session, abort
+                  current_app, session, abort
 
-from .appconfig import Flask
+from .compat import typing
+from .appconfig import CreateApp
 from .manager import PluginManager
 from .file import Node, secure_filename
 from .stream import tarfile_extension, stream_template
@@ -25,75 +27,124 @@ from . import mimetype
 from . import compat
 
 logger = logging.getLogger(__name__)
-
-app = Flask(
+blueprint = flask.Blueprint(
+    'browsepy',
     __name__,
-    template_folder='templates',
     static_folder='static',
+    template_folder='templates',
     )
-app.config.update(
-    SECRET_KEY=os.urandom(4096),
-    APPLICATION_NAME='browsepy',
-    APPLICATION_TIME=None,
-    DIRECTORY_BASE=compat.getcwd(),
-    DIRECTORY_START=None,
-    DIRECTORY_REMOVE=None,
-    DIRECTORY_UPLOAD=None,
-    DIRECTORY_TAR_BUFFSIZE=262144,
-    DIRECTORY_TAR_COMPRESSION='gzip',
-    DIRECTORY_TAR_EXTENSION=None,
-    DIRECTORY_TAR_COMPRESSLEVEL=1,
-    DIRECTORY_DOWNLOADABLE=True,
-    USE_BINARY_MULTIPLES=True,
-    PLUGIN_MODULES=[],
-    PLUGIN_NAMESPACES=(
-        'browsepy.plugin',
-        'browsepy_',
-        '',
-        ),
-    EXCLUDE_FNC=None,
-    )
-app.jinja_env.add_extension('browsepy.transform.compress.TemplateCompress')
-app.session_interface = cookieman.CookieMan()
-
-if 'BROWSEPY_SETTINGS' in os.environ:
-    app.config.from_envvar('BROWSEPY_SETTINGS')
-
-plugin_manager = PluginManager(app)
-
-
-@app.before_first_request
-def prepare():
-    config = app.config
-    if config['APPLICATION_TIME'] is None:
-        config['APPLICATION_TIME'] = time.time()
-
-
-@app.url_defaults
-def default_download_extension(endpoint, values):
+create_app = CreateApp(__name__)
+
+
+@create_app.register
+def init_config():
+    """Configure application."""
+    current_app.register_blueprint(blueprint)
+    current_app.config.update(
+        SECRET_KEY=os.urandom(4096),
+        APPLICATION_NAME='browsepy',
+        APPLICATION_TIME=0,
+        DIRECTORY_BASE=compat.getcwd(),
+        DIRECTORY_START=None,
+        DIRECTORY_REMOVE=None,
+        DIRECTORY_UPLOAD=None,
+        DIRECTORY_TAR_BUFFSIZE=262144,
+        DIRECTORY_TAR_COMPRESSION='gzip',
+        DIRECTORY_TAR_COMPRESSLEVEL=1,
+        DIRECTORY_DOWNLOADABLE=True,
+        USE_BINARY_MULTIPLES=True,
+        PLUGIN_MODULES=[],
+        PLUGIN_NAMESPACES=(
+            'browsepy.plugin',
+            'browsepy_',
+            '',
+            ),
+        EXCLUDE_FNC=None,
+        )
+    current_app.jinja_env.add_extension(
+        'browsepy.transform.compress.TemplateCompress')
+
+    if 'BROWSEPY_SETTINGS' in os.environ:
+        current_app.config.from_envvar('BROWSEPY_SETTINGS')
+
+    @current_app.before_first_request
+    def prepare():
+        config = current_app.config
+        if not config['APPLICATION_TIME']:
+            config['APPLICATION_TIME'] = time.time()
+
+
+@create_app.register
+def init_plugin_manager():
+    """Configure plugin manager."""
+    current_app.session_interface = cookieman.CookieMan()
+    plugin_manager = PluginManager()
+    plugin_manager.init_app(current_app)
+
+    @current_app.session_interface.register('browse:sort')
+    def shrink_browse_sort(data, last):
+        """Session `browse:short` size reduction logic."""
+        if data['browse:sort'] and not last:
+            data['browse:sort'].pop()
+        else:
+            del data['browse:sort']
+        return data
+
+
+@create_app.register
+def init_globals():
+    """Configure application global environment."""
+    @current_app.context_processor
+    def template_globals():
+        return {
+            'manager': current_app.extensions['plugin_manager'],
+            'len': len,
+            }
+
+
+@create_app.register
+def init_error_handlers():
+    """Configure app error handlers."""
+    @current_app.errorhandler(InvalidPathError)
+    def bad_request_error(e):
+        file = None
+        if hasattr(e, 'path'):
+            if isinstance(e, InvalidFilenameError):
+                file = Node(e.path)
+            else:
+                file = Node(e.path).parent
+        return render_template('400.html', file=file, error=e), 400
+
+    @current_app.errorhandler(OutsideRemovableBase)
+    @current_app.errorhandler(OutsideDirectoryBase)
+    @current_app.errorhandler(404)
+    def page_not_found_error(e):
+        return render_template('404.html'), 404
+
+    @current_app.errorhandler(Exception)
+    @current_app.errorhandler(500)
+    def internal_server_error(e):  # pragma: no cover
+        logger.exception(e)
+        return getattr(e, 'message', 'Internal server error'), 500
+
+
+@blueprint.url_defaults
+def default_directory_download_extension(endpoint, values):
+    """Set default extension for download_directory endpoint."""
+    print(endpoint)
     if endpoint == 'download_directory':
-        values.setdefault(
-            'extension',
-            tarfile_extension(app.config['DIRECTORY_TAR_EXTENSION']),
-            )
-
-
-@app.session_interface.register('browse:sort')
-def shrink_browse_sort(data, last):
-    """Session `browse:short` size reduction logic."""
-    if data['browse:sort'] and not last:
-        data['browse:sort'].pop()
-    else:
-        del data['browse:sort']
-    return data
+        compression = current_app.config['DIRECTORY_TAR_COMPRESSION']
+        values.setdefault('ext', tarfile_extension(compression))
 
 
 def get_cookie_browse_sorting(path, default):
+    # type: (str, str) -> str
     """
     Get sorting-cookie data for path of current request.
 
-    :returns: sorting property
-    :rtype: string
+    :param path: path for sorting attribute
+    :param default: default sorting attribute
+    :return: sorting property
     """
     if request:
         for cpath, cprop in session.get('browse:sort', ()):
@@ -103,17 +154,19 @@ def get_cookie_browse_sorting(path, default):
 
 
 def browse_sortkey_reverse(prop):
+    # type: (str) -> typing.Tuple[typing.Callable[[Node], typing.Any], bool]
     """
-    Get sorting function for directory listing based on given attribute
-    name, with some caveats:
-    * Directories will be first.
-    * If *name* is given, link widget lowercase text will be used instead.
-    * If *size* is given, bytesize will be used.
+    Get directory content sort function based on given attribute name.
 
     :param prop: file attribute name
-    :type prop: str
-    :returns: tuple with sorting function and reverse bool
-    :rtype: tuple of a dict and a bool
+    :return: tuple with sorting function and reverse bool
+
+    The sort function takes some extra considerations:
+
+    1. Directories will be always first.
+    2. If *name* is given, link widget lowercase text will be used instead.
+    3. If *size* is given, bytesize will be used.
+
     """
     if prop.startswith('-'):
         prop = prop[1:]
@@ -146,17 +199,10 @@ def browse_sortkey_reverse(prop):
         )
 
 
-@app.context_processor
-def template_globals():
-    return {
-        'manager': app.extensions['plugin_manager'],
-        'len': len,
-        }
-
-
-@app.route('/sort/<string:property>', defaults={'path': ''})
-@app.route('/sort/<string:property>/<path:path>')
+@blueprint.route('/sort/<string:property>', defaults={'path': ''})
+@blueprint.route('/sort/<string:property>/<path:path>')
 def sort(property, path):
+    """Handle sort request, add sorting rule to session."""
     directory = Node.from_urlpath(path)
     if directory.is_directory and not directory.is_excluded:
         session['browse:sort'] = \
@@ -165,9 +211,10 @@ def sort(property, path):
     abort(404)
 
 
-@app.route('/browse', defaults={'path': ''})
-@app.route('/browse/<path:path>')
+@blueprint.route('/browse', defaults={'path': ''})
+@blueprint.route('/browse/<path:path>')
 def browse(path):
+    """Handle browse request, serve directory listing."""
     sort_property = get_cookie_browse_sorting(path, 'text')
     sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
     directory = Node.from_urlpath(path)
@@ -181,7 +228,7 @@ def browse(path):
             )
         response.last_modified = max(
             directory.content_mtime,
-            app.config['APPLICATION_TIME'],
+            current_app.config['APPLICATION_TIME'],
             )
         response.set_etag(
             etag(
@@ -194,26 +241,30 @@ def browse(path):
     abort(404)
 
 
-@app.route('/open/<path:path>', endpoint='open')
+@blueprint.route('/open/<path:path>', endpoint='open')
 def open_file(path):
+    """Handle open request, serve file."""
     file = Node.from_urlpath(path)
     if file.is_file and not file.is_excluded:
         return send_from_directory(file.parent.path, file.name)
     abort(404)
 
 
-@app.route('/download/file/<path:path>')
+@blueprint.route('/download/file/<path:path>')
 def download_file(path):
+    """Handle download request, serve file as attachment."""
     file = Node.from_urlpath(path)
     if file.is_file and not file.is_excluded:
         return file.download()
     abort(404)
 
 
-@app.route('/download/directory.<string:extension>', defaults={'path': ''})
-@app.route('/download/directory/?<path:path>.<string:extension>')
-def download_directory(path, extension):
-    if extension != tarfile_extension(app.config['DIRECTORY_TAR_COMPRESSION']):
+@blueprint.route('/download/directory.<string:ext>', defaults={'path': ''})
+@blueprint.route('/download/directory/?<path:path>.<string:ext>')
+def download_directory(path, ext):
+    """Handle download directory request, serve tarfile as attachment."""
+    compression = current_app.config['DIRECTORY_TAR_COMPRESSION']
+    if ext != tarfile_extension(compression):
         abort(404)
     directory = Node.from_urlpath(path)
     if directory.is_directory and not directory.is_excluded:
@@ -221,8 +272,9 @@ def download_directory(path, extension):
     abort(404)
 
 
-@app.route('/remove/<path:path>', methods=('GET', 'POST'))
+@blueprint.route('/remove/<path:path>', methods=('GET', 'POST'))
 def remove(path):
+    """Handle remove request, serve confirmation dialog."""
     file = Node.from_urlpath(path)
     if file.can_remove and not file.is_excluded:
         if request.method == 'GET':
@@ -232,9 +284,10 @@ def remove(path):
     abort(404)
 
 
-@app.route('/upload', defaults={'path': ''}, methods=('POST',))
-@app.route('/upload/<path:path>', methods=('POST',))
+@blueprint.route('/upload', defaults={'path': ''}, methods=('POST',))
+@blueprint.route('/upload/<path:path>', methods=('POST',))
 def upload(path):
+    """Handle upload request."""
     directory = Node.from_urlpath(path)
     if (
       directory.is_directory and
@@ -259,43 +312,27 @@ def upload(path):
     abort(404)
 
 
-@app.route('/<any("manifest.json", "browserconfig.xml"):filename>')
+@blueprint.route('/<any("manifest.json", "browserconfig.xml"):filename>')
 def metadata(filename):
-    response = app.response_class(
+    """Handle metadata request, serve browse metadata file."""
+    response = current_app.response_class(
         render_template(filename),
         content_type=mimetype.by_python(filename),
         )
-    response.last_modified = app.config['APPLICATION_TIME']
+    response.last_modified = current_app.config['APPLICATION_TIME']
     response.make_conditional(request)
     return response
 
 
-@app.route('/')
+@blueprint.route('/')
 def index():
-    path = app.config['DIRECTORY_START'] or app.config['DIRECTORY_BASE']
+    """Handle index request, serve either start or base directory listing."""
+    path = (
+        current_app.config['DIRECTORY_START'] or
+        current_app.config['DIRECTORY_BASE']
+        )
     return browse(Node(path).urlpath)
 
 
-@app.errorhandler(InvalidPathError)
-def bad_request_error(e):
-    file = None
-    if hasattr(e, 'path'):
-        if isinstance(e, InvalidFilenameError):
-            file = Node(e.path)
-        else:
-            file = Node(e.path).parent
-    return render_template('400.html', file=file, error=e), 400
-
-
-@app.errorhandler(OutsideRemovableBase)
-@app.errorhandler(OutsideDirectoryBase)
-@app.errorhandler(404)
-def page_not_found_error(e):
-    return render_template('404.html'), 404
-
-
-@app.errorhandler(Exception)
-@app.errorhandler(500)
-def internal_server_error(e):  # pragma: no cover
-    logger.exception(e)
-    return getattr(e, 'message', 'Internal server error'), 500
+app = create_app()
+plugin_manager = app.extensions['plugin_manager']
diff --git a/browsepy/appconfig.py b/browsepy/appconfig.py
index edacd92..8061f08 100644
--- a/browsepy/appconfig.py
+++ b/browsepy/appconfig.py
@@ -1,11 +1,17 @@
-# -*- coding: UTF-8 -*-
+"""Flask app config utilities."""
 
 import warnings
 
 import flask
 import flask.config
 
-from .compat import basestring
+from .compat import typing
+
+from . import compat
+
+
+if typing:
+    T = typing.TypeVar('T')
 
 
 class Config(flask.config.Config):
@@ -14,61 +20,67 @@ class Config(flask.config.Config):
 
     See :type:`flask.config.Config` for more info.
     """
+
     def __init__(self, root, defaults=None):
+        """Initialize."""
         self._warned = set()
         if defaults:
             defaults = self.gendict(defaults)
         super(Config, self).__init__(root, defaults)
 
-    def genkey(self, k):
+    def genkey(self, key):  # type: (T) -> T
         """
-        Key translation function.
+        Get translated key.
 
         :param k: key
-        :type k: str
         :returns: uppercase key
-        ;rtype: str
         """
-        if isinstance(k, basestring):
-            if k not in self._warned and k != k.upper():
-                self._warned.add(k)
+        if isinstance(key, compat.basestring):
+            uppercase = key.upper()
+            if key not in self._warned and key != uppercase:
+                self._warned.add(key)
                 warnings.warn(
                     'Config accessed with lowercase key '
-                    '%r, lowercase config is deprecated.' % k,
+                    '%r, lowercase config is deprecated.' % key,
                     DeprecationWarning,
                     3
                     )
-            return k.upper()
-        return k
+            return uppercase
+        return key
 
-    def gendict(self, *args, **kwargs):
+    def gendict(self, *args, **kwargs):  # type: (...) -> dict
         """
-        Pre-translated key dictionary constructor.
+        Generate dictionary with pre-translated keys.
 
         See :type:`dict` for more info.
 
         :returns: dictionary with uppercase keys
-        :rtype: dict
         """
         gk = self.genkey
         return dict((gk(k), v) for k, v in dict(*args, **kwargs).items())
 
     def __getitem__(self, k):
+        """Return self[k]."""
         return super(Config, self).__getitem__(self.genkey(k))
 
     def __setitem__(self, k, v):
+        """Assign value to key, same as self[k]=value."""
         super(Config, self).__setitem__(self.genkey(k), v)
 
     def __delitem__(self, k):
+        """Remove item, same as del self[k]."""
         super(Config, self).__delitem__(self.genkey(k))
 
     def get(self, k, default=None):
+        """Get option from config, return default if not found."""
         return super(Config, self).get(self.genkey(k), default)
 
     def pop(self, k, *args):
+        """Remove and get option from config, accepts an optional default."""
         return super(Config, self).pop(self.genkey(k), *args)
 
     def update(self, *args, **kwargs):
+        """Update current object with given keys and values."""
         super(Config, self).update(self.gendict(*args, **kwargs))
 
 
@@ -78,4 +90,34 @@ class Flask(flask.Flask):
 
     See :type:`flask.Flask` for more info.
     """
+
     config_class = Config
+
+
+class CreateApp(object):
+    """Flask create_app pattern factory."""
+
+    flask_class = Flask
+
+    def __init__(self, *args, **kwargs):
+        """
+        Initialize.
+
+        Arguments are passed to :class:`Flask` constructor.
+        """
+        self.args = args
+        self.kwargs = kwargs
+        self.registry = []
+
+    def __call__(self):  # type: () -> Flask
+        """Create Flask app instance."""
+        app = self.flask_class(*self.args, **self.kwargs)
+        with app.app_context():
+            for fnc in self.registry:
+                fnc()
+        return app
+
+    def register(self, fnc):
+        """Register function to be called when app is initialized."""
+        self.registry.append(fnc)
+        return fnc
diff --git a/browsepy/compat.py b/browsepy/compat.py
index d75b0b0..78b457f 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -52,6 +52,11 @@ try:
 except ImportError:
     _import_module = None  # noqa
 
+try:
+    from functools import cached_property   # python 3.8+
+except ImportError:
+    from werkzeug.utils import cached_property  # noqa
+
 try:
     import typing  # python 3.5+
 except ImportError:
@@ -188,9 +193,7 @@ def rmtree(path):
     platforms and python version combinations.
 
     :param path: path to remove
-    :type path: str
     """
-
     exc_info = ()
     for retry in range(10):
         try:
@@ -360,8 +363,9 @@ def deprecated(func_or_text, environ=os.environ):
 
 
 def usedoc(other):
+    # type: (typing.Any) -> typing.Callable[[...], typing.Any]
     """
-    Decorator which copies __doc__ of given object into decorated one.
+    Get decorating function which copies given object __doc__.
 
     :param other: anything with a __doc__ attribute
     :type other: any
diff --git a/browsepy/file.py b/browsepy/file.py
index cda6fc2..ffd55f1 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -11,13 +11,11 @@ import logging
 
 import flask
 
-from werkzeug.utils import cached_property
-
 from . import compat
 from . import utils
 from . import stream
 
-from .compat import range
+from .compat import range, cached_property
 from .http import Headers
 
 from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
@@ -93,6 +91,16 @@ class Node(object):
         """
         return os.path.islink(self.path)
 
+    @cached_property
+    def is_directory(self):
+        """
+        Get if path points to a real directory.
+
+        :returns: True if real directory, False otherwise
+        :rtype: bool
+        """
+        return os.path.isdir(self.path)
+
     @cached_property
     def plugin_manager(self):
         """
@@ -124,7 +132,7 @@ class Node(object):
                     'button',
                     file=self,
                     css='remove',
-                    endpoint='remove'
+                    endpoint='browsepy.remove',
                     )
                 )
         return widgets + self.plugin_manager.get_widgets(file=self)
@@ -282,6 +290,8 @@ class Node(object):
 
     def __init__(self, path=None, app=None, **defaults):
         """
+        Initialize.
+
         :param path: local path
         :type path: str
         :param app: app instance (optional inside application context)
@@ -413,7 +423,7 @@ class File(Node):
                 'entry-link',
                 'link',
                 file=self,
-                endpoint='open'
+                endpoint='browsepy.open',
                 )
             ]
         if self.can_download:
@@ -423,14 +433,14 @@ class File(Node):
                     'button',
                     file=self,
                     css='download',
-                    endpoint='download_file'
+                    endpoint='browsepy.download_file',
                     ),
                 self.plugin_manager.create_widget(
                     'header',
                     'button',
                     file=self,
                     text='Download file',
-                    endpoint='download_file'
+                    endpoint='browsepy.download_file',
                     ),
                 ))
         return widgets + super(File, self).widgets
@@ -560,7 +570,7 @@ class Directory(Node):
                 'entry-link',
                 'link',
                 file=self,
-                endpoint='browse'
+                endpoint='browsepy.browse',
                 )
             ]
         if self.can_download:
@@ -570,14 +580,14 @@ class Directory(Node):
                     'button',
                     file=self,
                     css='download',
-                    endpoint='download_directory'
+                    endpoint='browsepy.download_directory',
                     ),
                 self.plugin_manager.create_widget(
                     'header',
                     'button',
                     file=self,
                     text='Download all',
-                    endpoint='download_directory'
+                    endpoint='browsepy.download_directory',
                     ),
                 ))
         if self.can_upload:
@@ -586,36 +596,26 @@ class Directory(Node):
                     'head',
                     'script',
                     file=self,
-                    endpoint='static',
-                    filename='browse.directory.head.js'
+                    endpoint='browsepy.static',
+                    filename='browse.directory.head.js',
                     ),
                 self.plugin_manager.create_widget(
                     'scripts',
                     'script',
                     file=self,
-                    endpoint='static',
-                    filename='browse.directory.body.js'
+                    endpoint='browsepy.static',
+                    filename='browse.directory.body.js',
                     ),
                 self.plugin_manager.create_widget(
                     'header',
                     'upload',
                     file=self,
                     text='Upload',
-                    endpoint='upload'
+                    endpoint='browsepy.upload',
                     )
                 ))
         return widgets + super(Directory, self).widgets
 
-    @cached_property
-    def is_directory(self):
-        """
-        Get if path points to a real directory.
-
-        :returns: True if real directory, False otherwise
-        :rtype: bool
-        """
-        return os.path.isdir(self.path)
-
     @cached_property
     def is_root(self):
         """
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 22c3c9b..e38e741 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+"""Browsepy plugin manager classes."""
 
 import os.path
 import pkgutil
@@ -6,14 +6,13 @@ import argparse
 import functools
 import warnings
 
-from werkzeug.utils import cached_property
 from cookieman import CookieMan
 
 from . import mimetype
 from . import compat
 from . import file
 
-from .compat import typing, types
+from .compat import typing, types, cached_property
 from .utils import defaultsnamedtuple
 from .exceptions import PluginNotFoundError, InvalidArgumentError, \
                         WidgetParameterException
@@ -23,6 +22,7 @@ class PluginManagerBase(object):
     """Base plugin manager with loading and Flask extension logic."""
 
     _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
+    get_module = staticmethod(compat.import_module)
 
     @property
     def namespaces(self):
@@ -111,7 +111,7 @@ class PluginManagerBase(object):
             except ImportError:
                 pass
 
-    def _iter_plugin_modules(self, get_module_fnc=compat.import_module):
+    def _iter_plugin_modules(self):
         """
         Iterate plugin modules.
 
@@ -121,6 +121,7 @@ class PluginManagerBase(object):
         nameset = set()  # type: typing.Set[str]
         shortset = set()  # type: typing.Set[str]
         filters = self.plugin_filters
+        get_module_fnc = self.get_module
         for prefix in filter(None, self.namespaces):
             name_iter_fnc = (
                 self._iter_submodules
@@ -153,13 +154,12 @@ class PluginManagerBase(object):
         """Iterate through all loadable plugins on typical paths."""
         return list(self._iter_plugin_modules())
 
-    def import_plugin(self, plugin, get_module_fnc=compat.import_module):
+    def import_plugin(self, plugin):
         # type: (str) -> types.ModuleType
         """
         Import plugin by given name, looking at :attr:`namespaces`.
 
         :param plugin: plugin module name
-        :type plugin: str
         :raises PluginNotFoundError: if not found on any namespace
         """
         plugin = plugin.replace('-', '_')
@@ -172,6 +172,7 @@ class PluginManagerBase(object):
             for namespace in self.namespaces
             ]
         names = sorted(frozenset(names), key=names.index)
+        get_module_fnc = self.get_module
         for name in names:
             try:
                 return get_module_fnc(name)
@@ -187,7 +188,6 @@ class PluginManagerBase(object):
         Import plugin (see :meth:`import_plugin`) and load related data.
 
         :param plugin: plugin module name
-        :type plugin: str
         :raises PluginNotFoundError: if not found on any namespace
         """
         return self.import_plugin(plugin)
@@ -195,10 +195,14 @@ class PluginManagerBase(object):
 
 class RegistrablePluginManager(PluginManagerBase):
     """
-    Base plugin manager for plugin registration via :func:`register_plugin`
-    functions at plugin module level.
+    Plugin registration manager.
+
+    Plugin registration requires a :func:`register_plugin` function at
+    the plugin module level.
     """
+
     def __init__(self, app=None):
+        """Initialize."""
         super(RegistrablePluginManager, self).__init__(app)
         self.plugin_filters.append(
             lambda o: callable(getattr(o, 'register_plugin', None))
@@ -223,12 +227,19 @@ class RegistrablePluginManager(PluginManagerBase):
 
 class BlueprintPluginManager(PluginManagerBase):
     """
-    Manager for blueprint registration via :meth:`register_plugin` calls.
+    Plugin blueprint registration manager.
+
+    Blueprint registration done via :meth:`register_blueprint`
+    calls inside plugin :func:`register_plugin`.
 
     Note: blueprints are not removed on `clear` nor reloaded on `reload`
-    as flask does not allow it.
+    as flask does not allow it, consider creating a new clean
+    :class:`flask.Flask` browsepy app by using :func:`browsepy.create_app`.
+
     """
+
     def __init__(self, app=None):
+        """Initialize."""
         self._blueprint_known = set()
         super(BlueprintPluginManager, self).__init__(app=app)
 
@@ -249,10 +260,15 @@ class BlueprintPluginManager(PluginManagerBase):
 
 class ExcludePluginManager(PluginManagerBase):
     """
-    Manager for exclude-function registration via :meth:`register_exclude_fnc`
-    calls.
+    Plugin node exclusion registration manager.
+
+    Exclude-function registration done via :meth:`register_exclude_fnc`
+    calls inside plugin :func:`register_plugin`.
+
     """
+
     def __init__(self, app=None):
+        """Initialize."""
         self._exclude_functions = set()
         super(ExcludePluginManager, self).__init__(app=app)
 
@@ -308,14 +324,15 @@ class ExcludePluginManager(PluginManagerBase):
 
 class WidgetPluginManager(PluginManagerBase):
     """
-    Plugin manager for widget registration.
+    Plugin widget registration manager.
 
-    This class provides a dictionary of widget types at its
+    This class provides a dictionary of supported widget types available as
     :attr:`widget_types` attribute. They can be referenced by their keys on
     both :meth:`create_widget` and :meth:`register_widget` methods' `type`
     parameter, or instantiated directly and passed to :meth:`register_widget`
     via `widget` parameter.
     """
+
     widget_types = {
         'base': defaultsnamedtuple(
             'Widget',
@@ -363,8 +380,8 @@ class WidgetPluginManager(PluginManagerBase):
         """
         List registered widgets, optionally matching given criteria.
 
-        :param file: optional file object will be passed to widgets' filter
-                     functions.
+        :param file: optional file object will be passed to widgets'
+                     filter functions.
         :type file: browsepy.file.Node or None
         :param place: optional template place hint.
         :type place: str
@@ -494,9 +511,8 @@ class WidgetPluginManager(PluginManagerBase):
 
 
 class MimetypePluginManager(RegistrablePluginManager):
-    """
-    Plugin manager for mimetype-function registration.
-    """
+    """Plugin mimetype function registration manager."""
+
     _default_mimetype_functions = mimetype.alternatives
 
     def clear(self):
@@ -539,13 +555,16 @@ class MimetypePluginManager(RegistrablePluginManager):
 
 
 class SessionPluginManager(PluginManagerBase):
+    """Plugin session shrink function registration manager."""
+
     def register_session(self, key_or_keys, shrink_fnc=None):
         """
-        Register session shrink function for specific session key or
-        keys. Can be used as decorator.
+        Register shrink function for specific session key or keys.
+
+        Can be used as decorator.
 
         Usage:
-        >>> @app.session_interface.register('my_session_key')
+        >>> @manager.register_session('my_session_key')
         ... def my_shrink_fnc(data):
         ...     del data['my_session_key']
         ...     return data
@@ -565,7 +584,7 @@ class SessionPluginManager(PluginManagerBase):
 
 class ArgumentPluginManager(PluginManagerBase):
     """
-    Plugin manager for command-line argument registration.
+    Plugin command-line argument registration manager.
 
     This function is used by browsepy's :mod:`__main__` module in order
     to attach extra arguments at argument-parsing time.
@@ -585,6 +604,7 @@ class ArgumentPluginManager(PluginManagerBase):
         return parser
 
     def __init__(self, app=None):
+        """Initialize."""
         super(ArgumentPluginManager, self).__init__(app)
         self.plugin_filters.append(
             lambda o: callable(getattr(o, 'register_arguments', None))
@@ -592,8 +612,9 @@ class ArgumentPluginManager(PluginManagerBase):
 
     def extract_plugin_arguments(self, plugin):
         """
-        Given a plugin name, extracts its registered_arguments as an
-        iterable of (args, kwargs) tuples.
+        Extract registered argument pairs from given plugin name,
+
+        Arguments are returned as an iterable of (args, kwargs) tuples.
 
         :param plugin: plugin name
         :type plugin: str
@@ -626,8 +647,11 @@ class ArgumentPluginManager(PluginManagerBase):
             )
 
     def load_arguments(self, argv, base=None):
+        # type: (typing.Iterable[str], argparse.ArgumentParser) -> argparse.Ar
         """
-        Process given argument list based on registered arguments and given
+        Process command line argument iterable.
+
+        Argument processing is based on registered arguments and given
         optional base :class:`argparse.ArgumentParser` instance.
 
         This method saves processed arguments on itself, and this state won't
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 9599648..874261f 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -48,7 +48,9 @@ def create_directory(path):
     if request.method == 'POST':
         path = utils.mkdir(directory.path, request.form['name'])
         base = current_app.config['DIRECTORY_BASE']
-        return redirect(url_for('browse', path=abspath_to_urlpath(path, base)))
+        return redirect(
+            url_for('browsepy.browse', path=abspath_to_urlpath(path, base))
+            )
 
     return render_template(
         'create_directory.file_actions.html',
@@ -89,7 +91,7 @@ def selection(path):
 
         session['clipboard:mode'] = mode
         session['clipboard:items'] = clipboard
-        return redirect(url_for('browse', path=directory.urlpath))
+        return redirect(url_for('browsepy.browse', path=directory.urlpath))
 
     return stream_template(
         'selection.file_actions.html',
@@ -137,7 +139,7 @@ def clipboard_paste(path):
         session.pop('clipboard:mode', None)
         session.pop('clipboard:items', None)
 
-    return redirect(url_for('browse', path=directory.urlpath))
+    return redirect(url_for('browsepy.browse', path=directory.urlpath))
 
 
 @actions.route('/clipboard/clear', defaults={'path': ''})
@@ -146,7 +148,7 @@ def clipboard_clear(path):
     """Handle clear clipboard request."""
     session.pop('clipboard:mode', None)
     session.pop('clipboard:items', None)
-    return redirect(url_for('browse', path=path))
+    return redirect(url_for('browsepy.browse', path=path))
 
 
 @actions.errorhandler(FileActionsException)
diff --git a/browsepy/plugin/file_actions/templates/400.file_actions.html b/browsepy/plugin/file_actions/templates/400.file_actions.html
index 969458a..98910e1 100644
--- a/browsepy/plugin/file_actions/templates/400.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/400.file_actions.html
@@ -2,9 +2,15 @@
 
 {% set buttons %}
   {% if file %}
-    <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
+    <a
+      class="long button text"
+      href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
+      title="Go back">Accept</a>
   {% else %}
-    <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
+    <a
+      class="long button text"
+      href="{{ url_for('browsepy.index') }}"
+      title="Go home">Accept</a>
   {% endif %}
 {% endset %}
 
diff --git a/browsepy/plugin/file_actions/templates/create_directory.file_actions.html b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
index d0db9f2..2a82447 100644
--- a/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
@@ -8,7 +8,10 @@
 
 {% block styles %}
   {{ super() }}
-  <link rel="stylesheet" type="text/css" href="{{ url_for('file_actions.static', filename='style.css') }}"/>
+  <link
+    rel="stylesheet"
+    type="text/css"
+    href="{{ url_for('file_actions.static', filename='style.css') }}"/>
 {% endblock %}
 
 {% block scripts %}
@@ -23,7 +26,10 @@
       class="entry" placeholder="Directory name" type="text" name="name"
       pattern="{{ re_basename }}"/>
     <div class="group">
-      <a class="button text long" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
+      <a
+        class="button text long"
+        href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
+        title="Go back">Cancel</a>
       <input class="button text long suggested" type="submit" value="Accept" />
     </div>
   </form>
diff --git a/browsepy/plugin/file_actions/templates/selection.file_actions.html b/browsepy/plugin/file_actions/templates/selection.file_actions.html
index 593e210..a5a2190 100644
--- a/browsepy/plugin/file_actions/templates/selection.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/selection.file_actions.html
@@ -24,7 +24,10 @@
 {% block content %}
   <form method="post">
     <div class="group">
-      <a class="button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Cancel</a>
+      <a
+        class="button text"
+        href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
+        title="Go back">Cancel</a>
       {% if cut_support %}
         <input class="button text" type="submit" name="action-cut" value="Cut selected">
       {% endif %}
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 8360ed8..aaac6cb 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 
 import unittest
 import tempfile
@@ -9,8 +8,6 @@ import functools
 import bs4
 import flask
 
-from werkzeug.utils import cached_property
-
 import browsepy.compat as compat
 import browsepy.utils as utils
 import browsepy.plugin.file_actions as file_actions
@@ -20,6 +17,8 @@ import browsepy.manager as browsepy_manager
 import browsepy.exceptions as browsepy_exceptions
 import browsepy
 
+from browsepy.compat import cached_property
+
 
 class Page(object):
     def __init__(self, source):
@@ -232,6 +231,7 @@ class TestAction(unittest.TestCase):
         self.base = tempfile.mkdtemp()
         self.basename = os.path.basename(self.base)
         self.app = flask.Flask('browsepy')
+        self.app.register_blueprint(browsepy.blueprint)
         self.app.register_blueprint(self.module.actions)
         self.app.config.update(
             SECRET_KEY='secret',
@@ -243,7 +243,7 @@ class TestAction(unittest.TestCase):
             )
         self.app.add_url_rule(
             '/browse/<path:path>',
-            endpoint='browse',
+            endpoint='browsepy.browse',
             view_func=lambda path: None
             )
 
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 4fd9418..33658ef 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -1,7 +1,6 @@
 """Playable file classes."""
 
-from werkzeug.utils import cached_property
-
+from browsepy.compat import cached_property
 from browsepy.file import Node, File, Directory
 
 
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 5f301cf..926851b 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -292,14 +292,9 @@ class TestBlueprint(TestPlayerBase):
             'templates',
             )
         app.config['DIRECTORY_BASE'] = tempfile.mkdtemp()
+        app.register_blueprint(browsepy.blueprint)
         app.register_blueprint(self.module.player)
 
-        @app.route("/browse", defaults={"path": ""}, endpoint='browse')
-        @app.route('/browse/<path:path>', endpoint='browse')
-        @app.route('/open/<path:path>', endpoint='open')
-        def dummy(path):
-            pass
-
     def url_for(self, endpoint, **kwargs):
         with self.app.app_context():
             return flask.url_for(endpoint, **kwargs)
diff --git a/browsepy/templates/400.html b/browsepy/templates/400.html
index 52119a1..9ee13d5 100644
--- a/browsepy/templates/400.html
+++ b/browsepy/templates/400.html
@@ -7,9 +7,9 @@
 
 {% set buttons %}
   {% if file %}
-    <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
+    <a class="long button text" href="{{ url_for('browsepy.browse', path=file.urlpath) }}" title="Go back">Accept</a>
   {% else %}
-    <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
+    <a class="long button text" href="{{ url_for('browsepy.index') }}" title="Go home">Accept</a>
   {% endif %}
 {% endset %}
 
diff --git a/browsepy/templates/404.html b/browsepy/templates/404.html
index 3165b63..fd8fda7 100644
--- a/browsepy/templates/404.html
+++ b/browsepy/templates/404.html
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block content %}
-  <img src="{{ url_for('static', filename='giorgio.jpg') }}" alt=""/>
+  <img src="{{ url_for('browsepy.static', filename='giorgio.jpg') }}" alt=""/>
   <p>The resource you're looking for is not available.</p>
-  <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
+  <a class="long button text" href="{{ url_for('browsepy.index') }}" title="Go home">Accept</a>
 {% endblock %}
diff --git a/browsepy/templates/base.html b/browsepy/templates/base.html
index 62b85cc..967da18 100644
--- a/browsepy/templates/base.html
+++ b/browsepy/templates/base.html
@@ -1,5 +1,5 @@
 {% macro breadcrumb(file) -%}
-  <a href="{{ url_for('browse', path=file.urlpath) }}"
+  <a href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
      {% if file.is_root %}class="root"{% endif %}
      >{{ file.name }}</a>
 {%- endmacro %}
@@ -24,17 +24,31 @@
   <meta name="viewport" content="width=device-width, user-scalable=no"/>
   <title>{% block title %}{{ config.get('APPLICATION_NAME', 'browsepy') }}{% endblock %}</title>
   {% block styles %}
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='base.css') }}"/>
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="{{ url_for('browsepy.static', filename='base.css') }}">
     {% block icon %}
       {% for i in (57, 60, 72, 76, 114, 120, 144, 152, 180) %}
-        <link rel="apple-touch-icon" sizes="{{ i }}x{{ i }}" href="{{ url_for('static', filename='icon/apple-icon-{0}x{0}.png'.format(i)) }}">
+        <link
+          rel="apple-touch-icon"
+          sizes="{{ i }}x{{ i }}"
+          href="{{ url_for('browsepy.static', filename='icon/apple-icon-{0}x{0}.png'.format(i)) }}">
       {% endfor %}
       {% for i in (192, 96, 32, 16) %}
-        <link rel="icon" type="image/png" sizes="{{ i }}x{{ i }}" href="{{ url_for('static', filename='icon/android-icon-{0}x{0}.png'.format(i)) }}">
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="{{ i }}x{{ i }}"
+          href="{{ url_for('browsepy.static', filename='icon/android-icon-{0}x{0}.png'.format(i)) }}">
       {% endfor %}
-      <link rel="manifest" href="{{ url_for('metadata', filename='manifest.json') }}">
+      <link
+        rel="manifest"
+        href="{{ url_for('browsepy.metadata', filename='manifest.json') }}">
       <meta name="msapplication-TileColor" content="#ffffff">
-      <meta name="msapplication-TileImage" content="{{ url_for('static', filename='icon/ms-icon-144x144.png') }}">
+      <meta
+        name="msapplication-TileImage"
+        content="{{ url_for('browsepy.static', filename='icon/ms-icon-144x144.png') }}">
       <meta name="theme-color" content="#ffffff">
     {% endblock %}
   {% endblock %}
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index 0713611..bb7d531 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -50,7 +50,7 @@
     {% set prop = property_desc if sort_property == property else property %}
     {% set active = ' active' if sort_property in (property, property_desc) else '' %}
     {% set desc = ' desc' if sort_property == property_desc else '' %}
-    <a href="{{ url_for('sort', path=urlpath, property=prop) }}"
+    <a href="{{ url_for('browsepy.sort', path=urlpath, property=prop) }}"
        class="{{type}} sorting{{active}}{{desc}}"
        >{{ text }}</a>
   {% else %}
diff --git a/browsepy/templates/browserconfig.xml b/browsepy/templates/browserconfig.xml
index e416410..206bfc5 100644
--- a/browsepy/templates/browserconfig.xml
+++ b/browsepy/templates/browserconfig.xml
@@ -2,9 +2,9 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square70x70logo src="{{ url_for('static', filename='icon/ms-icon-70x70.png') }}"/>
-            <square150x150logo src="{{ url_for('static', filename='icon/ms-icon-150x150.png') }}"/>
-            <square310x310logo src="{{ url_for('static', filename='icon/ms-icon-310x310.png') }}"/>
+            <square70x70logo src="{{ url_for('browsepy.static', filename='icon/ms-icon-70x70.png') }}"/>
+            <square150x150logo src="{{ url_for('browsepy.static', filename='icon/ms-icon-150x150.png') }}"/>
+            <square310x310logo src="{{ url_for('browsepy.static', filename='icon/ms-icon-310x310.png') }}"/>
             <TileColor>#ffffff</TileColor>
         </tile>
     </msapplication>
diff --git a/browsepy/templates/manifest.json b/browsepy/templates/manifest.json
index c0fecd3..48e3645 100644
--- a/browsepy/templates/manifest.json
+++ b/browsepy/templates/manifest.json
@@ -2,37 +2,37 @@
     "name": "{{ config.get('APPLICATION_NAME', 'browsepy') }}",
     "icons": [
         {
-            "src": "{{ url_for('static', filename='icon/android-icon-36x36.png') }}",
+            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-36x36.png') }}",
             "sizes": "36x36",
             "type": "image/png",
             "density": "0.75"
         },
         {
-            "src": "{{ url_for('static', filename='icon/android-icon-48x48.png') }}",
+            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-48x48.png') }}",
             "sizes": "48x48",
             "type": "image/png",
             "density": "1.0"
         },
         {
-            "src": "{{ url_for('static', filename='icon/android-icon-72x72.png') }}",
+            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-72x72.png') }}",
             "sizes": "72x72",
             "type": "image/png",
             "density": "1.5"
         },
         {
-            "src": "{{ url_for('static', filename='icon/android-icon-96x96.png') }}",
+            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-96x96.png') }}",
             "sizes": "96x96",
             "type": "image/png",
             "density": "2.0"
         },
         {
-            "src": "{{ url_for('static', filename='icon/android-icon-144x144.png') }}",
+            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-144x144.png') }}",
             "sizes": "144x144",
             "type": "image/png",
             "density": "3.0"
         },
         {
-            "src": "{{ url_for('static', filename='icon/android-icon-192x192.png') }}",
+            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-192x192.png') }}",
             "sizes": "192x192",
             "type": "image/png",
             "density": "4.0"
diff --git a/browsepy/templates/remove.html b/browsepy/templates/remove.html
index 8f953e5..3b234f4 100644
--- a/browsepy/templates/remove.html
+++ b/browsepy/templates/remove.html
@@ -8,7 +8,11 @@
 {% block content %}
   <p>Do you really want to remove this {% if file.is_directory %}directory{% else %}file{% endif %}?</p>
   <form method="post" class="group">
-    <a class="long button text" href="{{ url_for('browse', path=file.parent.urlpath) }}" title="Go back">Cancel</a>
+    <a
+      class="long button text"
+      href="{{ url_for('browsepy.browse', path=file.parent.urlpath) }}"
+      title="Go back"
+      >Cancel</a>
     <input class="long button destructive text" type="submit" value="Yes" />
   </form>
 {% endblock %}
diff --git a/browsepy/tests/test_compat.py b/browsepy/tests/test_compat.py
index db2d701..2e47adc 100644
--- a/browsepy/tests/test_compat.py
+++ b/browsepy/tests/test_compat.py
@@ -1,10 +1,11 @@
+
 import unittest
 import re
 
-from werkzeug.utils import cached_property
-
 import browsepy.compat
 
+from browsepy.compat import cached_property
+
 
 class TestCompat(unittest.TestCase):
     module = browsepy.compat
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index 46944f3..d3d1080 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -203,12 +203,16 @@ class TestApp(unittest.TestCase):
             )
 
         self.base_directories = [
-            self.url_for('browse', path='remove'),
-            self.url_for('browse', path='start'),
-            self.url_for('browse', path='upload'),
+            self.url_for('browsepy.browse', path='remove'),
+            self.url_for('browsepy.browse', path='start'),
+            self.url_for('browsepy.browse', path='upload'),
+            ]
+        self.start_files = [
+            self.url_for('browsepy.open', path='start/testfile.txt'),
+            ]
+        self.remove_files = [
+            self.url_for('browsepy.open', path='remove/testfile.txt'),
             ]
-        self.start_files = [self.url_for('open', path='start/testfile.txt')]
-        self.remove_files = [self.url_for('open', path='remove/testfile.txt')]
         self.upload_files = []
 
     def clear(self, path):
@@ -229,13 +233,13 @@ class TestApp(unittest.TestCase):
     def get(self, endpoint, **kwargs):
         status_code = kwargs.pop('status_code', 200)
         follow_redirects = kwargs.pop('follow_redirects', False)
-        if endpoint in ('index', 'browse'):
+        if endpoint in ('browsepy.index', 'browsepy.browse'):
             page_class = self.list_page_class
-        elif endpoint == 'remove':
+        elif endpoint == 'browsepy.remove':
             page_class = self.confirm_page_class
-        elif endpoint == 'sort' and follow_redirects:
+        elif endpoint == 'browsepy.sort' and follow_redirects:
             page_class = self.list_page_class
-        elif endpoint == 'download_directory':
+        elif endpoint == 'browsepy.download_directory':
             page_class = self.directory_download_class
         else:
             page_class = self.generic_page_class
@@ -279,7 +283,7 @@ class TestApp(unittest.TestCase):
             return flask.url_for(endpoint, _external=False, **kwargs)
 
     def test_index(self):
-        page = self.get('index')
+        page = self.get('browsepy.index')
         self.assertEqual(page.path, '%s/start' % os.path.basename(self.base))
 
         start = os.path.abspath(os.path.join(self.base, '..'))
@@ -287,32 +291,32 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'index'
+            self.get, 'browsepy.index'
             )
 
         self.app.config['DIRECTORY_START'] = self.start
 
     def test_browse(self):
         basename = os.path.basename(self.base)
-        page = self.get('browse')
+        page = self.get('browsepy.browse')
         self.assertEqual(page.path, basename)
         self.assertEqual(page.directories, self.base_directories)
         self.assertFalse(page.removable)
         self.assertFalse(page.upload)
 
-        page = self.get('browse', path='start')
+        page = self.get('browsepy.browse', path='start')
         self.assertEqual(page.path, '%s/start' % basename)
         self.assertEqual(page.files, self.start_files)
         self.assertFalse(page.removable)
         self.assertFalse(page.upload)
 
-        page = self.get('browse', path='remove')
+        page = self.get('browsepy.browse', path='remove')
         self.assertEqual(page.path, '%s/remove' % basename)
         self.assertEqual(page.files, self.remove_files)
         self.assertTrue(page.removable)
         self.assertFalse(page.upload)
 
-        page = self.get('browse', path='upload')
+        page = self.get('browsepy.browse', path='upload')
         self.assertEqual(page.path, '%s/upload' % basename)
         self.assertEqual(page.files, self.upload_files)
         self.assertFalse(page.removable)
@@ -320,24 +324,24 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browse', path='..'
+            self.get, 'browsepy.browse', path='..'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browse', path='start/testfile.txt'
+            self.get, 'browsepy.browse', path='start/testfile.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browse', path='exclude'
+            self.get, 'browsepy.browse', path='exclude'
             )
 
         self.app.config['DIRECTORY_DOWNLOADABLE'] = True
-        page = self.get('browse')
+        page = self.get('browsepy.browse')
         self.assertTrue(page.tarfile)
         self.app.config['DIRECTORY_DOWNLOADABLE'] = False
-        page = self.get('browse')
+        page = self.get('browsepy.browse')
         self.assertFalse(page.tarfile)
 
     def test_open(self):
@@ -345,12 +349,12 @@ class TestApp(unittest.TestCase):
         with open(os.path.join(self.start, 'testfile3.txt'), 'wb') as f:
             f.write(content)
 
-        page = self.get('open', path='start/testfile3.txt')
+        page = self.get('browsepy.open', path='start/testfile3.txt')
         self.assertEqual(page.data, content)
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'open', path='../shall_not_pass.txt'
+            self.get, 'browsepy.open', path='../shall_not_pass.txt'
             )
 
     def test_remove(self):
@@ -358,46 +362,49 @@ class TestApp(unittest.TestCase):
 
         basename = os.path.basename(self.base)
 
-        page = self.get('remove', path='remove/testfile2.txt')
+        page = self.get('browsepy.remove', path='remove/testfile2.txt')
         self.assertEqual(page.path, '%s/remove/testfile2.txt' % basename)
-        self.assertEqual(page.back, self.url_for('browse', path='remove'))
+        self.assertEqual(
+            page.back,
+            self.url_for('browsepy.browse', path='remove'),
+            )
 
-        page = self.post('remove', path='remove/testfile2.txt')
+        page = self.post('browsepy.remove', path='remove/testfile2.txt')
         self.assertEqual(page.path, '%s/remove' % basename)
         self.assertEqual(page.files, self.remove_files)
 
         os.mkdir(os.path.join(self.remove, 'directory'))
-        page = self.post('remove', path='remove/directory')
+        page = self.post('browsepy.remove', path='remove/directory')
         self.assertEqual(page.path, '%s/remove' % basename)
         self.assertEqual(page.files, self.remove_files)
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'remove', path='start/testfile.txt'
+            self.get, 'browsepy.remove', path='start/testfile.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.post, 'remove', path='start/testfile.txt'
+            self.post, 'browsepy.remove', path='start/testfile.txt'
             )
 
         self.app.config['DIRECTORY_REMOVE'] = None
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'remove', path='remove/testfile.txt'
+            self.get, 'browsepy.remove', path='remove/testfile.txt'
             )
 
         self.app.config['DIRECTORY_REMOVE'] = self.remove
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'remove', path='../shall_not_pass.txt'
+            self.get, 'browsepy.remove', path='../shall_not_pass.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'remove', path='exclude/testfile.txt'
+            self.get, 'browsepy.remove', path='exclude/testfile.txt'
             )
 
     def test_download_file(self):
@@ -406,24 +413,24 @@ class TestApp(unittest.TestCase):
 
         with open(binfile, 'wb') as f:
             f.write(bindata)
-        page = self.get('download_file', path='testfile.bin')
+        page = self.get('browsepy.download_file', path='testfile.bin')
         os.remove(binfile)
 
         self.assertEqual(page.data, bindata)
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'download_file', path='../shall_not_pass.txt'
+            self.get, 'browsepy.download_file', path='../shall_not_pass.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'download_file', path='start'
+            self.get, 'browsepy.download_file', path='start'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'download_file', path='exclude/testfile.txt'
+            self.get, 'browsepy.download_file', path='exclude/testfile.txt'
             )
 
     def test_download_directory(self):
@@ -438,7 +445,7 @@ class TestApp(unittest.TestCase):
 
         self.app.config['EXCLUDE_FNC'] = None
 
-        response = self.get('download_directory', path='start')
+        response = self.get('browsepy.download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
         self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(response.encoding, 'gzip')
@@ -449,7 +456,7 @@ class TestApp(unittest.TestCase):
 
         self.app.config['EXCLUDE_FNC'] = lambda p: p.endswith('.exc')
 
-        response = self.get('download_directory', path='start')
+        response = self.get('browsepy.download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
         self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(response.encoding, 'gzip')
@@ -462,12 +469,14 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'download_directory', path='../../shall_not_pass'
+            self.get, 'browsepy.download_directory',
+            path='../../shall_not_pass',
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'download_directory', path='exclude'
+            self.get, 'browsepy.download_directory',
+            path='exclude',
             )
 
     def test_upload(self):
@@ -480,7 +489,7 @@ class TestApp(unittest.TestCase):
             'testfile.bin': genbytesio(255, 'utf-8'),
             }
         output = self.post(
-            'upload',
+            'browsepy.upload',
             path='upload',
             data={
                 'file%d' % n: (data, name)
@@ -488,7 +497,7 @@ class TestApp(unittest.TestCase):
                 }
             )
         expected_links = sorted(
-            self.url_for('open', path='upload/%s' % i)
+            self.url_for('browsepy.open', path='upload/%s' % i)
             for i in files
             )
         self.assertEqual(sorted(output.files), expected_links)
@@ -496,7 +505,7 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.post, 'upload', path='start', data={
+            self.post, 'browsepy.upload', path='start', data={
                 'file': (genbytesio(127, 'ascii'), 'testfile.txt')
                 }
             )
@@ -509,7 +518,7 @@ class TestApp(unittest.TestCase):
             ('testfile.txt', 'something_new'),
             )
         output = self.post(
-            'upload',
+            'browsepy.upload',
             path='upload',
             data={
                'file%d' % n: (io.BytesIO(data.encode('ascii')), name)
@@ -519,7 +528,10 @@ class TestApp(unittest.TestCase):
 
         self.assertEqual(len(files), len(output.files))
 
-        first_file_url = self.url_for('open', path='upload/%s' % files[0][0])
+        first_file_url = self.url_for(
+            'browsepy.open',
+            path='upload/%s' % files[0][0]
+            )
         self.assertIn(first_file_url, output.files)
 
         file_contents = []
@@ -542,7 +554,7 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page400Exception,
-            self.post, 'upload', path='upload', data={
+            self.post, 'browsepy.upload', path='upload', data={
                 'file': (io.BytesIO('test'.encode('ascii')), longname + 'a')
                 }
             )
@@ -556,14 +568,14 @@ class TestApp(unittest.TestCase):
         os.makedirs(longpath)
         self.assertRaises(
             Page400Exception,
-            self.post, 'upload', path='upload/' + '/'.join(subdirs), data={
+            self.post, 'browsepy.upload', path='upload/' + '/'.join(subdirs), data={
                 'file': (io.BytesIO('test'.encode('ascii')), longname)
                 }
             )
 
         self.assertRaises(
             Page400Exception,
-            self.post, 'upload', path='upload', data={
+            self.post, 'browsepy.upload', path='upload', data={
                 'file': (io.BytesIO('test'.encode('ascii')), '..')
                 }
             )
@@ -572,7 +584,7 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'sort', property='text', path='exclude'
+            self.get, 'browsepy.sort', property='text', path='exclude'
             )
 
         files = {
@@ -581,19 +593,19 @@ class TestApp(unittest.TestCase):
             'c.zip': 'a'
             }
         by_name = [
-            self.url_for('open', path=name)
+            self.url_for('browsepy.open', path=name)
             for name in sorted(files)
             ]
         by_name_desc = list(reversed(by_name))
 
         by_type = [
-            self.url_for('open', path=name)
+            self.url_for('browsepy.open', path=name)
             for name in sorted(files, key=lambda x: mimetypes.guess_type(x)[0])
             ]
         by_type_desc = list(reversed(by_type))
 
         by_size = [
-            self.url_for('open', path=name)
+            self.url_for('browsepy.open', path=name)
             for name in sorted(files, key=lambda x: len(files[x]))
             ]
         by_size_desc = list(reversed(by_size))
@@ -604,43 +616,43 @@ class TestApp(unittest.TestCase):
                 f.write(content.encode('ascii'))
 
         with self.app.test_client() as client:
-            page = self.get('browse', client=client)
+            page = self.get('browsepy.browse', client=client)
             self.assertListEqual(page.files, by_name)
 
             self.assertRaises(
                 Page302Exception,
-                self.get, 'sort', property='text', client=client
+                self.get, 'browsepy.sort', property='text', client=client
                 )
 
-            page = self.get('browse', client=client)
+            page = self.get('browsepy.browse', client=client)
             self.assertListEqual(page.files, by_name)
 
-            page = self.get('sort', property='-text', client=client,
+            page = self.get('browsepy.sort', property='-text', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_name_desc)
 
-            page = self.get('sort', property='type', client=client,
+            page = self.get('browsepy.sort', property='type', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_type)
 
-            page = self.get('sort', property='-type', client=client,
+            page = self.get('browsepy.sort', property='-type', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_type_desc)
 
-            page = self.get('sort', property='size', client=client,
+            page = self.get('browsepy.sort', property='size', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_size)
 
-            page = self.get('sort', property='-size', client=client,
+            page = self.get('browsepy.sort', property='-size', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_size_desc)
 
             # Cannot to test modified sorting due filesystem time resolution
-            page = self.get('sort', property='modified', client=client,
-                            follow_redirects=True)
+            page = self.get('browsepy.sort', property='modified',
+                            client=client, follow_redirects=True)
 
-            page = self.get('sort', property='-modified', client=client,
-                            follow_redirects=True)
+            page = self.get('browsepy.sort', property='-modified',
+                            client=client, follow_redirects=True)
 
     def test_sort_cookie_size(self):
         files = [chr(i) * 150 for i in range(97, 123)]
@@ -650,8 +662,13 @@ class TestApp(unittest.TestCase):
 
         with self.app.test_client() as client:
             for name in files:
-                page = self.get('sort', property='modified', path=name,
-                                client=client, status_code=302)
+                page = self.get(
+                    'browsepy.sort',
+                    property='modified',
+                    path=name,
+                    client=client,
+                    status_code=302,
+                    )
 
                 for cookie in page.response.headers.getlist('set-cookie'):
                     if cookie.startswith('browse-sorting='):
diff --git a/browsepy/transform/compress.py b/browsepy/transform/compress.py
index 2c0ce0b..d742d92 100755
--- a/browsepy/transform/compress.py
+++ b/browsepy/transform/compress.py
@@ -10,10 +10,14 @@ from . import StateMachine
 
 
 class Context(object):
+    """Compression context stub class."""
+
     def feed(self, token):
+        """Add token to context an yield tokens."""
         yield token
 
     def finish(self):
+        """Finish context and yield tokens."""
         return
         yield
 
@@ -133,6 +137,7 @@ class TemplateCompress(jinja2.ext.Extension):
         }
 
     def get_context(self, filename=None):
+        """Get compression context bassed on given filename."""
         if filename:
             for extension, context_class in self.context_classes.items():
                 if filename.endswith(extension):
diff --git a/requirements.txt b/requirements.txt
index 5968891..fc0c4c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,16 +11,16 @@
 # Requirement file inheritance tree
 # ---------------------------------
 #
-# - requirements.txt
-#   - requirements/development.txt
-#     - requirements/base.txt
+#   requirements.txt
+#   └ requirements/development.txt
+#     └ requirements/base.txt
 #
 # See also
 # --------
 #
-# - requirements/ci.txt
+# - requirements/base.txt
 # - requirements/development.txt
+# - requirements/doc.txt
 #
 
 -r requirements/development.txt
-
diff --git a/requirements/base.txt b/requirements/base.txt
index e7eddbf..be3d2b6 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -10,6 +10,7 @@
 #
 # - requirements.txt
 # - requirements/development.txt
+# - requirements/doc.txt
 #
 
 six
diff --git a/requirements/development.txt b/requirements/development.txt
index 1acbc38..cb29aee 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -10,14 +10,14 @@
 # Requirement file inheritance tree
 # ---------------------------------
 #
-# - requirements/development.txt
-#   - requirements/base.txt
+#   requirements/development.txt
+#   └ requirements/base.txt
 #
 # See also
 # --------
 #
 # - requirements.txt
-# - requirements/ci.txt
+# - requirements/doc.txt
 #
 
 -r base.txt
@@ -27,7 +27,6 @@ flake8
 yapf
 coverage
 jedi
-sphinx
 pycodestyle
 pydocstyle
 mypy
diff --git a/requirements/doc.txt b/requirements/doc.txt
index 910ecb5..52012c7 100644
--- a/requirements/doc.txt
+++ b/requirements/doc.txt
@@ -10,14 +10,15 @@
 # Requirement file inheritance tree
 # ---------------------------------
 #
-# - requirements/doc.txt
-#   - requirements/base.txt
+#   requirements/doc.txt
+#   └ requirements/base.txt
 #
 # See also
 # --------
 #
 # - requirements.txt
-# - requirements/ci.txt
+# - requirements/development.txt
+# - requirements/doc.txt
 #
 
 -r base.txt
-- 
GitLab


From 0a554246d96c4b880e1742d0237f9b9827d227be Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Mon, 23 Dec 2019 18:00:14 +0000
Subject: [PATCH 155/171] update changelog

---
 CHANGELOG | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 64b0a73..fcf33a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
 ### Added
 - Plugin discovery.
 - New plugin file-actions providing copy/cut/paste and directory creation.
-- Smart cookie-baked sessions.
+- Smart cookie-based sessions.
 - Directory browsing cache headers.
 - Favicon statics and metadata.
 
@@ -12,6 +12,9 @@
 - Base directory is downloadable now.
 - Directory entries stats are retrieved first and foremost.
 
+### Breaking changes
+- All browsepy routes are now under browsepy.
+
 ### Removed
 - Python 2.7, 3.3 and 3.4 support have been dropped.
 
-- 
GitLab


From 2a152c7e9ed1b59c283ad2248f5d136c66c4bac4 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Tue, 24 Dec 2019 13:59:14 +0000
Subject: [PATCH 156/171] fixes

---
 browsepy/__init__.py                  |   5 +-
 browsepy/appconfig.py                 |  13 +-
 browsepy/manager.py                   | 167 +++++++++++++++-----------
 browsepy/plugin/file_actions/tests.py |  31 ++---
 browsepy/plugin/player/tests.py       |  83 +++++--------
 browsepy/tests/__init__.py            |   1 +
 browsepy/tests/test_code.py           |  12 +-
 browsepy/tests/test_extensions.py     |  10 +-
 browsepy/tests/test_plugins.py        |  26 ++--
 browsepy/transform/__init__.py        |   2 +-
 browsepy/transform/compress.py        |   7 +-
 11 files changed, 180 insertions(+), 177 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 1b33cee..9589629 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -75,7 +75,7 @@ def init_config():
 
 
 @create_app.register
-def init_plugin_manager():
+def init_plugins():
     """Configure plugin manager."""
     current_app.session_interface = cookieman.CookieMan()
     plugin_manager = PluginManager()
@@ -131,8 +131,7 @@ def init_error_handlers():
 @blueprint.url_defaults
 def default_directory_download_extension(endpoint, values):
     """Set default extension for download_directory endpoint."""
-    print(endpoint)
-    if endpoint == 'download_directory':
+    if endpoint == 'browsepy.download_directory':
         compression = current_app.config['DIRECTORY_TAR_COMPRESSION']
         values.setdefault('ext', tarfile_extension(compression))
 
diff --git a/browsepy/appconfig.py b/browsepy/appconfig.py
index 8061f08..1a7326a 100644
--- a/browsepy/appconfig.py
+++ b/browsepy/appconfig.py
@@ -98,20 +98,25 @@ class CreateApp(object):
     """Flask create_app pattern factory."""
 
     flask_class = Flask
+    defaults = {
+        'static_folder': None,
+        'template_folder': None,
+        }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, import_name, **options):
         """
         Initialize.
 
         Arguments are passed to :class:`Flask` constructor.
         """
-        self.args = args
-        self.kwargs = kwargs
+        self.import_name = import_name
+        self.options = self.defaults.copy()
+        self.options.update(options)
         self.registry = []
 
     def __call__(self):  # type: () -> Flask
         """Create Flask app instance."""
-        app = self.flask_class(*self.args, **self.kwargs)
+        app = self.flask_class(self.import_name, **self.options)
         with app.app_context():
             for fnc in self.registry:
                 fnc()
diff --git a/browsepy/manager.py b/browsepy/manager.py
index e38e741..cbb45be 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -5,11 +5,13 @@ import pkgutil
 import argparse
 import functools
 import warnings
+import abc
 
 from cookieman import CookieMan
 
 from . import mimetype
 from . import compat
+from . import utils
 from . import file
 
 from .compat import typing, types, cached_property
@@ -18,11 +20,31 @@ from .exceptions import PluginNotFoundError, InvalidArgumentError, \
                         WidgetParameterException
 
 
+class RegisterPluginModule(abc.ABC):
+    @classmethod
+    def __subclasshook__(cls, module):
+        return (
+            isinstance(module, types.ModuleType) and
+            callable(getattr(module, 'register_plugin'))
+            )
+
+
+class RegisterArgumentsModule(abc.ABC):
+    @classmethod
+    def __subclasshook__(cls, module):
+        return (
+            isinstance(module, types.ModuleType) and
+            callable(getattr(module, 'register_arguments'))
+            )
+
+
 class PluginManagerBase(object):
     """Base plugin manager with loading and Flask extension logic."""
 
     _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
+
     get_module = staticmethod(compat.import_module)
+    module_classes = ()  # type: typing.Tuple[type, ...]
 
     @property
     def namespaces(self):
@@ -42,8 +64,6 @@ class PluginManagerBase(object):
 
         :param app: flask application
         """
-        self.plugin_filters = []
-
         if app is None:
             self.clear()
         else:
@@ -56,7 +76,7 @@ class PluginManagerBase(object):
 
         :param app: flask application
         """
-        self.app = app
+        self.app = utils.solve_local(app)
         if not hasattr(app, 'extensions'):
             app.extensions = {}
         app.extensions['plugin_manager'] = self
@@ -111,17 +131,10 @@ class PluginManagerBase(object):
             except ImportError:
                 pass
 
-    def _iter_plugin_modules(self):
-        """
-        Iterate plugin modules.
-
-        This generator yields both full qualified name and short plugin
-        names.
-        """
+    def _iter_namespace_modules(self):
+        # type: () -> typing.Generator[typing.Tuple[str, str], None, None]
+        """Iterate module names under namespaces."""
         nameset = set()  # type: typing.Set[str]
-        shortset = set()  # type: typing.Set[str]
-        filters = self.plugin_filters
-        get_module_fnc = self.get_module
         for prefix in filter(None, self.namespaces):
             name_iter_fnc = (
                 self._iter_submodules
@@ -129,25 +142,37 @@ class PluginManagerBase(object):
                 self._iter_modules
                 )
             for name in name_iter_fnc(prefix):
-                if name in nameset:
-                    continue
-
-                try:
-                    module = get_module_fnc(name)
-                except ImportError:
-                    continue
+                if name not in nameset:
+                    nameset.add(name)
+                    yield prefix, name
 
-                if not any(f(module) for f in filters):
-                    continue
+    def _iter_plugin_modules(self):
+        """
+        Iterate plugin modules.
 
-                short = name[len(prefix):].lstrip('.').replace('_', '-')
+        This generator yields both full qualified name and short plugin
+        names.
+        """
+        shortset = set()  # type: typing.Set[str]
+        for namespace, name in self._iter_namespace_modules():
+            plugin = self._get_plugin_module(name)
+            if plugin:
+                short = name[len(namespace):].lstrip('.').replace('_', '-')
                 yield (
                     name,
                     None if short in shortset or '.' in short else short
                     )
-                nameset.add(name)
                 shortset.add(short)
 
+    def _get_plugin_module(self, name):
+        """Import plugin module from absolute name."""
+        try:
+            module = self.get_module(name)
+            return module if isinstance(module, self.module_classes) else None
+        except ImportError:
+            pass
+        return None
+
     @cached_property
     def available_plugins(self):
         # type: () -> typing.List[types.ModuleType]
@@ -172,12 +197,10 @@ class PluginManagerBase(object):
             for namespace in self.namespaces
             ]
         names = sorted(frozenset(names), key=names.index)
-        get_module_fnc = self.get_module
         for name in names:
-            try:
-                return get_module_fnc(name)
-            except ImportError:
-                pass
+            module = self._get_plugin_module(name)
+            if module:
+                return module
         raise PluginNotFoundError(
             'No plugin module %r found, tried %r' % (plugin, names),
             plugin, names)
@@ -201,12 +224,8 @@ class RegistrablePluginManager(PluginManagerBase):
     the plugin module level.
     """
 
-    def __init__(self, app=None):
-        """Initialize."""
-        super(RegistrablePluginManager, self).__init__(app)
-        self.plugin_filters.append(
-            lambda o: callable(getattr(o, 'register_plugin', None))
-            )
+    register_plugin_module_class = RegisterPluginModule
+    module_classes = (register_plugin_module_class,)
 
     def load_plugin(self, plugin):
         """
@@ -593,9 +612,13 @@ class ArgumentPluginManager(PluginManagerBase):
     and calls their respective :func:`register_arguments` module-level
     function.
     """
+
     _argparse_kwargs = {'add_help': False}
     _argparse_arguments = argparse.Namespace()
 
+    register_arguments_module_class = RegisterArgumentsModule
+    module_classes = (register_arguments_module_class,)
+
     @cached_property
     def _default_argument_parser(self):
         parser = compat.SafeArgumentParser()
@@ -603,13 +626,6 @@ class ArgumentPluginManager(PluginManagerBase):
         parser.add_argument('--help-all', action='store_true')
         return parser
 
-    def __init__(self, app=None):
-        """Initialize."""
-        super(ArgumentPluginManager, self).__init__(app)
-        self.plugin_filters.append(
-            lambda o: callable(getattr(o, 'register_arguments', None))
-            )
-
     def extract_plugin_arguments(self, plugin):
         """
         Extract registered argument pairs from given plugin name,
@@ -622,7 +638,7 @@ class ArgumentPluginManager(PluginManagerBase):
         :rtype: iterable
         """
         module = self.import_plugin(plugin)
-        if hasattr(module, 'register_arguments'):
+        if isinstance(module, self.register_arguments_class):
             manager = ArgumentPluginManager()
             module.register_arguments(manager)
             return manager._argparse_argkwargs
@@ -646,8 +662,30 @@ class ArgumentPluginManager(PluginManagerBase):
             epilog=epilog.strip(),
             )
 
-    def load_arguments(self, argv, base=None):
-        # type: (typing.Iterable[str], argparse.ArgumentParser) -> argparse.Ar
+    def _plugin_arguments(self, parser, options):
+        plugins = [
+            plugin
+            for plugins in options.plugin
+            for plugin in plugins.split(',')
+            ]
+
+        if options.help_all:
+            plugins.extend(
+                short if short else name
+                for name, short in self.available_plugins
+                if not (name in plugins or short in plugins)
+                )
+
+        for plugin in sorted(set(plugins), key=plugins.index):
+            arguments = self.extract_plugin_arguments(plugin)
+            if arguments:
+                yield plugin, arguments
+
+    def load_arguments(
+            self,
+            argv,  # type: typing.Iterable[str]
+            base=None,  # type: typing.Optional[argparse.ArgumentParser]
+            ):  # type: (...) -> argparse.Namespace
         """
         Process command line argument iterable.
 
@@ -661,9 +699,7 @@ class ArgumentPluginManager(PluginManagerBase):
         method.
 
         :param argv: command-line arguments (without command itself)
-        :type argv: iterable of str
         :param base: optional base :class:`argparse.ArgumentParser` instance.
-        :type base: argparse.ArgumentParser or None
         :returns: argparse.Namespace instance with processed arguments as
                   given by :meth:`argparse.ArgumentParser.parse_args`.
         :rtype: argparse.Namespace
@@ -671,27 +707,10 @@ class ArgumentPluginManager(PluginManagerBase):
         parser = self._plugin_argument_parser(base)
         options, _ = parser.parse_known_args(argv)
 
-        plugins = [
-            plugin
-            for plugins in options.plugin
-            for plugin in plugins.split(',')
-            ]
-
-        if options.help_all:
-            plugins.extend(
-                short if short else name
-                for name, short in self.available_plugins
-                if not (name in plugins or short in plugins)
-                )
-
-        for plugin in sorted(set(plugins), key=plugins.index):
-            arguments = self.extract_plugin_arguments(plugin)
-            if arguments:
-                group = parser.add_argument_group(
-                    '%s arguments' % plugin
-                    )
-                for argargs, argkwargs in arguments:
-                    group.add_argument(*argargs, **argkwargs)
+        for plugin, arguments in self._plugin_arguments(parser, options):
+            group = parser.add_argument_group('%s arguments' % plugin)
+            for argargs, argkwargs in arguments:
+                group.add_argument(*argargs, **argkwargs)
 
         if options.help or options.help_all:
             parser.print_help()
@@ -769,6 +788,18 @@ class PluginManager(BlueprintPluginManager,
     parameter, or instantiated directly and passed to :meth:`register_widget`
     via `widget` parameter.
     """
+
+    module_classes = sum((
+        parent.module_classes
+        for parent in (
+            BlueprintPluginManager,
+            ExcludePluginManager,
+            WidgetPluginManager,
+            MimetypePluginManager,
+            SessionPluginManager,
+            ArgumentPluginManager)
+        ), ())
+
     def clear(self):
         """
         Clear plugin manager state.
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index aaac6cb..8caa1bb 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -13,7 +13,6 @@ import browsepy.utils as utils
 import browsepy.plugin.file_actions as file_actions
 import browsepy.plugin.file_actions.exceptions as file_actions_exceptions
 import browsepy.file as browsepy_file
-import browsepy.manager as browsepy_manager
 import browsepy.exceptions as browsepy_exceptions
 import browsepy
 
@@ -62,25 +61,22 @@ class Page(object):
 
 class TestRegistration(unittest.TestCase):
     actions_module = file_actions
-    manager_module = browsepy_manager
     browsepy_module = browsepy
 
     def setUp(self):
         self.base = 'c:\\base' if os.name == 'nt' else '/base'
-        self.app = flask.Flask(self.__class__.__name__)
+        self.app = browsepy.create_app()
         self.app.config.update(
             DIRECTORY_BASE=self.base,
             EXCLUDE_FNC=None,
             )
+        self.manager = self.app.extensions['plugin_manager']
 
     def tearDown(self):
         utils.clear_flask_context()
 
     def test_register_plugin(self):
-        self.app.config.update(self.browsepy_module.app.config)
-        self.app.config['PLUGIN_NAMESPACES'] = ('browsepy.plugin',)
-        manager = self.manager_module.PluginManager(self.app)
-        manager.load_plugin('file-actions')
+        self.manager.load_plugin('file-actions')
         self.assertIn(
             self.actions_module.actions,
             self.app.blueprints.values()
@@ -91,7 +87,6 @@ class TestRegistration(unittest.TestCase):
             PLUGIN_MODULES=[],
             PLUGIN_NAMESPACES=[]
             )
-        manager = self.manager_module.PluginManager(self.app)
         self.assertNotIn(
             self.actions_module.actions,
             self.app.blueprints.values()
@@ -100,7 +95,7 @@ class TestRegistration(unittest.TestCase):
             PLUGIN_MODULES=['file-actions'],
             PLUGIN_NAMESPACES=['browsepy.plugin']
             )
-        manager.reload()
+        self.manager.reload()
         self.assertIn(
             self.actions_module.actions,
             self.app.blueprints.values()
@@ -109,13 +104,11 @@ class TestRegistration(unittest.TestCase):
 
 class TestIntegration(unittest.TestCase):
     actions_module = file_actions
-    manager_module = browsepy_manager
     browsepy_module = browsepy
 
     def setUp(self):
         self.base = tempfile.mkdtemp()
-        self.app = self.browsepy_module.app
-        self.original_config = dict(self.app.config)
+        self.app = browsepy.create_app()
         self.app.config.update(
             SECRET_KEY='secret',
             DIRECTORY_BASE=self.base,
@@ -230,21 +223,13 @@ class TestAction(unittest.TestCase):
     def setUp(self):
         self.base = tempfile.mkdtemp()
         self.basename = os.path.basename(self.base)
-        self.app = flask.Flask('browsepy')
-        self.app.register_blueprint(browsepy.blueprint)
-        self.app.register_blueprint(self.module.actions)
+        self.app = browsepy.create_app()
+        self.app.extensions['plugin_manager'].load_plugin('file_actions')
         self.app.config.update(
             SECRET_KEY='secret',
             DIRECTORY_BASE=self.base,
             DIRECTORY_UPLOAD=self.base,
             DIRECTORY_REMOVE=self.base,
-            EXCLUDE_FNC=None,
-            USE_BINARY_MULTIPLES=True,
-            )
-        self.app.add_url_rule(
-            '/browse/<path:path>',
-            endpoint='browsepy.browse',
-            view_func=lambda path: None
             )
 
         @self.app.errorhandler(browsepy_exceptions.InvalidPathError)
@@ -467,7 +452,7 @@ class TestException(unittest.TestCase):
     node_class = browsepy_file.Node
 
     def setUp(self):
-        self.app = flask.Flask('browsepy')
+        self.app = browsepy.create_app()
 
     def tearDown(self):
         utils.clear_flask_context()
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 926851b..d4cb524 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -15,7 +15,6 @@ import browsepy
 import browsepy.compat as compat
 import browsepy.utils as utils
 import browsepy.file as browsepy_file
-import browsepy.manager as browsepy_manager
 import browsepy.plugin.player as player
 import browsepy.plugin.player.playable as player_playable
 
@@ -61,12 +60,13 @@ class TestPlayerBase(unittest.TestCase):
 
     def setUp(self):
         self.base = 'c:\\base' if os.name == 'nt' else '/base'
-        self.app = flask.Flask(self.__class__.__name__)
+        self.app = browsepy.create_app()
         self.app.config.update(
+            PLUGIN_NAMESPACES=['browsepy.plugin'],
             DIRECTORY_BASE=self.base,
             SERVER_NAME='localhost',
             )
-        self.manager = ManagerMock()
+        self.manager = self.app.extensions['plugin_manager']
 
     def tearDown(self):
         utils.clear_flask_context()
@@ -74,47 +74,49 @@ class TestPlayerBase(unittest.TestCase):
 
 class TestPlayer(TestPlayerBase):
     def test_register_plugin(self):
-        self.module.register_plugin(self.manager)
-        self.assertListEqual(self.manager.arguments, [])
+        manager = ManagerMock()
+        self.module.register_plugin(manager)
+        self.assertListEqual(manager.arguments, [])
 
-        self.assertIn(self.module.player, self.manager.blueprints)
+        self.assertIn(self.module.player, manager.blueprints)
         self.assertIn(
             self.module.playable.detect_playable_mimetype,
-            self.manager.mimetype_functions
+            manager.mimetype_functions
             )
 
         widgets = [
             action['filename']
-            for action in self.manager.widgets
+            for action in manager.widgets
             if action['type'] == 'stylesheet'
             ]
         self.assertIn('css/browse.css', widgets)
 
-        actions = [action['endpoint'] for action in self.manager.widgets]
+        actions = [action['endpoint'] for action in manager.widgets]
         self.assertIn('player.static', actions)
         self.assertIn('player.audio', actions)
         self.assertIn('player.playlist', actions)
         self.assertNotIn('player.directory', actions)
 
     def test_register_plugin_with_arguments(self):
-        self.manager.argument_values['player_directory_play'] = True
-        self.module.register_plugin(self.manager)
+        manager = ManagerMock()
+        manager.argument_values['player_directory_play'] = True
+        self.module.register_plugin(manager)
 
-        actions = [action['endpoint'] for action in self.manager.widgets]
+        actions = [action['endpoint'] for action in manager.widgets]
         self.assertIn('player.directory', actions)
 
     def test_register_arguments(self):
-        self.module.register_arguments(self.manager)
-        self.assertEqual(len(self.manager.arguments), 1)
+        manager = ManagerMock()
+        self.module.register_arguments(manager)
+        self.assertEqual(len(manager.arguments), 1)
 
-        arguments = [arg[0][0] for arg in self.manager.arguments]
+        arguments = [arg[0][0] for arg in manager.arguments]
         self.assertIn('--player-directory-play', arguments)
 
 
 class TestIntegrationBase(TestPlayerBase):
     player_module = player
     browsepy_module = browsepy
-    manager_module = browsepy_manager
 
     def tearDown(self):
         utils.clear_flask_context()
@@ -125,48 +127,28 @@ class TestIntegration(TestIntegrationBase):
     directory_args = ['--plugin', 'player', '--player-directory-play']
 
     def test_register_plugin(self):
-        self.app.config.update(self.browsepy_module.app.config)
-        self.app.config['PLUGIN_NAMESPACES'] = ('browsepy.plugin',)
-        manager = self.manager_module.PluginManager(self.app)
-        manager.load_plugin('player')
+        self.manager.load_plugin('player')
         self.assertIn(self.player_module.player, self.app.blueprints.values())
 
     def test_register_arguments(self):
-        self.app.config.update(self.browsepy_module.app.config)
-        self.app.config['PLUGIN_NAMESPACES'] = ('browsepy.plugin',)
-
-        manager = self.manager_module.ArgumentPluginManager(self.app)
-        manager.load_arguments(self.non_directory_args)
-        self.assertFalse(manager.get_argument('player_directory_play'))
-        manager.load_arguments(self.directory_args)
-        self.assertTrue(manager.get_argument('player_directory_play'))
+        self.manager.load_arguments(self.non_directory_args)
+        self.assertFalse(self.manager.get_argument('player_directory_play'))
+        self.manager.load_arguments(self.directory_args)
+        self.assertTrue(self.manager.get_argument('player_directory_play'))
 
     def test_reload(self):
-        self.app.config.update(
-            PLUGIN_MODULES=['player'],
-            PLUGIN_NAMESPACES=['browsepy.plugin']
-            )
-        manager = self.manager_module.PluginManager(self.app)
-        manager.load_arguments(self.non_directory_args)
-        manager.reload()
+        self.app.config.update(PLUGIN_MODULES=['player'])
 
-        manager = self.manager_module.PluginManager(self.app)
-        manager.load_arguments(self.directory_args)
-        manager.reload()
+        self.manager.load_arguments(self.non_directory_args)
+        self.manager.reload()
+
+        self.manager.load_arguments(self.directory_args)
+        self.manager.reload()
 
 
 class TestPlayable(TestIntegrationBase):
     module = player_playable
 
-    def setUp(self):
-        super(TestPlayable, self).setUp()
-        self.manager = self.manager_module.PluginManager(
-            self.app
-            )
-        self.manager.register_mimetype_function(
-            self.player_module.playable.detect_playable_mimetype
-            )
-
     def test_normalize_playable_path(self):
         playable = self.module.PlayListFile(
             path=p(self.base, 'a.m3u'),
@@ -285,12 +267,7 @@ class TestPlayable(TestIntegrationBase):
 class TestBlueprint(TestPlayerBase):
     def setUp(self):
         super(TestBlueprint, self).setUp()
-        app = self.app
-        app.template_folder = os.path.join(
-            # FIXME: get a better way
-            os.path.dirname(browsepy.__path__),
-            'templates',
-            )
+        app = browsepy.create_app()
         app.config['DIRECTORY_BASE'] = tempfile.mkdtemp()
         app.register_blueprint(browsepy.blueprint)
         app.register_blueprint(self.module.player)
diff --git a/browsepy/tests/__init__.py b/browsepy/tests/__init__.py
index e69de29..d302269 100644
--- a/browsepy/tests/__init__.py
+++ b/browsepy/tests/__init__.py
@@ -0,0 +1 @@
+"""Browsepy test suite."""
diff --git a/browsepy/tests/test_code.py b/browsepy/tests/test_code.py
index 4e43de4..41c7944 100644
--- a/browsepy/tests/test_code.py
+++ b/browsepy/tests/test_code.py
@@ -20,23 +20,17 @@ class Rules:
 class CodeStyleTestCase(Rules, bases.CodeStyleTestCase):
     """TestCase checking :module:`pycodestyle`."""
 
-    pass
 
-
-class DocStyleTestCase(Rules, bases.DocStyleTestCase):
-    """TestCase checking :module:`pydocstyle`."""
-
-    pass
+# class DocStyleTestCase(Rules, bases.DocStyleTestCase):
+#     """TestCase checking :module:`pydocstyle`."""
 
 
 class MaintainabilityIndexTestCase(Rules, bases.MaintainabilityIndexTestCase):
     """TestCase checking :module:`radon` maintainability index."""
 
-    pass
-
 
 class CodeComplexityTestCase(Rules, bases.CodeComplexityTestCase):
     """TestCase checking :module:`radon` code complexity."""
 
     max_class_complexity = 7
-    max_function_complexity = 7
+    max_function_complexity = 10
diff --git a/browsepy/tests/test_extensions.py b/browsepy/tests/test_extensions.py
index 63621cf..202a312 100644
--- a/browsepy/tests/test_extensions.py
+++ b/browsepy/tests/test_extensions.py
@@ -8,14 +8,14 @@ import browsepy.transform.compress
 class TestHTMLCompress(unittest.TestCase):
     extension = browsepy.transform.compress.TemplateCompress
 
-    def setUp(self):
-        self.env = jinja2.Environment(
+    def render(self, html, **kwargs):
+        data = {'code.html': html}
+        env = jinja2.Environment(
             autoescape=True,
             extensions=[self.extension],
+            loader=jinja2.DictLoader(data),
             )
-
-    def render(self, html, **kwargs):
-        return self.env.from_string(html).render(**kwargs)
+        return env.get_template('code.html').render(**kwargs)
 
     def test_compress(self):
         html = self.render('''
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index cc877c6..ee28ae1 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -13,8 +13,20 @@ import browsepy.utils as utils
 import browsepy.compat as compat
 import browsepy.exceptions as exceptions
 
-from browsepy.plugin.player.tests import *  # noqa
-from browsepy.plugin.file_actions.tests import *  # noqa
+import browsepy.plugin.player.tests as test_player
+import browsepy.plugin.file_actions.tests as test_file_actions
+
+suites = {
+    'NestedPlayer': test_player,
+    'NestedFileActions': test_file_actions,
+    }
+
+globals().update(
+    ('%s%s' % (prefix, name), testcase)
+    for prefix, module in suites.items()
+    for name, testcase in vars(module).items()
+    if isinstance(testcase, type) and issubclass(testcase, unittest.TestCase)
+    )
 
 
 class FileMock(object):
@@ -53,17 +65,13 @@ class TestPlugins(unittest.TestCase):
     manager_module = browsepy.manager
 
     def setUp(self):
-        self.app = self.app_module.app
+        self.app = self.app_module.create_app()
         self.original_namespaces = self.app.config['PLUGIN_NAMESPACES']
-        self.plugin_namespace, self.plugin_name = __name__.rsplit('.', 1)
+        self.plugin_namespace = __package__
+        self.plugin_name = __name__
         self.app.config['PLUGIN_NAMESPACES'] = (self.plugin_namespace,)
         self.manager = self.manager_module.PluginManager(self.app)
 
-    def tearDown(self):
-        self.app.config['PLUGIN_NAMESPACES'] = self.original_namespaces
-        self.manager.clear()
-        utils.clear_flask_context()
-
     def test_manager_init(self):
         class App(object):
             config = {}
diff --git a/browsepy/transform/__init__.py b/browsepy/transform/__init__.py
index 25f46e0..25afd2b 100755
--- a/browsepy/transform/__init__.py
+++ b/browsepy/transform/__init__.py
@@ -99,7 +99,7 @@ class StateMachine(object):
 
         It is expected transformation logic makes use of :attr:`start`,
         :attr:`current` and :attr:`streaming` instance attributes to
-        bettee know the state is being left.
+        better know the state is being left.
 
         :param data: string to transform (includes start)
         :type data: str
diff --git a/browsepy/transform/compress.py b/browsepy/transform/compress.py
index d742d92..436d7a1 100755
--- a/browsepy/transform/compress.py
+++ b/browsepy/transform/compress.py
@@ -2,6 +2,7 @@
 
 import re
 
+import abc
 import jinja2
 import jinja2.ext
 import jinja2.lexer
@@ -9,20 +10,22 @@ import jinja2.lexer
 from . import StateMachine
 
 
-class Context(object):
+class Context(abc.ABC):
     """Compression context stub class."""
 
+    @abc.abstractmethod
     def feed(self, token):
         """Add token to context an yield tokens."""
         yield token
 
+    @abc.abstractmethod
     def finish(self):
         """Finish context and yield tokens."""
         return
         yield
 
 
-class CompressContext(Context, StateMachine):
+class CompressContext(StateMachine, Context):
     """Base jinja2 template token finite state machine."""
 
     token_class = jinja2.lexer.Token
-- 
GitLab


From 0724b775aa296c743c1b46d3ff75b1b7e196c9d0 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 25 Dec 2019 16:35:09 +0000
Subject: [PATCH 157/171] fixes

---
 browsepy/manager.py            | 35 ++++++++--------------------------
 browsepy/tests/test_plugins.py |  8 +++-----
 2 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/browsepy/manager.py b/browsepy/manager.py
index cbb45be..44b2c20 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -5,7 +5,6 @@ import pkgutil
 import argparse
 import functools
 import warnings
-import abc
 
 from cookieman import CookieMan
 
@@ -20,31 +19,13 @@ from .exceptions import PluginNotFoundError, InvalidArgumentError, \
                         WidgetParameterException
 
 
-class RegisterPluginModule(abc.ABC):
-    @classmethod
-    def __subclasshook__(cls, module):
-        return (
-            isinstance(module, types.ModuleType) and
-            callable(getattr(module, 'register_plugin'))
-            )
-
-
-class RegisterArgumentsModule(abc.ABC):
-    @classmethod
-    def __subclasshook__(cls, module):
-        return (
-            isinstance(module, types.ModuleType) and
-            callable(getattr(module, 'register_arguments'))
-            )
-
-
 class PluginManagerBase(object):
     """Base plugin manager with loading and Flask extension logic."""
 
     _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
 
     get_module = staticmethod(compat.import_module)
-    module_classes = ()  # type: typing.Tuple[type, ...]
+    plugin_module_methods = ()  # type: typing.Tuple[str, ...]
 
     @property
     def namespaces(self):
@@ -168,7 +149,9 @@ class PluginManagerBase(object):
         """Import plugin module from absolute name."""
         try:
             module = self.get_module(name)
-            return module if isinstance(module, self.module_classes) else None
+            for name in self.plugin_module_methods:
+                if callable(getattr(module, name, None)):
+                    return module
         except ImportError:
             pass
         return None
@@ -224,8 +207,7 @@ class RegistrablePluginManager(PluginManagerBase):
     the plugin module level.
     """
 
-    register_plugin_module_class = RegisterPluginModule
-    module_classes = (register_plugin_module_class,)
+    plugin_module_methods = ('register_plugin',)
 
     def load_plugin(self, plugin):
         """
@@ -616,8 +598,7 @@ class ArgumentPluginManager(PluginManagerBase):
     _argparse_kwargs = {'add_help': False}
     _argparse_arguments = argparse.Namespace()
 
-    register_arguments_module_class = RegisterArgumentsModule
-    module_classes = (register_arguments_module_class,)
+    plugin_module_methods = ('register_arguments',)
 
     @cached_property
     def _default_argument_parser(self):
@@ -789,8 +770,8 @@ class PluginManager(BlueprintPluginManager,
     via `widget` parameter.
     """
 
-    module_classes = sum((
-        parent.module_classes
+    plugin_module_methods = sum((
+        parent.plugin_module_methods
         for parent in (
             BlueprintPluginManager,
             ExcludePluginManager,
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index ee28ae1..d06e361 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -9,21 +9,20 @@ import flask
 
 import browsepy
 import browsepy.manager
-import browsepy.utils as utils
 import browsepy.compat as compat
 import browsepy.exceptions as exceptions
 
 import browsepy.plugin.player.tests as test_player
 import browsepy.plugin.file_actions.tests as test_file_actions
 
-suites = {
+nested_suites = {
     'NestedPlayer': test_player,
     'NestedFileActions': test_file_actions,
     }
 
 globals().update(
     ('%s%s' % (prefix, name), testcase)
-    for prefix, module in suites.items()
+    for prefix, module in nested_suites.items()
     for name, testcase in vars(module).items()
     if isinstance(testcase, type) and issubclass(testcase, unittest.TestCase)
     )
@@ -67,8 +66,7 @@ class TestPlugins(unittest.TestCase):
     def setUp(self):
         self.app = self.app_module.create_app()
         self.original_namespaces = self.app.config['PLUGIN_NAMESPACES']
-        self.plugin_namespace = __package__
-        self.plugin_name = __name__
+        self.plugin_namespace, self.plugin_name = __name__.rsplit('.', 1)
         self.app.config['PLUGIN_NAMESPACES'] = (self.plugin_namespace,)
         self.manager = self.manager_module.PluginManager(self.app)
 
-- 
GitLab


From 64b81c2d54e51a714d2663a6ee7a734bbc7dec4b Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Wed, 25 Dec 2019 17:51:00 +0000
Subject: [PATCH 158/171] test fixes

---
 browsepy/tests/test_module.py  | 71 ++++++++++++++--------------------
 browsepy/tests/test_plugins.py |  2 +-
 2 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index d3d1080..9cae3ee 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -13,7 +13,6 @@ import collections
 import flask
 import bs4
 
-from werkzeug.exceptions import NotFound
 from werkzeug.http import parse_options_header
 
 import browsepy
@@ -22,6 +21,7 @@ import browsepy.manager
 import browsepy.__main__
 import browsepy.compat as compat
 import browsepy.utils as utils
+import browsepy.exceptions as exceptions
 
 PY_LEGACY = compat.PY_LEGACY
 range = compat.range  # noqa
@@ -566,19 +566,20 @@ class TestApp(unittest.TestCase):
         longpath = os.path.join(self.upload, *subdirs)
 
         os.makedirs(longpath)
-        self.assertRaises(
-            Page400Exception,
-            self.post, 'browsepy.upload', path='upload/' + '/'.join(subdirs), data={
-                'file': (io.BytesIO('test'.encode('ascii')), longname)
-                }
-            )
 
-        self.assertRaises(
-            Page400Exception,
-            self.post, 'browsepy.upload', path='upload', data={
-                'file': (io.BytesIO('test'.encode('ascii')), '..')
-                }
-            )
+        with self.assertRaises(Page400Exception):
+            self.post(
+                'browsepy.upload',
+                path='upload/' + '/'.join(subdirs),
+                data={'file': (io.BytesIO('test'.encode('ascii')), longname)},
+                )
+
+        with self.assertRaises(Page400Exception):
+            self.post(
+                'browsepy.upload',
+                path='upload',
+                data={'file': (io.BytesIO('test'.encode('ascii')), '..')},
+                )
 
     def test_sort(self):
 
@@ -675,40 +676,24 @@ class TestApp(unittest.TestCase):
                         self.assertLessEqual(len(cookie), 4000)
 
     def test_endpoints(self):
-        # test endpoint function for the library use-case
-        # likely not to happen when serving due flask's routing protections
         with self.app.app_context():
-            self.assertIsInstance(
-                self.module.sort(property='name', path='..'),
-                NotFound
-                )
+            with self.assertRaises(exceptions.OutsideDirectoryBase):
+                self.module.sort(property='name', path='..')
 
-            self.assertIsInstance(
-                self.module.browse(path='..'),
-                NotFound
-                )
+            with self.assertRaises(exceptions.OutsideDirectoryBase):
+                self.module.browse(path='..')
 
-            self.assertIsInstance(
-                self.module.open_file(path='../something'),
-                NotFound
-                )
+            with self.assertRaises(exceptions.OutsideDirectoryBase):
+                self.module.open_file(path='../something')
 
-            self.assertIsInstance(
-                self.module.download_file(path='../something'),
-                NotFound
-                )
+            with self.assertRaises(exceptions.OutsideDirectoryBase):
+                self.module.download_file(path='../something')
 
-            self.assertIsInstance(
-                self.module.download_directory(path='..'),
-                NotFound
-                )
+            with self.assertRaises(exceptions.OutsideDirectoryBase):
+                self.module.download_directory(path='..', ext='tgz')
 
-            self.assertIsInstance(
-                self.module.remove(path='../something'),
-                NotFound
-                )
+            with self.assertRaises(exceptions.OutsideDirectoryBase):
+                self.module.remove(path='../something')
 
-            self.assertIsInstance(
-                self.module.upload(path='..'),
-                NotFound
-                )
+            with self.assertRaises(exceptions.OutsideDirectoryBase):
+                self.module.upload(path='..')
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index d06e361..f3088cb 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -119,7 +119,7 @@ class TestPlugins(unittest.TestCase):
         self.app.config['PLUGIN_NAMESPACES'] = (
             self.plugin_namespace + '.test_',
             )
-        self.assertTrue(self.manager.import_plugin('module'))
+        self.assertTrue(self.manager.import_plugin('plugins'))
         self.assertIn(
             (self.plugin_namespace + '.' + self.plugin_name, 'plugins'),
             self.manager.available_plugins,
-- 
GitLab


From b692e7e56b442d8335aa40c0c0167900f5865713 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 2 Jan 2020 16:08:31 +0000
Subject: [PATCH 159/171] drop py2, fixes

---
 .gitlab-ci.yml                                |   8 -
 .python-version                               |   2 +-
 CHANGELOG                                     |   3 -
 browsepy/__init__.py                          | 122 +++++++------
 browsepy/__main__.py                          |   6 +-
 browsepy/appconfig.py                         |  35 +++-
 browsepy/compat.py                            | 107 +-----------
 browsepy/file.py                              |  44 +++--
 browsepy/http.py                              |   7 +-
 browsepy/manager.py                           |  13 +-
 browsepy/mimetype.py                          |   2 +-
 browsepy/plugin/file_actions/__init__.py      |  10 +-
 .../templates/400.file_actions.html           |   4 +-
 .../create_directory.file_actions.html        |   2 +-
 .../templates/selection.file_actions.html     |   2 +-
 browsepy/plugin/file_actions/tests.py         |   3 -
 browsepy/plugin/file_actions/utils.py         |   1 -
 browsepy/plugin/player/playable.py            |  33 ++--
 browsepy/plugin/player/playlist.py            |   4 +-
 .../plugin/player/templates/audio.player.html |   4 +-
 browsepy/plugin/player/tests.py               | 165 ++++++++----------
 browsepy/stream.py                            |  12 +-
 browsepy/templates/400.html                   |   4 +-
 browsepy/templates/404.html                   |   4 +-
 browsepy/templates/base.html                  |  12 +-
 browsepy/templates/browse.html                |   2 +-
 browsepy/templates/browserconfig.xml          |   6 +-
 browsepy/templates/remove.html                |   2 +-
 browsepy/tests/test_app.py                    |   1 +
 browsepy/tests/test_compat.py                 |   6 +-
 browsepy/tests/test_file.py                   |  25 +--
 browsepy/tests/test_http.py                   |   1 -
 browsepy/tests/test_main.py                   |   2 +-
 browsepy/tests/test_module.py                 | 136 +++++++--------
 browsepy/tests/test_plugins.py                |  15 --
 browsepy/tests/test_transform.py              |  16 +-
 browsepy/tests/test_utils.py                  |   3 -
 browsepy/transform/glob.py                    |   2 +-
 requirements/base.txt                         |   3 -
 setup.py                                      |  25 +--
 40 files changed, 343 insertions(+), 511 deletions(-)
 delete mode 100644 browsepy/tests/test_utils.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08f1d91..95f8105 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,14 +58,6 @@ stages:
 
 # stage: tests
 
-python27:
-  extends: .test
-  image: python:2.7-alpine
-  before_script:
-  - |
-    apk add --no-cache build-base libffi-dev python2-dev
-    pip install coverage flake8
-
 python35:
   extends: .test
   image: python:3.5-alpine
diff --git a/.python-version b/.python-version
index c1e43e6..f280719 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.7.3
+3.8.1
diff --git a/CHANGELOG b/CHANGELOG
index fcf33a6..eb11059 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,9 +12,6 @@
 - Base directory is downloadable now.
 - Directory entries stats are retrieved first and foremost.
 
-### Breaking changes
-- All browsepy routes are now under browsepy.
-
 ### Removed
 - Python 2.7, 3.3 and 3.4 support have been dropped.
 
diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 9589629..1686632 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -2,19 +2,18 @@
 
 __version__ = '0.6.0'
 
+import typing
 import logging
 import os
 import os.path
 import time
 
-import flask
 import cookieman
 
 from flask import request, render_template, redirect, \
                   url_for, send_from_directory, \
                   current_app, session, abort
 
-from .compat import typing
 from .appconfig import CreateApp
 from .manager import PluginManager
 from .file import Node, secure_filename
@@ -26,20 +25,16 @@ from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
 from . import mimetype
 from . import compat
 
-logger = logging.getLogger(__name__)
-blueprint = flask.Blueprint(
-    'browsepy',
+create_app = CreateApp(
     __name__,
     static_folder='static',
     template_folder='templates',
     )
-create_app = CreateApp(__name__)
 
 
 @create_app.register
 def init_config():
     """Configure application."""
-    current_app.register_blueprint(blueprint)
     current_app.config.update(
         SECRET_KEY=os.urandom(4096),
         APPLICATION_NAME='browsepy',
@@ -67,12 +62,6 @@ def init_config():
     if 'BROWSEPY_SETTINGS' in os.environ:
         current_app.config.from_envvar('BROWSEPY_SETTINGS')
 
-    @current_app.before_first_request
-    def prepare():
-        config = current_app.config
-        if not config['APPLICATION_TIME']:
-            config['APPLICATION_TIME'] = time.time()
-
 
 @create_app.register
 def init_plugins():
@@ -91,51 +80,58 @@ def init_plugins():
         return data
 
 
-@create_app.register
-def init_globals():
-    """Configure application global environment."""
-    @current_app.context_processor
-    def template_globals():
-        return {
-            'manager': current_app.extensions['plugin_manager'],
-            'len': len,
-            }
+@create_app.before_first_request
+def prepare_config():
+    """Prepare runtime app config."""
+    config = current_app.config
+    if not config['APPLICATION_TIME']:
+        config['APPLICATION_TIME'] = time.time()
 
 
-@create_app.register
-def init_error_handlers():
-    """Configure app error handlers."""
-    @current_app.errorhandler(InvalidPathError)
-    def bad_request_error(e):
-        file = None
-        if hasattr(e, 'path'):
-            if isinstance(e, InvalidFilenameError):
-                file = Node(e.path)
-            else:
-                file = Node(e.path).parent
-        return render_template('400.html', file=file, error=e), 400
-
-    @current_app.errorhandler(OutsideRemovableBase)
-    @current_app.errorhandler(OutsideDirectoryBase)
-    @current_app.errorhandler(404)
-    def page_not_found_error(e):
-        return render_template('404.html'), 404
-
-    @current_app.errorhandler(Exception)
-    @current_app.errorhandler(500)
-    def internal_server_error(e):  # pragma: no cover
-        logger.exception(e)
-        return getattr(e, 'message', 'Internal server error'), 500
-
-
-@blueprint.url_defaults
+@create_app.context_processor
+def template_globals():
+    """Get template globals."""
+    return {
+        'manager': current_app.extensions['plugin_manager'],
+        'len': len,
+        }
+
+
+@create_app.url_defaults
 def default_directory_download_extension(endpoint, values):
     """Set default extension for download_directory endpoint."""
-    if endpoint == 'browsepy.download_directory':
+    if endpoint == 'download_directory':
         compression = current_app.config['DIRECTORY_TAR_COMPRESSION']
         values.setdefault('ext', tarfile_extension(compression))
 
 
+@create_app.errorhandler(InvalidPathError)
+def bad_request_error(e):
+    """Handle invalid requests errors, rendering HTTP 400 page."""
+    file = None
+    if hasattr(e, 'path'):
+        file = Node(e.path)
+        if not isinstance(e, InvalidFilenameError):
+            file = file.parent
+    return render_template('400.html', file=file, error=e), 400
+
+
+@create_app.errorhandler(OutsideRemovableBase)
+@create_app.errorhandler(OutsideDirectoryBase)
+@create_app.errorhandler(404)
+def page_not_found_error(e):
+    """Handle resource not found errors, rendering 404 error page."""
+    return render_template('404.html'), 404
+
+
+@create_app.errorhandler(Exception)
+@create_app.errorhandler(500)
+def internal_server_error(e):  # pragma: no cover
+    """Handle server errors, rendering 404 error page."""
+    current_app.logger.exception(e)
+    return getattr(e, 'message', 'Internal server error'), 500
+
+
 def get_cookie_browse_sorting(path, default):
     # type: (str, str) -> str
     """
@@ -198,8 +194,8 @@ def browse_sortkey_reverse(prop):
         )
 
 
-@blueprint.route('/sort/<string:property>', defaults={'path': ''})
-@blueprint.route('/sort/<string:property>/<path:path>')
+@create_app.route('/sort/<string:property>', defaults={'path': ''})
+@create_app.route('/sort/<string:property>/<path:path>')
 def sort(property, path):
     """Handle sort request, add sorting rule to session."""
     directory = Node.from_urlpath(path)
@@ -210,8 +206,8 @@ def sort(property, path):
     abort(404)
 
 
-@blueprint.route('/browse', defaults={'path': ''})
-@blueprint.route('/browse/<path:path>')
+@create_app.route('/browse', defaults={'path': ''})
+@create_app.route('/browse/<path:path>')
 def browse(path):
     """Handle browse request, serve directory listing."""
     sort_property = get_cookie_browse_sorting(path, 'text')
@@ -240,7 +236,7 @@ def browse(path):
     abort(404)
 
 
-@blueprint.route('/open/<path:path>', endpoint='open')
+@create_app.route('/open/<path:path>', endpoint='open')
 def open_file(path):
     """Handle open request, serve file."""
     file = Node.from_urlpath(path)
@@ -249,7 +245,7 @@ def open_file(path):
     abort(404)
 
 
-@blueprint.route('/download/file/<path:path>')
+@create_app.route('/download/file/<path:path>')
 def download_file(path):
     """Handle download request, serve file as attachment."""
     file = Node.from_urlpath(path)
@@ -258,8 +254,8 @@ def download_file(path):
     abort(404)
 
 
-@blueprint.route('/download/directory.<string:ext>', defaults={'path': ''})
-@blueprint.route('/download/directory/?<path:path>.<string:ext>')
+@create_app.route('/download/directory.<string:ext>', defaults={'path': ''})
+@create_app.route('/download/directory/?<path:path>.<string:ext>')
 def download_directory(path, ext):
     """Handle download directory request, serve tarfile as attachment."""
     compression = current_app.config['DIRECTORY_TAR_COMPRESSION']
@@ -271,7 +267,7 @@ def download_directory(path, ext):
     abort(404)
 
 
-@blueprint.route('/remove/<path:path>', methods=('GET', 'POST'))
+@create_app.route('/remove/<path:path>', methods=('GET', 'POST'))
 def remove(path):
     """Handle remove request, serve confirmation dialog."""
     file = Node.from_urlpath(path)
@@ -283,8 +279,8 @@ def remove(path):
     abort(404)
 
 
-@blueprint.route('/upload', defaults={'path': ''}, methods=('POST',))
-@blueprint.route('/upload/<path:path>', methods=('POST',))
+@create_app.route('/upload', defaults={'path': ''}, methods=('POST',))
+@create_app.route('/upload/<path:path>', methods=('POST',))
 def upload(path):
     """Handle upload request."""
     directory = Node.from_urlpath(path)
@@ -311,7 +307,7 @@ def upload(path):
     abort(404)
 
 
-@blueprint.route('/<any("manifest.json", "browserconfig.xml"):filename>')
+@create_app.route('/<any("manifest.json", "browserconfig.xml"):filename>')
 def metadata(filename):
     """Handle metadata request, serve browse metadata file."""
     response = current_app.response_class(
@@ -323,7 +319,7 @@ def metadata(filename):
     return response
 
 
-@blueprint.route('/')
+@create_app.route('/')
 def index():
     """Handle index request, serve either start or base directory listing."""
     path = (
diff --git a/browsepy/__main__.py b/browsepy/__main__.py
index 987025f..24d02dc 100644
--- a/browsepy/__main__.py
+++ b/browsepy/__main__.py
@@ -10,8 +10,7 @@ import argparse
 import flask
 
 from . import app, __version__
-from .compat import PY_LEGACY, getdebug, \
-                    SafeArgumentParser, HelpFormatter
+from .compat import getdebug, SafeArgumentParser, HelpFormatter
 from .transform.glob import translate
 
 
@@ -100,9 +99,6 @@ class ArgParse(SafeArgumentParser):
             help=argparse.SUPPRESS)
 
     def _path(self, arg):
-        if PY_LEGACY and hasattr(sys.stdin, 'encoding'):
-            encoding = sys.stdin.encoding or sys.getdefaultencoding()
-            arg = arg.decode(encoding)
         return os.path.abspath(arg)
 
     def _file(self, arg):
diff --git a/browsepy/appconfig.py b/browsepy/appconfig.py
index 1a7326a..fb45101 100644
--- a/browsepy/appconfig.py
+++ b/browsepy/appconfig.py
@@ -1,17 +1,15 @@
 """Flask app config utilities."""
 
+import typing
 import warnings
 
 import flask
 import flask.config
 
-from .compat import typing
-
 from . import compat
 
 
-if typing:
-    T = typing.TypeVar('T')
+T = typing.TypeVar('T')
 
 
 class Config(flask.config.Config):
@@ -35,7 +33,7 @@ class Config(flask.config.Config):
         :param k: key
         :returns: uppercase key
         """
-        if isinstance(key, compat.basestring):
+        if isinstance(key, str):
             uppercase = key.upper()
             if key not in self._warned and key != uppercase:
                 self._warned.add(key)
@@ -94,6 +92,27 @@ class Flask(flask.Flask):
     config_class = Config
 
 
+class AppDecoratorProxy(object):
+    """Flask app decorator proxy."""
+
+    def __init__(self, name, nested=False):
+        """Initialize."""
+        self.name = name
+        self.nested = nested
+
+    def __get__(self, obj, type=None):
+        """Get deferred registering decorator."""
+        def decorator(*args, **kwargs):
+            def wrapper(fnc):
+                def callback():
+                    meth = getattr(flask.current_app, self.name)
+                    meth(*args, **kwargs)(fnc) if self.nested else meth(fnc)
+                obj.register(callback)
+                return fnc
+            return wrapper
+        return decorator if self.nested else decorator()
+
+
 class CreateApp(object):
     """Flask create_app pattern factory."""
 
@@ -126,3 +145,9 @@ class CreateApp(object):
         """Register function to be called when app is initialized."""
         self.registry.append(fnc)
         return fnc
+
+    before_first_request = AppDecoratorProxy('before_first_request')
+    context_processor = AppDecoratorProxy('context_processor')
+    url_defaults = AppDecoratorProxy('url_defaults')
+    errorhandler = AppDecoratorProxy('errorhandler', nested=True)
+    route = AppDecoratorProxy('route', nested=True)
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 78b457f..ed1e549 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -1,5 +1,6 @@
-"""Module providing runtime and platform compatibility workarounds."""
+"""Module providing both runtime and platform compatibility workarounds."""
 
+import typing
 import os
 import os.path
 import sys
@@ -15,56 +16,20 @@ import warnings
 import posixpath
 import ntpath
 import argparse
-import types
-
-try:
-    import builtins  # python 3+
-except ImportError:
-    import __builtin__ as builtins  # noqa
+import shutil
 
 try:
     import importlib.resources as res  # python 3.7+
 except ImportError:
     import importlib_resources as res  # noqa
 
-try:
-    from os import scandir as _scandir, walk  # python 3.5+
-except ImportError:
-    from scandir import scandir as _scandir, walk  # noqa
-
-try:
-    from shutil import get_terminal_size  # python 3.3+
-except ImportError:
-    from backports.shutil_get_terminal_size import get_terminal_size  # noqa
-
-try:
-    from queue import Queue, Empty, Full  # python 3
-except ImportError:
-    from Queue import Queue, Empty, Full  # noqa
-
-try:
-    from collections.abc import Iterator as BaseIterator  # python 3.3+
-except ImportError:
-    from collections import Iterator as BaseIterator  # noqa
-
-try:
-    from importlib import import_module as _import_module  # python 3.3+
-except ImportError:
-    _import_module = None  # noqa
-
 try:
     from functools import cached_property   # python 3.8+
 except ImportError:
     from werkzeug.utils import cached_property  # noqa
 
-try:
-    import typing  # python 3.5+
-except ImportError:
-    typing = None  # noqa
-
 
 FS_ENCODING = sys.getfilesystemencoding()
-PY_LEGACY = sys.version_info < (3, )
 TRUE_VALUES = frozenset(
     # Truthy values
     ('true', 'yes', '1', 'enable', 'enabled', True, 1)
@@ -119,7 +84,7 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
         """Initialize object."""
         if width is None:
             try:
-                width = get_terminal_size().columns - 2
+                width = shutil.get_terminal_size().columns - 2
             except ValueError:  # https://bugs.python.org/issue24966
                 pass
         super(HelpFormatter, self).__init__(
@@ -139,7 +104,7 @@ def scandir(path):
     :param path: path to iterate
     :type path: str
     """
-    files = _scandir(path)
+    files = os.scandir(path)
     try:
         yield files
     finally:
@@ -147,21 +112,6 @@ def scandir(path):
             files.close()
 
 
-def import_module(name):
-    # type: (str) -> types.ModuleType
-    """
-    Import a module by absolute name.
-
-    The 'package' argument is required when performing a relative import. It
-    specifies the package to use as the anchor point from which to resolve the
-    relative import to an absolute import.
-    """
-    if _import_module:
-        return _import_module(name)
-    __import__(name)
-    return sys.modules[name]
-
-
 def _unsafe_rmtree(path):
     # type: (str) -> None
     """
@@ -170,7 +120,7 @@ def _unsafe_rmtree(path):
     :param path: directory path
     :type path: str
     """
-    for base, dirs, files in walk(path, topdown=False):
+    for base, dirs, files in os.walk(path, topdown=False):
         for filename in files:
             os.remove(os.path.join(base, filename))
 
@@ -258,8 +208,7 @@ def fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
     if not isinstance(path, bytes):
         return path
     if not errors:
-        use_strict = PY_LEGACY or os_name == 'nt'
-        errors = 'strict' if use_strict else 'surrogateescape'
+        errors = 'strict' if os_name == 'nt' else 'surrogateescape'
     return path.decode(fs_encoding, errors=errors)
 
 
@@ -282,8 +231,7 @@ def fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
     if isinstance(path, bytes):
         return path
     if not errors:
-        use_strict = PY_LEGACY or os_name == 'nt'
-        errors = 'strict' if use_strict else 'surrogateescape'
+        errors = 'strict' if os_name == 'nt' else 'surrogateescape'
     return path.encode(fs_encoding, errors=errors)
 
 
@@ -527,42 +475,3 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
         uni_escape(ord(c))
         for c in pattern
         )
-
-
-if PY_LEGACY:
-    class FileNotFoundError(Exception):
-        __metaclass__ = abc.ABCMeta
-
-    FileNotFoundError.register(OSError)
-    FileNotFoundError.register(IOError)
-
-    class Iterator(BaseIterator):
-        def next(self):
-            """
-            Call :method:`__next__` for compatibility.
-
-            :returns: see :method:`__next__`
-            """
-            return self.__next__()
-
-    range = xrange  # noqa
-    filter = itertools.ifilter
-    map = itertools.imap
-    zip = itertools.izip
-    basestring = basestring  # noqa
-    unicode = unicode  # noqa
-    chr = unichr  # noqa
-    bytes = str  # noqa
-else:
-    FileNotFoundError = FileNotFoundError
-    Iterator = BaseIterator
-    range = range
-    filter = filter
-    map = map
-    zip = zip
-    basestring = str
-    unicode = str
-    chr = chr
-    bytes = bytes
-
-NoneType = type(None)
diff --git a/browsepy/file.py b/browsepy/file.py
index ffd55f1..04c9289 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -1,5 +1,6 @@
-# -*- coding: UTF-8 -*-
+"""File node classes and functions."""
 
+import typing
 import os
 import os.path
 import re
@@ -7,7 +8,6 @@ import codecs
 import string
 import random
 import datetime
-import logging
 
 import flask
 
@@ -15,19 +15,17 @@ from . import compat
 from . import utils
 from . import stream
 
-from .compat import range, cached_property
+from .compat import cached_property
 from .http import Headers
 
 from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
                         PathTooLongError, FilenameTooLongError
 
 
-logger = logging.getLogger(__name__)
-unicode_underscore = compat.unicode('_')
 underscore_replace = '%s:underscore' % __name__
 codecs.register_error(
     underscore_replace,
-    lambda error: (unicode_underscore, getattr(error, 'start', 0) + 1),
+    lambda error: (u'_', getattr(error, 'start', 0) + 1),
     )
 binary_units = ('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB')
 standard_units = ('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB')
@@ -62,9 +60,9 @@ class Node(object):
     * :attr:`file_class`, class will be used for file nodes.
     """
     generic = True
-    directory_class = None  # set at import time
-    file_class = None  # set at import time
-    manager_class = None  # set at import time
+    directory_class = None  # type: typing.Type[Node]
+    file_class = None  # type: typing.Type[Node]
+    manager_class = None
 
     re_charset = re.compile('; charset=(?P<charset>[^;]+)')
     can_download = False
@@ -132,7 +130,7 @@ class Node(object):
                     'button',
                     file=self,
                     css='remove',
-                    endpoint='browsepy.remove',
+                    endpoint='remove',
                     )
                 )
         return widgets + self.plugin_manager.get_widgets(file=self)
@@ -173,7 +171,7 @@ class Node(object):
         """
         try:
             return os.stat(self.path)
-        except compat.FileNotFoundError:
+        except FileNotFoundError:
             if self.is_symlink:
                 return os.lstat(self.path)
             raise
@@ -423,7 +421,7 @@ class File(Node):
                 'entry-link',
                 'link',
                 file=self,
-                endpoint='browsepy.open',
+                endpoint='open',
                 )
             ]
         if self.can_download:
@@ -433,14 +431,14 @@ class File(Node):
                     'button',
                     file=self,
                     css='download',
-                    endpoint='browsepy.download_file',
+                    endpoint='download_file',
                     ),
                 self.plugin_manager.create_widget(
                     'header',
                     'button',
                     file=self,
                     text='Download file',
-                    endpoint='browsepy.download_file',
+                    endpoint='download_file',
                     ),
                 ))
         return widgets + super(File, self).widgets
@@ -570,7 +568,7 @@ class Directory(Node):
                 'entry-link',
                 'link',
                 file=self,
-                endpoint='browsepy.browse',
+                endpoint='browse',
                 )
             ]
         if self.can_download:
@@ -580,14 +578,14 @@ class Directory(Node):
                     'button',
                     file=self,
                     css='download',
-                    endpoint='browsepy.download_directory',
+                    endpoint='download_directory',
                     ),
                 self.plugin_manager.create_widget(
                     'header',
                     'button',
                     file=self,
                     text='Download all',
-                    endpoint='browsepy.download_directory',
+                    endpoint='download_directory',
                     ),
                 ))
         if self.can_upload:
@@ -596,14 +594,14 @@ class Directory(Node):
                     'head',
                     'script',
                     file=self,
-                    endpoint='browsepy.static',
+                    endpoint='static',
                     filename='browse.directory.head.js',
                     ),
                 self.plugin_manager.create_widget(
                     'scripts',
                     'script',
                     file=self,
-                    endpoint='browsepy.static',
+                    endpoint='static',
                     filename='browse.directory.body.js',
                     ),
                 self.plugin_manager.create_widget(
@@ -611,7 +609,7 @@ class Directory(Node):
                     'upload',
                     file=self,
                     text='Upload',
-                    endpoint='browsepy.upload',
+                    endpoint='upload',
                     )
                 ))
         return widgets + super(Directory, self).widgets
@@ -776,13 +774,13 @@ class Directory(Node):
         return new_filename
 
     def _listdir(self, precomputed_stats=(os.name == 'nt')):
+        # type: (bool) -> typing.Generator[Node, None, None]
         """
         Iterate unsorted entries on this directory.
 
         Symlinks are skipped when pointing outside to base directory.
 
         :yields: Directory or File instance for each entry in directory
-        :rtype: Iterator of browsepy.file.Node
         """
         directory_class = self.directory_class
         file_class = self.file_class
@@ -809,10 +807,10 @@ class Directory(Node):
                         if entry.is_dir(follow_symlinks=is_symlink) else
                         file_class(**kwargs)
                         )
-                except compat.FileNotFoundError:
+                except FileNotFoundError:
                     pass
                 except OSError as e:
-                    logger.exception(e)
+                    self.app.exception(e)
 
     def listdir(self, sortkey=None, reverse=False):
         """
diff --git a/browsepy/http.py b/browsepy/http.py
index 875e351..918c61a 100644
--- a/browsepy/http.py
+++ b/browsepy/http.py
@@ -1,18 +1,13 @@
 """HTTP utility module."""
 
+import typing
 import re
-import logging
 
 import msgpack
 
 from werkzeug.http import dump_header, dump_options_header, generate_etag
 from werkzeug.datastructures import Headers as BaseHeaders
 
-from .compat import typing
-
-
-logger = logging.getLogger(__name__)
-
 
 class Headers(BaseHeaders):
     """
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 44b2c20..3253430 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -1,10 +1,13 @@
 """Browsepy plugin manager classes."""
 
+import typing
+import types
 import os.path
 import pkgutil
 import argparse
 import functools
 import warnings
+import importlib
 
 from cookieman import CookieMan
 
@@ -13,7 +16,7 @@ from . import compat
 from . import utils
 from . import file
 
-from .compat import typing, types, cached_property
+from .compat import cached_property
 from .utils import defaultsnamedtuple
 from .exceptions import PluginNotFoundError, InvalidArgumentError, \
                         WidgetParameterException
@@ -24,7 +27,7 @@ class PluginManagerBase(object):
 
     _pyfile_extensions = ('.py', '.pyc', '.pyd', '.pyo')
 
-    get_module = staticmethod(compat.import_module)
+    get_module = staticmethod(importlib.import_module)
     plugin_module_methods = ()  # type: typing.Tuple[str, ...]
 
     @property
@@ -604,6 +607,7 @@ class ArgumentPluginManager(PluginManagerBase):
     def _default_argument_parser(self):
         parser = compat.SafeArgumentParser()
         parser.add_argument('--plugin', action='append', default=[])
+        parser.add_argument('--help', action='store_true')
         parser.add_argument('--help-all', action='store_true')
         return parser
 
@@ -619,9 +623,10 @@ class ArgumentPluginManager(PluginManagerBase):
         :rtype: iterable
         """
         module = self.import_plugin(plugin)
-        if isinstance(module, self.register_arguments_class):
+        register_arguments = getattr(module, 'register_arguments', None)
+        if callable(register_arguments):
             manager = ArgumentPluginManager()
-            module.register_arguments(manager)
+            register_arguments(manager)
             return manager._argparse_argkwargs
         return ()
 
diff --git a/browsepy/mimetype.py b/browsepy/mimetype.py
index 9201d54..064a5f4 100644
--- a/browsepy/mimetype.py
+++ b/browsepy/mimetype.py
@@ -9,7 +9,7 @@ import re
 import subprocess
 import mimetypes
 
-from .compat import FileNotFoundError, which  # noqa
+from .compat import which
 
 generic_mimetypes = frozenset(('application/octet-stream', None))
 re_mime_validate = re.compile(r'\w+/\w+(; \w+=[^;]+)*')
diff --git a/browsepy/plugin/file_actions/__init__.py b/browsepy/plugin/file_actions/__init__.py
index 874261f..f5ef21f 100644
--- a/browsepy/plugin/file_actions/__init__.py
+++ b/browsepy/plugin/file_actions/__init__.py
@@ -7,7 +7,7 @@ from werkzeug.exceptions import NotFound
 from browsepy import get_cookie_browse_sorting, browse_sortkey_reverse
 from browsepy.file import Node, abspath_to_urlpath, current_restricted_chars, \
                           common_path_separators
-from browsepy.compat import re_escape, FileNotFoundError
+from browsepy.compat import re_escape
 from browsepy.exceptions import OutsideDirectoryBase
 from browsepy.stream import stream_template
 
@@ -49,7 +49,7 @@ def create_directory(path):
         path = utils.mkdir(directory.path, request.form['name'])
         base = current_app.config['DIRECTORY_BASE']
         return redirect(
-            url_for('browsepy.browse', path=abspath_to_urlpath(path, base))
+            url_for('browse', path=abspath_to_urlpath(path, base))
             )
 
     return render_template(
@@ -91,7 +91,7 @@ def selection(path):
 
         session['clipboard:mode'] = mode
         session['clipboard:items'] = clipboard
-        return redirect(url_for('browsepy.browse', path=directory.urlpath))
+        return redirect(url_for('browse', path=directory.urlpath))
 
     return stream_template(
         'selection.file_actions.html',
@@ -139,7 +139,7 @@ def clipboard_paste(path):
         session.pop('clipboard:mode', None)
         session.pop('clipboard:items', None)
 
-    return redirect(url_for('browsepy.browse', path=directory.urlpath))
+    return redirect(url_for('browse', path=directory.urlpath))
 
 
 @actions.route('/clipboard/clear', defaults={'path': ''})
@@ -148,7 +148,7 @@ def clipboard_clear(path):
     """Handle clear clipboard request."""
     session.pop('clipboard:mode', None)
     session.pop('clipboard:items', None)
-    return redirect(url_for('browsepy.browse', path=path))
+    return redirect(url_for('browse', path=path))
 
 
 @actions.errorhandler(FileActionsException)
diff --git a/browsepy/plugin/file_actions/templates/400.file_actions.html b/browsepy/plugin/file_actions/templates/400.file_actions.html
index 98910e1..b8caa30 100644
--- a/browsepy/plugin/file_actions/templates/400.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/400.file_actions.html
@@ -4,12 +4,12 @@
   {% if file %}
     <a
       class="long button text"
-      href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
+      href="{{ url_for('browse', path=file.urlpath) }}"
       title="Go back">Accept</a>
   {% else %}
     <a
       class="long button text"
-      href="{{ url_for('browsepy.index') }}"
+      href="{{ url_for('index') }}"
       title="Go home">Accept</a>
   {% endif %}
 {% endset %}
diff --git a/browsepy/plugin/file_actions/templates/create_directory.file_actions.html b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
index 2a82447..2ba84e4 100644
--- a/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/create_directory.file_actions.html
@@ -28,7 +28,7 @@
     <div class="group">
       <a
         class="button text long"
-        href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
+        href="{{ url_for('browse', path=file.urlpath) }}"
         title="Go back">Cancel</a>
       <input class="button text long suggested" type="submit" value="Accept" />
     </div>
diff --git a/browsepy/plugin/file_actions/templates/selection.file_actions.html b/browsepy/plugin/file_actions/templates/selection.file_actions.html
index a5a2190..30bcc67 100644
--- a/browsepy/plugin/file_actions/templates/selection.file_actions.html
+++ b/browsepy/plugin/file_actions/templates/selection.file_actions.html
@@ -26,7 +26,7 @@
     <div class="group">
       <a
         class="button text"
-        href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
+        href="{{ url_for('browse', path=file.urlpath) }}"
         title="Go back">Cancel</a>
       {% if cut_support %}
         <input class="button text" type="submit" name="action-cut" value="Cut selected">
diff --git a/browsepy/plugin/file_actions/tests.py b/browsepy/plugin/file_actions/tests.py
index 8caa1bb..80e543f 100644
--- a/browsepy/plugin/file_actions/tests.py
+++ b/browsepy/plugin/file_actions/tests.py
@@ -125,9 +125,6 @@ class TestIntegration(unittest.TestCase):
 
     def tearDown(self):
         compat.rmtree(self.base)
-        self.app.config.clear()
-        self.app.config.update(self.original_config)
-        self.manager.clear()
         utils.clear_flask_context()
 
     def test_detection(self):
diff --git a/browsepy/plugin/file_actions/utils.py b/browsepy/plugin/file_actions/utils.py
index c36a74a..babd92b 100644
--- a/browsepy/plugin/file_actions/utils.py
+++ b/browsepy/plugin/file_actions/utils.py
@@ -6,7 +6,6 @@ import shutil
 import functools
 
 from browsepy.file import Node, secure_filename
-from browsepy.compat import map
 
 from .exceptions import InvalidClipboardModeError, \
                         InvalidEmptyClipboardError,\
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 33658ef..c5487d7 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -11,19 +11,25 @@ class PlayableNode(Node):
     """Base class for playable nodes."""
 
     playable_list = False
+    duration = None
+
+    @cached_property
+    def title(self):
+        """Get playable filename."""
+        return self.name
 
     @cached_property
     def is_playable(self):
+        # type: () -> bool
         """
         Get if node is playable.
 
         :returns: True if node is playable, False otherwise
-        :rtype: bool
         """
         return self.detect(self)
 
     @classmethod
-    def detect(cls, node):
+    def detect(cls, node, fast=False):
         """Check if class supports node."""
         kls = cls.directory_class if node.is_directory else cls.file_class
         return kls.detect(node)
@@ -33,8 +39,6 @@ class PlayableNode(Node):
 class PlayableFile(PlayableNode, File):
     """Generic node for filenames with extension."""
 
-    title = None
-    duration = None
     playable_extensions = {
         'mp3': 'audio/mpeg',
         'ogg': 'audio/ogg',
@@ -72,14 +76,14 @@ class PlayableFile(PlayableNode, File):
         if parser:
             for options in parser(self):
                 node = self.file_class(**options, app=self.app)
-                if not node.is_excluded:
+                if not node.is_excluded and node.detect(node, fast=True):
                     yield node
 
     @classmethod
-    def detect(cls, node):
+    def detect(cls, node, fast=False):
         """Get whether file is playable."""
         return (
-            not node.is_directory and
+            (fast or node.is_file) and
             cls.detect_extension(node.path) in cls.playable_extensions
             )
 
@@ -106,17 +110,20 @@ class PlayableDirectory(PlayableNode, Directory):
 
     playable_list = True
 
+    @property
+    def parent(self):
+        return Directory(self.path, self.app)
+
     def entries(self, sortkey=None, reverse=None):
         """Iterate playable directory playable files."""
         for node in self.listdir(sortkey=sortkey, reverse=reverse):
-            if not node.is_directory and node.is_playable:
+            if not node.is_directory and node.detect(node, fast=True):
                 yield node
 
     @classmethod
-    def detect(cls, node):
+    def detect(cls, node, fast=False):
         """Detect if given node contains playable files."""
-        return node.is_directory and any(
-            child.is_playable
-            for child in node._listdir()
-            if not child.is_directory
+        return (
+            node.is_directory and
+            any(PlayableFile.detect(n, fast=True) for n in node._listdir())
             )
diff --git a/browsepy/plugin/player/playlist.py b/browsepy/plugin/player/playlist.py
index e359b49..f462308 100644
--- a/browsepy/plugin/player/playlist.py
+++ b/browsepy/plugin/player/playlist.py
@@ -67,7 +67,7 @@ def iter_pls_entries(node):
         parser = configparser_class()
         parser.read(node.path)
     try:
-        maxsize = parser.getint('playlist', 'NumberOfEntries')
+        maxsize = parser.getint('playlist', 'NumberOfEntries') + 1
     except configparser_option_exceptions:
         maxsize = sys.maxsize
     failures = 0
@@ -78,7 +78,7 @@ def iter_pls_entries(node):
         if not data.get('path'):
             failures += 1
             continue
-        data['path'] = normalize_playable_path(data['path'])
+        data['path'] = normalize_playable_path(data['path'], node)
         if data['path']:
             failures = 0
             yield data
diff --git a/browsepy/plugin/player/templates/audio.player.html b/browsepy/plugin/player/templates/audio.player.html
index 0c5d5a3..de66d18 100644
--- a/browsepy/plugin/player/templates/audio.player.html
+++ b/browsepy/plugin/player/templates/audio.player.html
@@ -26,12 +26,12 @@
       {%- for entry in file.entries(sortkey=sort_fnc, reverse=sort_reverse) -%}
         {%- if not loop.first -%}|{%- endif -%}
         {{- entry.extension -}}|
-        {{- entry.name -}}|
+        {{- entry.title -}}|
         {{- url_for('open', path=entry.urlpath) -}}
       {%- endfor -%}
     "
   {% else %}
-    data-player-title="{{ file.name }}"
+    data-player-title="{{ file.title }}"
     data-player-format="{{ file.extension }}"
     data-player-url="{{ url_for('open', path=file.urlpath) }}"
   {% endif %}
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index d4cb524..da6adff 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -9,14 +9,13 @@ import six
 import six.moves
 import flask
 
-from werkzeug.exceptions import NotFound
-
 import browsepy
 import browsepy.compat as compat
 import browsepy.utils as utils
 import browsepy.file as browsepy_file
 import browsepy.plugin.player as player
 import browsepy.plugin.player.playable as player_playable
+import browsepy.plugin.player.playlist as player_playlist
 
 
 class ManagerMock(object):
@@ -59,7 +58,7 @@ class TestPlayerBase(unittest.TestCase):
             )
 
     def setUp(self):
-        self.base = 'c:\\base' if os.name == 'nt' else '/base'
+        self.base = tempfile.mkdtemp()
         self.app = browsepy.create_app()
         self.app.config.update(
             PLUGIN_NAMESPACES=['browsepy.plugin'],
@@ -69,6 +68,7 @@ class TestPlayerBase(unittest.TestCase):
         self.manager = self.app.extensions['plugin_manager']
 
     def tearDown(self):
+        compat.rmtree(self.base)
         utils.clear_flask_context()
 
 
@@ -80,7 +80,7 @@ class TestPlayer(TestPlayerBase):
 
         self.assertIn(self.module.player, manager.blueprints)
         self.assertIn(
-            self.module.playable.detect_playable_mimetype,
+            self.module.playable.PlayableFile.detect_mimetype,
             manager.mimetype_functions
             )
 
@@ -93,9 +93,7 @@ class TestPlayer(TestPlayerBase):
 
         actions = [action['endpoint'] for action in manager.widgets]
         self.assertIn('player.static', actions)
-        self.assertIn('player.audio', actions)
-        self.assertIn('player.playlist', actions)
-        self.assertNotIn('player.directory', actions)
+        self.assertIn('player.play', actions)
 
     def test_register_plugin_with_arguments(self):
         manager = ManagerMock()
@@ -103,7 +101,7 @@ class TestPlayer(TestPlayerBase):
         self.module.register_plugin(manager)
 
         actions = [action['endpoint'] for action in manager.widgets]
-        self.assertIn('player.directory', actions)
+        self.assertIn('player.play', actions)
 
     def test_register_arguments(self):
         manager = ManagerMock()
@@ -118,9 +116,6 @@ class TestIntegrationBase(TestPlayerBase):
     player_module = player
     browsepy_module = browsepy
 
-    def tearDown(self):
-        utils.clear_flask_context()
-
 
 class TestIntegration(TestIntegrationBase):
     non_directory_args = ['--plugin', 'player']
@@ -150,28 +145,29 @@ class TestPlayable(TestIntegrationBase):
     module = player_playable
 
     def test_normalize_playable_path(self):
-        playable = self.module.PlayListFile(
+        playable = self.module.PlayableFile(
             path=p(self.base, 'a.m3u'),
             app=self.app
             )
+        normalize = player_playlist.normalize_playable_path
         self.assertEqual(
-            playable.normalize_playable_path('http://asdf/asdf.mp3'),
+            normalize('http://asdf/asdf.mp3', playable),
             'http://asdf/asdf.mp3'
             )
         self.assertEqual(
-            playable.normalize_playable_path('ftp://asdf/asdf.mp3'),
+            normalize('ftp://asdf/asdf.mp3', playable),
             'ftp://asdf/asdf.mp3'
             )
         self.assertPathEqual(
-            playable.normalize_playable_path('asdf.mp3'),
+            normalize('asdf.mp3', playable),
             self.base + '/asdf.mp3'
             )
         self.assertPathEqual(
-            playable.normalize_playable_path(self.base + '/other/../asdf.mp3'),
+            normalize(self.base + '/other/../asdf.mp3', playable),
             self.base + '/asdf.mp3'
             )
         self.assertEqual(
-            playable.normalize_playable_path('/other/asdf.mp3'),
+            normalize('/other/asdf.mp3', playable),
             None
             )
 
@@ -181,96 +177,94 @@ class TestPlayable(TestIntegrationBase):
             'wav': 'wav',
             'ogg': 'ogg'
             }
-        for ext, media_format in exts.items():
+        for ext, extension in exts.items():
             pf = self.module.PlayableFile(path='asdf.%s' % ext, app=self.app)
-            self.assertEqual(pf.media_format, media_format)
+            self.assertEqual(pf.extension, extension)
             self.assertEqual(pf.title, 'asdf.%s' % ext)
 
     def test_playabledirectory(self):
-        with compat.mkdtemp() as tmpdir:
-            file = p(tmpdir, 'playable.mp3')
-            open(file, 'w').close()
-            node = browsepy_file.Directory(tmpdir, app=self.app)
-            self.assertTrue(self.module.PlayableDirectory.detect(node))
+        file = p(self.base, 'playable.mp3')
+        open(file, 'w').close()
+        node = browsepy_file.Directory(self.base, app=self.app)
+        self.assertTrue(self.module.PlayableDirectory.detect(node))
 
-            directory = self.module.PlayableDirectory(tmpdir, app=self.app)
+        directory = self.module.PlayableDirectory(self.base, app=self.app)
 
-            self.assertEqual(directory.parent.path, directory.path)
+        self.assertEqual(directory.parent.path, directory.path)
 
-            entries = directory.entries()
-            self.assertEqual(next(entries).path, file)
-            self.assertRaises(StopIteration, next, entries)
+        entries = directory.entries()
+        self.assertEqual(next(entries).path, file)
+        self.assertRaises(StopIteration, next, entries)
 
-            os.remove(file)
-            self.assertFalse(self.module.PlayableDirectory.detect(node))
+        os.remove(file)
+        self.assertFalse(self.module.PlayableDirectory.detect(node))
 
     def test_playlistfile(self):
-        pf = self.module.PlayListFile.from_urlpath(
+        pf = self.module.PlayableNode.from_urlpath(
             path='filename.m3u', app=self.app)
-        self.assertTrue(isinstance(pf, self.module.M3UFile))
-        pf = self.module.PlayListFile.from_urlpath(
+        self.assertTrue(isinstance(pf, self.module.PlayableFile))
+        pf = self.module.PlayableNode.from_urlpath(
             path='filename.m3u8', app=self.app)
-        self.assertTrue(isinstance(pf, self.module.M3UFile))
-        pf = self.module.PlayListFile.from_urlpath(
+        self.assertTrue(isinstance(pf, self.module.PlayableFile))
+        pf = self.module.PlayableNode.from_urlpath(
             path='filename.pls', app=self.app)
-        self.assertTrue(isinstance(pf, self.module.PLSFile))
+        self.assertTrue(isinstance(pf, self.module.PlayableFile))
 
     def test_m3ufile(self):
-        data = '/base/valid.mp3\n/outside.ogg\n/base/invalid.bin\nrelative.ogg'
-        with compat.mkdtemp() as tmpdir:
-            file = p(tmpdir, 'playable.m3u')
-            with open(file, 'w') as f:
-                f.write(data)
-            playlist = self.module.PlayableFile(path=file, app=self.app)
-            self.assertPathListEqual(
-                [a.path for a in playlist.entries()],
-                [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
-                )
+        data = (
+            '{0}/valid.mp3\n'
+            '/outside.ogg\n'
+            '{0}/invalid.bin\n'
+            'relative.ogg'
+            ).format(self.base)
+        file = p(self.base, 'playable.m3u')
+        with open(file, 'w') as f:
+            f.write(data)
+        playlist = self.module.PlayableFile(path=file, app=self.app)
+        self.assertPathListEqual(
+            [a.path for a in playlist.entries()],
+            [p(self.base, 'valid.mp3'), p(self.base, 'relative.ogg')]
+            )
 
     def test_plsfile(self):
         data = (
             '[playlist]\n'
-            'File1=/base/valid.mp3\n'
+            'File1={0}/valid.mp3\n'
             'File2=/outside.ogg\n'
-            'File3=/base/invalid.bin\n'
+            'File3={0}/invalid.bin\n'
             'File4=relative.ogg'
+            ).format(self.base)
+        file = p(self.base, 'playable.pls')
+        with open(file, 'w') as f:
+            f.write(data)
+        playlist = self.module.PlayableFile(path=file, app=self.app)
+        self.assertPathListEqual(
+            [a.path for a in playlist.entries()],
+            [p(self.base, 'valid.mp3'), p(self.base, 'relative.ogg')]
             )
-        with compat.mkdtemp() as tmpdir:
-            file = p(tmpdir, 'playable.pls')
-            with open(file, 'w') as f:
-                f.write(data)
-            playlist = self.module.PlayableFile(path=file, app=self.app)
-            self.assertPathListEqual(
-                [a.path for a in playlist.entries()],
-                [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
-                )
 
     def test_plsfile_with_holes(self):
         data = (
             '[playlist]\n'
-            'File1=/base/valid.mp3\n'
-            'File3=/base/invalid.bin\n'
+            'File1={0}/valid.mp3\n'
+            'File3={0}/invalid.bin\n'
             'File4=relative.ogg\n'
             'NumberOfEntries=4'
+            ).format(self.base)
+        file = p(self.base, 'playable.pls')
+        with open(file, 'w') as f:
+            f.write(data)
+        playlist = self.module.PlayableFile(path=file, app=self.app)
+        self.assertPathListEqual(
+            [a.path for a in playlist.entries()],
+            [p(self.base, 'valid.mp3'), p(self.base, 'relative.ogg')]
             )
-        with compat.mkdtemp() as tmpdir:
-            file = p(tmpdir, 'playable.pls')
-            with open(file, 'w') as f:
-                f.write(data)
-            playlist = self.module.PLSFile(path=file, app=self.app)
-            self.assertPathListEqual(
-                [a.path for a in playlist.entries()],
-                [p(self.base, 'valid.mp3'), p(tmpdir, 'relative.ogg')]
-                )
 
 
 class TestBlueprint(TestPlayerBase):
     def setUp(self):
         super(TestBlueprint, self).setUp()
-        app = browsepy.create_app()
-        app.config['DIRECTORY_BASE'] = tempfile.mkdtemp()
-        app.register_blueprint(browsepy.blueprint)
-        app.register_blueprint(self.module.player)
+        self.app.register_blueprint(self.module.player)
 
     def url_for(self, endpoint, **kwargs):
         with self.app.app_context():
@@ -289,7 +283,7 @@ class TestBlueprint(TestPlayerBase):
 
     def test_playable(self):
         name = 'test.mp3'
-        url = self.url_for('player.audio', path=name)
+        url = self.url_for('player.play', path=name)
         with self.app.test_client() as client:
             result = client.get(url)
             self.assertEqual(result.status_code, 404)
@@ -300,7 +294,7 @@ class TestBlueprint(TestPlayerBase):
 
     def test_playlist(self):
         name = 'test.m3u'
-        url = self.url_for('player.playlist', path=name)
+        url = self.url_for('player.play', path=name)
         with self.app.test_client() as client:
             result = client.get(url)
             self.assertEqual(result.status_code, 404)
@@ -311,37 +305,20 @@ class TestBlueprint(TestPlayerBase):
 
     def test_directory(self):
         name = 'directory'
-        url = self.url_for('player.directory', path=name)
+        url = self.url_for('player.play', path=name)
         with self.app.test_client() as client:
             result = client.get(url)
             self.assertEqual(result.status_code, 404)
 
             self.directory(name)
             result = client.get(url)
-            self.assertEqual(result.status_code, 200)
+            self.assertEqual(result.status_code, 404)
 
             self.file('directory/test.mp3')
             result = client.get(url)
             self.assertEqual(result.status_code, 200)
             self.assertIn(b'test.mp3', result.data)
 
-    def test_endpoints(self):
-        with self.app.app_context():
-            self.assertIsInstance(
-                self.module.audio(path='..'),
-                NotFound
-                )
-
-            self.assertIsInstance(
-                self.module.playlist(path='..'),
-                NotFound
-                )
-
-            self.assertIsInstance(
-                self.module.directory(path='..'),
-                NotFound
-                )
-
 
 def p(*args):
     args = [
diff --git a/browsepy/stream.py b/browsepy/stream.py
index 29c70f8..f2a63cd 100644
--- a/browsepy/stream.py
+++ b/browsepy/stream.py
@@ -4,13 +4,13 @@ import os
 import os.path
 import tarfile
 import threading
+import queue
+import collections.abc
 
 import flask
 
-from . import compat
 
-
-class ByteQueue(compat.Queue):
+class ByteQueue(queue.Queue):
     """
     Synchronized byte queue, with an additional finish method.
 
@@ -29,7 +29,7 @@ class ByteQueue(compat.Queue):
 
     def _put(self, item):
         if self.finished:
-            raise compat.Full
+            raise queue.Full
         self.queue.append(item)
         self.bytes += len(item)
 
@@ -66,7 +66,7 @@ class WriteAbort(Exception):
     pass
 
 
-class TarFileStream(compat.Iterator):
+class TarFileStream(collections.abc.Iterator):
     """
     Iterator class which yields tarfile chunks for streaming.
 
@@ -238,7 +238,7 @@ class TarFileStream(compat.Iterator):
 
         try:
             self._queue.put(data)
-        except compat.Full:
+        except queue.Full:
             raise self.abort_exception()
 
         return len(data)
diff --git a/browsepy/templates/400.html b/browsepy/templates/400.html
index 9ee13d5..52119a1 100644
--- a/browsepy/templates/400.html
+++ b/browsepy/templates/400.html
@@ -7,9 +7,9 @@
 
 {% set buttons %}
   {% if file %}
-    <a class="long button text" href="{{ url_for('browsepy.browse', path=file.urlpath) }}" title="Go back">Accept</a>
+    <a class="long button text" href="{{ url_for('browse', path=file.urlpath) }}" title="Go back">Accept</a>
   {% else %}
-    <a class="long button text" href="{{ url_for('browsepy.index') }}" title="Go home">Accept</a>
+    <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
   {% endif %}
 {% endset %}
 
diff --git a/browsepy/templates/404.html b/browsepy/templates/404.html
index fd8fda7..3165b63 100644
--- a/browsepy/templates/404.html
+++ b/browsepy/templates/404.html
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block content %}
-  <img src="{{ url_for('browsepy.static', filename='giorgio.jpg') }}" alt=""/>
+  <img src="{{ url_for('static', filename='giorgio.jpg') }}" alt=""/>
   <p>The resource you're looking for is not available.</p>
-  <a class="long button text" href="{{ url_for('browsepy.index') }}" title="Go home">Accept</a>
+  <a class="long button text" href="{{ url_for('index') }}" title="Go home">Accept</a>
 {% endblock %}
diff --git a/browsepy/templates/base.html b/browsepy/templates/base.html
index 967da18..bcc09f0 100644
--- a/browsepy/templates/base.html
+++ b/browsepy/templates/base.html
@@ -1,5 +1,5 @@
 {% macro breadcrumb(file) -%}
-  <a href="{{ url_for('browsepy.browse', path=file.urlpath) }}"
+  <a href="{{ url_for('browse', path=file.urlpath) }}"
      {% if file.is_root %}class="root"{% endif %}
      >{{ file.name }}</a>
 {%- endmacro %}
@@ -27,28 +27,28 @@
     <link
       rel="stylesheet"
       type="text/css"
-      href="{{ url_for('browsepy.static', filename='base.css') }}">
+      href="{{ url_for('static', filename='base.css') }}">
     {% block icon %}
       {% for i in (57, 60, 72, 76, 114, 120, 144, 152, 180) %}
         <link
           rel="apple-touch-icon"
           sizes="{{ i }}x{{ i }}"
-          href="{{ url_for('browsepy.static', filename='icon/apple-icon-{0}x{0}.png'.format(i)) }}">
+          href="{{ url_for('static', filename='icon/apple-icon-{0}x{0}.png'.format(i)) }}">
       {% endfor %}
       {% for i in (192, 96, 32, 16) %}
         <link
           rel="icon"
           type="image/png"
           sizes="{{ i }}x{{ i }}"
-          href="{{ url_for('browsepy.static', filename='icon/android-icon-{0}x{0}.png'.format(i)) }}">
+          href="{{ url_for('static', filename='icon/android-icon-{0}x{0}.png'.format(i)) }}">
       {% endfor %}
       <link
         rel="manifest"
-        href="{{ url_for('browsepy.metadata', filename='manifest.json') }}">
+        href="{{ url_for('metadata', filename='manifest.json') }}">
       <meta name="msapplication-TileColor" content="#ffffff">
       <meta
         name="msapplication-TileImage"
-        content="{{ url_for('browsepy.static', filename='icon/ms-icon-144x144.png') }}">
+        content="{{ url_for('static', filename='icon/ms-icon-144x144.png') }}">
       <meta name="theme-color" content="#ffffff">
     {% endblock %}
   {% endblock %}
diff --git a/browsepy/templates/browse.html b/browsepy/templates/browse.html
index bb7d531..0713611 100644
--- a/browsepy/templates/browse.html
+++ b/browsepy/templates/browse.html
@@ -50,7 +50,7 @@
     {% set prop = property_desc if sort_property == property else property %}
     {% set active = ' active' if sort_property in (property, property_desc) else '' %}
     {% set desc = ' desc' if sort_property == property_desc else '' %}
-    <a href="{{ url_for('browsepy.sort', path=urlpath, property=prop) }}"
+    <a href="{{ url_for('sort', path=urlpath, property=prop) }}"
        class="{{type}} sorting{{active}}{{desc}}"
        >{{ text }}</a>
   {% else %}
diff --git a/browsepy/templates/browserconfig.xml b/browsepy/templates/browserconfig.xml
index 206bfc5..e416410 100644
--- a/browsepy/templates/browserconfig.xml
+++ b/browsepy/templates/browserconfig.xml
@@ -2,9 +2,9 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square70x70logo src="{{ url_for('browsepy.static', filename='icon/ms-icon-70x70.png') }}"/>
-            <square150x150logo src="{{ url_for('browsepy.static', filename='icon/ms-icon-150x150.png') }}"/>
-            <square310x310logo src="{{ url_for('browsepy.static', filename='icon/ms-icon-310x310.png') }}"/>
+            <square70x70logo src="{{ url_for('static', filename='icon/ms-icon-70x70.png') }}"/>
+            <square150x150logo src="{{ url_for('static', filename='icon/ms-icon-150x150.png') }}"/>
+            <square310x310logo src="{{ url_for('static', filename='icon/ms-icon-310x310.png') }}"/>
             <TileColor>#ffffff</TileColor>
         </tile>
     </msapplication>
diff --git a/browsepy/templates/remove.html b/browsepy/templates/remove.html
index 3b234f4..d216958 100644
--- a/browsepy/templates/remove.html
+++ b/browsepy/templates/remove.html
@@ -10,7 +10,7 @@
   <form method="post" class="group">
     <a
       class="long button text"
-      href="{{ url_for('browsepy.browse', path=file.parent.urlpath) }}"
+      href="{{ url_for('browse', path=file.parent.urlpath) }}"
       title="Go back"
       >Cancel</a>
     <input class="long button destructive text" type="submit" value="Yes" />
diff --git a/browsepy/tests/test_app.py b/browsepy/tests/test_app.py
index cda25e5..f8f1d6a 100644
--- a/browsepy/tests/test_app.py
+++ b/browsepy/tests/test_app.py
@@ -1,3 +1,4 @@
+
 import os
 import os.path
 import unittest
diff --git a/browsepy/tests/test_compat.py b/browsepy/tests/test_compat.py
index 2e47adc..78292b8 100644
--- a/browsepy/tests/test_compat.py
+++ b/browsepy/tests/test_compat.py
@@ -124,20 +124,20 @@ class TestCompat(unittest.TestCase):
         self.assertEqual(pcfg['PC_NAME_MAX'], 242)
 
     def test_getcwd(self):
-        self.assertIsInstance(self.module.getcwd(), self.module.unicode)
+        self.assertIsInstance(self.module.getcwd(), str)
         self.assertIsInstance(
             self.module.getcwd(
                 fs_encoding='latin-1',
                 cwd_fnc=lambda: b'\xf1'
                 ),
-            self.module.unicode
+            str
             )
         self.assertIsInstance(
             self.module.getcwd(
                 fs_encoding='utf-8',
                 cwd_fnc=lambda: b'\xc3\xb1'
                 ),
-            self.module.unicode
+            str
             )
 
     def test_path(self):
diff --git a/browsepy/tests/test_file.py b/browsepy/tests/test_file.py
index 336e15e..b43e5fc 100644
--- a/browsepy/tests/test_file.py
+++ b/browsepy/tests/test_file.py
@@ -11,9 +11,6 @@ import browsepy.compat as compat
 import browsepy.utils as utils
 
 
-PY_LEGACY = compat.PY_LEGACY
-
-
 class TestFile(unittest.TestCase):
     module = browsepy.file
 
@@ -42,7 +39,7 @@ class TestFile(unittest.TestCase):
     def test_repr(self):
         self.assertIsInstance(
             repr(self.module.Node('a', app=self.app)),
-            compat.basestring
+            str
             )
 
     def test_iter_listdir(self):
@@ -144,10 +141,7 @@ class TestFile(unittest.TestCase):
         virtual_file = os.path.join(self.workbench, 'file.txt')
         f = self.module.File(virtual_file, app=self.app)
 
-        self.assertRaises(
-            compat.FileNotFoundError,
-            lambda: f.stats
-            )
+        self.assertRaises(FileNotFoundError, lambda: f.stats)
         self.assertEqual(f.modified, None)
         self.assertEqual(f.size, None)
 
@@ -249,18 +243,9 @@ class TestFileFunctions(unittest.TestCase):
             self.module.secure_filename('\xf1', fs_encoding='ascii'),
             '_')
 
-        if PY_LEGACY:
-            expected = unicode('\xf1', encoding='latin-1')  # noqa
-            self.assertEqual(
-                self.module.secure_filename('\xf1', fs_encoding='utf-8'),
-                expected)
-            self.assertEqual(
-                self.module.secure_filename(expected, fs_encoding='utf-8'),
-                expected)
-        else:
-            self.assertEqual(
-                self.module.secure_filename('\xf1', fs_encoding='utf-8'),
-                '\xf1')
+        self.assertEqual(
+            self.module.secure_filename('\xf1', fs_encoding='utf-8'),
+            '\xf1')
 
     def test_alternative_filename(self):
         self.assertEqual(
diff --git a/browsepy/tests/test_http.py b/browsepy/tests/test_http.py
index a5b3ec4..3829a21 100644
--- a/browsepy/tests/test_http.py
+++ b/browsepy/tests/test_http.py
@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 
 import unittest
 
diff --git a/browsepy/tests/test_main.py b/browsepy/tests/test_main.py
index 2ba24f9..8e07fa3 100644
--- a/browsepy/tests/test_main.py
+++ b/browsepy/tests/test_main.py
@@ -14,7 +14,7 @@ import browsepy.compat as compat
 
 class TestMain(unittest.TestCase):
     module = main
-    stream_class = io.BytesIO if compat.PY_LEGACY else io.StringIO
+    stream_class = io.StringIO
 
     def setUp(self):
         self.app = browsepy.app
diff --git a/browsepy/tests/test_module.py b/browsepy/tests/test_module.py
index 9cae3ee..5a12472 100644
--- a/browsepy/tests/test_module.py
+++ b/browsepy/tests/test_module.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 
 import unittest
 import os
@@ -23,9 +21,6 @@ import browsepy.compat as compat
 import browsepy.utils as utils
 import browsepy.exceptions as exceptions
 
-PY_LEGACY = compat.PY_LEGACY
-range = compat.range  # noqa
-
 
 class AppMock(object):
     config = browsepy.app.config.copy()
@@ -203,15 +198,15 @@ class TestApp(unittest.TestCase):
             )
 
         self.base_directories = [
-            self.url_for('browsepy.browse', path='remove'),
-            self.url_for('browsepy.browse', path='start'),
-            self.url_for('browsepy.browse', path='upload'),
+            self.url_for('browse', path='remove'),
+            self.url_for('browse', path='start'),
+            self.url_for('browse', path='upload'),
             ]
         self.start_files = [
-            self.url_for('browsepy.open', path='start/testfile.txt'),
+            self.url_for('open', path='start/testfile.txt'),
             ]
         self.remove_files = [
-            self.url_for('browsepy.open', path='remove/testfile.txt'),
+            self.url_for('open', path='remove/testfile.txt'),
             ]
         self.upload_files = []
 
@@ -233,13 +228,13 @@ class TestApp(unittest.TestCase):
     def get(self, endpoint, **kwargs):
         status_code = kwargs.pop('status_code', 200)
         follow_redirects = kwargs.pop('follow_redirects', False)
-        if endpoint in ('browsepy.index', 'browsepy.browse'):
+        if endpoint in ('index', 'browse'):
             page_class = self.list_page_class
-        elif endpoint == 'browsepy.remove':
+        elif endpoint == 'remove':
             page_class = self.confirm_page_class
-        elif endpoint == 'browsepy.sort' and follow_redirects:
+        elif endpoint == 'sort' and follow_redirects:
             page_class = self.list_page_class
-        elif endpoint == 'browsepy.download_directory':
+        elif endpoint == 'download_directory':
             page_class = self.directory_download_class
         else:
             page_class = self.generic_page_class
@@ -283,7 +278,7 @@ class TestApp(unittest.TestCase):
             return flask.url_for(endpoint, _external=False, **kwargs)
 
     def test_index(self):
-        page = self.get('browsepy.index')
+        page = self.get('index')
         self.assertEqual(page.path, '%s/start' % os.path.basename(self.base))
 
         start = os.path.abspath(os.path.join(self.base, '..'))
@@ -291,32 +286,32 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.index'
+            self.get, 'index'
             )
 
         self.app.config['DIRECTORY_START'] = self.start
 
     def test_browse(self):
         basename = os.path.basename(self.base)
-        page = self.get('browsepy.browse')
+        page = self.get('browse')
         self.assertEqual(page.path, basename)
         self.assertEqual(page.directories, self.base_directories)
         self.assertFalse(page.removable)
         self.assertFalse(page.upload)
 
-        page = self.get('browsepy.browse', path='start')
+        page = self.get('browse', path='start')
         self.assertEqual(page.path, '%s/start' % basename)
         self.assertEqual(page.files, self.start_files)
         self.assertFalse(page.removable)
         self.assertFalse(page.upload)
 
-        page = self.get('browsepy.browse', path='remove')
+        page = self.get('browse', path='remove')
         self.assertEqual(page.path, '%s/remove' % basename)
         self.assertEqual(page.files, self.remove_files)
         self.assertTrue(page.removable)
         self.assertFalse(page.upload)
 
-        page = self.get('browsepy.browse', path='upload')
+        page = self.get('browse', path='upload')
         self.assertEqual(page.path, '%s/upload' % basename)
         self.assertEqual(page.files, self.upload_files)
         self.assertFalse(page.removable)
@@ -324,24 +319,24 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.browse', path='..'
+            self.get, 'browse', path='..'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.browse', path='start/testfile.txt'
+            self.get, 'browse', path='start/testfile.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.browse', path='exclude'
+            self.get, 'browse', path='exclude'
             )
 
         self.app.config['DIRECTORY_DOWNLOADABLE'] = True
-        page = self.get('browsepy.browse')
+        page = self.get('browse')
         self.assertTrue(page.tarfile)
         self.app.config['DIRECTORY_DOWNLOADABLE'] = False
-        page = self.get('browsepy.browse')
+        page = self.get('browse')
         self.assertFalse(page.tarfile)
 
     def test_open(self):
@@ -349,12 +344,12 @@ class TestApp(unittest.TestCase):
         with open(os.path.join(self.start, 'testfile3.txt'), 'wb') as f:
             f.write(content)
 
-        page = self.get('browsepy.open', path='start/testfile3.txt')
+        page = self.get('open', path='start/testfile3.txt')
         self.assertEqual(page.data, content)
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.open', path='../shall_not_pass.txt'
+            self.get, 'open', path='../shall_not_pass.txt'
             )
 
     def test_remove(self):
@@ -362,49 +357,49 @@ class TestApp(unittest.TestCase):
 
         basename = os.path.basename(self.base)
 
-        page = self.get('browsepy.remove', path='remove/testfile2.txt')
+        page = self.get('remove', path='remove/testfile2.txt')
         self.assertEqual(page.path, '%s/remove/testfile2.txt' % basename)
         self.assertEqual(
             page.back,
-            self.url_for('browsepy.browse', path='remove'),
+            self.url_for('browse', path='remove'),
             )
 
-        page = self.post('browsepy.remove', path='remove/testfile2.txt')
+        page = self.post('remove', path='remove/testfile2.txt')
         self.assertEqual(page.path, '%s/remove' % basename)
         self.assertEqual(page.files, self.remove_files)
 
         os.mkdir(os.path.join(self.remove, 'directory'))
-        page = self.post('browsepy.remove', path='remove/directory')
+        page = self.post('remove', path='remove/directory')
         self.assertEqual(page.path, '%s/remove' % basename)
         self.assertEqual(page.files, self.remove_files)
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.remove', path='start/testfile.txt'
+            self.get, 'remove', path='start/testfile.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.post, 'browsepy.remove', path='start/testfile.txt'
+            self.post, 'remove', path='start/testfile.txt'
             )
 
         self.app.config['DIRECTORY_REMOVE'] = None
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.remove', path='remove/testfile.txt'
+            self.get, 'remove', path='remove/testfile.txt'
             )
 
         self.app.config['DIRECTORY_REMOVE'] = self.remove
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.remove', path='../shall_not_pass.txt'
+            self.get, 'remove', path='../shall_not_pass.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.remove', path='exclude/testfile.txt'
+            self.get, 'remove', path='exclude/testfile.txt'
             )
 
     def test_download_file(self):
@@ -413,24 +408,24 @@ class TestApp(unittest.TestCase):
 
         with open(binfile, 'wb') as f:
             f.write(bindata)
-        page = self.get('browsepy.download_file', path='testfile.bin')
+        page = self.get('download_file', path='testfile.bin')
         os.remove(binfile)
 
         self.assertEqual(page.data, bindata)
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.download_file', path='../shall_not_pass.txt'
+            self.get, 'download_file', path='../shall_not_pass.txt'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.download_file', path='start'
+            self.get, 'download_file', path='start'
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.download_file', path='exclude/testfile.txt'
+            self.get, 'download_file', path='exclude/testfile.txt'
             )
 
     def test_download_directory(self):
@@ -445,7 +440,7 @@ class TestApp(unittest.TestCase):
 
         self.app.config['EXCLUDE_FNC'] = None
 
-        response = self.get('browsepy.download_directory', path='start')
+        response = self.get('download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
         self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(response.encoding, 'gzip')
@@ -456,7 +451,7 @@ class TestApp(unittest.TestCase):
 
         self.app.config['EXCLUDE_FNC'] = lambda p: p.endswith('.exc')
 
-        response = self.get('browsepy.download_directory', path='start')
+        response = self.get('download_directory', path='start')
         self.assertEqual(response.filename, 'start.tgz')
         self.assertEqual(response.content_type, 'application/x-tar')
         self.assertEqual(response.encoding, 'gzip')
@@ -469,27 +464,28 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.download_directory',
+            self.get, 'download_directory',
             path='../../shall_not_pass',
             )
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.download_directory',
+            self.get, 'download_directory',
             path='exclude',
             )
 
     def test_upload(self):
         def genbytesio(nbytes, encoding):
-            c = unichr if PY_LEGACY else chr  # noqa
-            return io.BytesIO(''.join(map(c, range(nbytes))).encode(encoding))
+            return io.BytesIO(
+                ''.join(map(chr, range(nbytes))).encode(encoding)
+                )
 
         files = {
             'testfile.txt': genbytesio(127, 'ascii'),
             'testfile.bin': genbytesio(255, 'utf-8'),
             }
         output = self.post(
-            'browsepy.upload',
+            'upload',
             path='upload',
             data={
                 'file%d' % n: (data, name)
@@ -497,7 +493,7 @@ class TestApp(unittest.TestCase):
                 }
             )
         expected_links = sorted(
-            self.url_for('browsepy.open', path='upload/%s' % i)
+            self.url_for('open', path='upload/%s' % i)
             for i in files
             )
         self.assertEqual(sorted(output.files), expected_links)
@@ -505,20 +501,18 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.post, 'browsepy.upload', path='start', data={
+            self.post, 'upload', path='start', data={
                 'file': (genbytesio(127, 'ascii'), 'testfile.txt')
                 }
             )
 
     def test_upload_duplicate(self):
-        c = unichr if PY_LEGACY else chr  # noqa
-
         files = (
             ('testfile.txt', 'something'),
             ('testfile.txt', 'something_new'),
             )
         output = self.post(
-            'browsepy.upload',
+            'upload',
             path='upload',
             data={
                'file%d' % n: (io.BytesIO(data.encode('ascii')), name)
@@ -529,7 +523,7 @@ class TestApp(unittest.TestCase):
         self.assertEqual(len(files), len(output.files))
 
         first_file_url = self.url_for(
-            'browsepy.open',
+            'open',
             path='upload/%s' % files[0][0]
             )
         self.assertIn(first_file_url, output.files)
@@ -554,7 +548,7 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page400Exception,
-            self.post, 'browsepy.upload', path='upload', data={
+            self.post, 'upload', path='upload', data={
                 'file': (io.BytesIO('test'.encode('ascii')), longname + 'a')
                 }
             )
@@ -569,14 +563,14 @@ class TestApp(unittest.TestCase):
 
         with self.assertRaises(Page400Exception):
             self.post(
-                'browsepy.upload',
+                'upload',
                 path='upload/' + '/'.join(subdirs),
                 data={'file': (io.BytesIO('test'.encode('ascii')), longname)},
                 )
 
         with self.assertRaises(Page400Exception):
             self.post(
-                'browsepy.upload',
+                'upload',
                 path='upload',
                 data={'file': (io.BytesIO('test'.encode('ascii')), '..')},
                 )
@@ -585,7 +579,7 @@ class TestApp(unittest.TestCase):
 
         self.assertRaises(
             Page404Exception,
-            self.get, 'browsepy.sort', property='text', path='exclude'
+            self.get, 'sort', property='text', path='exclude'
             )
 
         files = {
@@ -594,19 +588,19 @@ class TestApp(unittest.TestCase):
             'c.zip': 'a'
             }
         by_name = [
-            self.url_for('browsepy.open', path=name)
+            self.url_for('open', path=name)
             for name in sorted(files)
             ]
         by_name_desc = list(reversed(by_name))
 
         by_type = [
-            self.url_for('browsepy.open', path=name)
+            self.url_for('open', path=name)
             for name in sorted(files, key=lambda x: mimetypes.guess_type(x)[0])
             ]
         by_type_desc = list(reversed(by_type))
 
         by_size = [
-            self.url_for('browsepy.open', path=name)
+            self.url_for('open', path=name)
             for name in sorted(files, key=lambda x: len(files[x]))
             ]
         by_size_desc = list(reversed(by_size))
@@ -617,42 +611,42 @@ class TestApp(unittest.TestCase):
                 f.write(content.encode('ascii'))
 
         with self.app.test_client() as client:
-            page = self.get('browsepy.browse', client=client)
+            page = self.get('browse', client=client)
             self.assertListEqual(page.files, by_name)
 
             self.assertRaises(
                 Page302Exception,
-                self.get, 'browsepy.sort', property='text', client=client
+                self.get, 'sort', property='text', client=client
                 )
 
-            page = self.get('browsepy.browse', client=client)
+            page = self.get('browse', client=client)
             self.assertListEqual(page.files, by_name)
 
-            page = self.get('browsepy.sort', property='-text', client=client,
+            page = self.get('sort', property='-text', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_name_desc)
 
-            page = self.get('browsepy.sort', property='type', client=client,
+            page = self.get('sort', property='type', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_type)
 
-            page = self.get('browsepy.sort', property='-type', client=client,
+            page = self.get('sort', property='-type', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_type_desc)
 
-            page = self.get('browsepy.sort', property='size', client=client,
+            page = self.get('sort', property='size', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_size)
 
-            page = self.get('browsepy.sort', property='-size', client=client,
+            page = self.get('sort', property='-size', client=client,
                             follow_redirects=True)
             self.assertListEqual(page.files, by_size_desc)
 
             # Cannot to test modified sorting due filesystem time resolution
-            page = self.get('browsepy.sort', property='modified',
+            page = self.get('sort', property='modified',
                             client=client, follow_redirects=True)
 
-            page = self.get('browsepy.sort', property='-modified',
+            page = self.get('sort', property='-modified',
                             client=client, follow_redirects=True)
 
     def test_sort_cookie_size(self):
@@ -664,7 +658,7 @@ class TestApp(unittest.TestCase):
         with self.app.test_client() as client:
             for name in files:
                 page = self.get(
-                    'browsepy.sort',
+                    'sort',
                     property='modified',
                     path=name,
                     client=client,
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index f3088cb..56d11d4 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -12,21 +12,6 @@ import browsepy.manager
 import browsepy.compat as compat
 import browsepy.exceptions as exceptions
 
-import browsepy.plugin.player.tests as test_player
-import browsepy.plugin.file_actions.tests as test_file_actions
-
-nested_suites = {
-    'NestedPlayer': test_player,
-    'NestedFileActions': test_file_actions,
-    }
-
-globals().update(
-    ('%s%s' % (prefix, name), testcase)
-    for prefix, module in nested_suites.items()
-    for name, testcase in vars(module).items()
-    if isinstance(testcase, type) and issubclass(testcase, unittest.TestCase)
-    )
-
 
 class FileMock(object):
     def __init__(self, **kwargs):
diff --git a/browsepy/tests/test_transform.py b/browsepy/tests/test_transform.py
index ee48793..0fd9362 100755
--- a/browsepy/tests/test_transform.py
+++ b/browsepy/tests/test_transform.py
@@ -1,22 +1,12 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import re
 import unittest
 import warnings
 
-from browsepy.compat import unicode
-
 import browsepy.transform
 import browsepy.transform.glob
 
 
-def fu(c):
-    if isinstance(c, unicode):
-        return c
-    return c.decode('utf-8')
-
-
 class TestStateMachine(unittest.TestCase):
     module = browsepy.transform
 
@@ -78,7 +68,7 @@ class TestGlob(unittest.TestCase):
                 '/a',
                 '/ñ',
                 '/1',
-                b'/\xc3\xa0',  # /à
+                '/à',
                 ), (
                 '/_',
                 )),
@@ -93,9 +83,9 @@ class TestGlob(unittest.TestCase):
         for pattern, matching, nonmatching in tests:
             pattern = re.compile(self.translate(pattern, sep='/'))
             for test in matching:
-                self.assertTrue(pattern.match(fu(test)))
+                self.assertTrue(pattern.match(test))
             for test in nonmatching:
-                self.assertFalse(pattern.match(fu(test)))
+                self.assertFalse(pattern.match(test))
 
     def test_unsupported(self):
         translations = [
diff --git a/browsepy/tests/test_utils.py b/browsepy/tests/test_utils.py
deleted file mode 100644
index 235131a..0000000
--- a/browsepy/tests/test_utils.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: UTF-8 -*-
-
-pass
diff --git a/browsepy/transform/glob.py b/browsepy/transform/glob.py
index a81806f..b5dd389 100644
--- a/browsepy/transform/glob.py
+++ b/browsepy/transform/glob.py
@@ -5,7 +5,7 @@ import warnings
 
 from unicategories import categories as unicat, RangeGroup as ranges
 
-from ..compat import re_escape, chr
+from ..compat import re_escape
 from . import StateMachine
 
 
diff --git a/requirements/base.txt b/requirements/base.txt
index be3d2b6..0738ade 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -19,7 +19,4 @@ cookieman
 unicategories
 
 # compat
-backports.shutil_get_terminal_size ; python_version<'3.3'
-scandir ; python_version<'3.5'
-pathlib2 ; python_version<'3.5'
 importlib_resources ; python_version<'3.7'
diff --git a/setup.py b/setup.py
index c04000d..2c149bc 100644
--- a/setup.py
+++ b/setup.py
@@ -43,20 +43,14 @@ setup(
             )
         },
     package_data={  # ignored by sdist (see MANIFEST.in), used by bdist_wheel
-        'browsepy': [
-            'templates/*',
-            'static/fonts/*',
-            'static/*.*',  # do not capture directories
-            ],
-        'browsepy.plugin.player': [
-            'templates/*',
-            'static/*/*',
-            ],
-        'browsepy.plugin.file_actions': [
-            'templates/*',
-            'static/*',
-            ],
+        package: [
+            '{}/{}*'.format(directory, '**/' * level)
+            for directory in ('static', 'templates')
+            for level in range(3)
+            ]
+        for package in find_packages()
         },
+    python_requires='>=3.5',
     setup_requires=[
         'setuptools>36.2',
         ],
@@ -65,9 +59,6 @@ setup(
         'flask',
         'cookieman',
         'unicategories',
-        'backports.shutil_get_terminal_size ; python_version<"3.3"',
-        'scandir ; python_version<"3.5"',
-        'pathlib2 ; python_version<"3.5"',
         'importlib-resources ; python_version<"3.7"',
         ],
     tests_require=[
@@ -79,7 +70,7 @@ setup(
         'radon',
         'unittest-resources[testing]',
         ],
-    test_suite='browsepy.tests',
+    test_suite='browsepy',
     zip_safe=False,
     platforms='any',
     )
-- 
GitLab


From 9320405f5a8ec9cff1da445cc5b1643ed8ab76ca Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Thu, 2 Jan 2020 16:52:44 +0000
Subject: [PATCH 160/171] more fixes

---
 browsepy/__init__.py               | 30 ++++++-----
 browsepy/__main__.py               | 14 ++++-
 browsepy/appconfig.py              |  2 -
 browsepy/compat.py                 | 24 ++++-----
 browsepy/exceptions.py             | 66 +++++++++++++++---------
 browsepy/file.py                   | 82 +++++++++++++++++-------------
 browsepy/manager.py                |  5 +-
 browsepy/plugin/player/playable.py |  1 +
 browsepy/tests/test_code.py        | 19 ++++---
 9 files changed, 144 insertions(+), 99 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 1686632..7a054e6 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -3,27 +3,31 @@
 __version__ = '0.6.0'
 
 import typing
-import logging
 import os
 import os.path
 import time
 
 import cookieman
 
-from flask import request, render_template, redirect, \
-                  url_for, send_from_directory, \
-                  current_app, session, abort
+from flask import (
+    request, render_template, redirect,
+    url_for, send_from_directory,
+    current_app, session, abort,
+    )
 
-from .appconfig import CreateApp
-from .manager import PluginManager
-from .file import Node, secure_filename
-from .stream import tarfile_extension, stream_template
-from .http import etag
-from .exceptions import OutsideRemovableBase, OutsideDirectoryBase, \
-                        InvalidFilenameError, InvalidPathError
+import browsepy.mimetype as mimetype
+import browsepy.compat as compat
+
+from browsepy.appconfig import CreateApp
+from browsepy.manager import PluginManager
+from browsepy.file import Node, secure_filename
+from browsepy.stream import tarfile_extension, stream_template
+from browsepy.http import etag
+from browsepy.exceptions import (
+    OutsideRemovableBase, OutsideDirectoryBase,
+    InvalidFilenameError, InvalidPathError
+    )
 
-from . import mimetype
-from . import compat
 
 create_app = CreateApp(
     __name__,
diff --git a/browsepy/__main__.py b/browsepy/__main__.py
index 24d02dc..278e994 100644
--- a/browsepy/__main__.py
+++ b/browsepy/__main__.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+"""Browsepy command entrypoint module."""
 
 import re
 import sys
@@ -15,7 +14,10 @@ from .transform.glob import translate
 
 
 class CommaSeparatedAction(argparse.Action):
+    """Argparse action for multi-comma separated options."""
+
     def __call__(self, parser, namespace, value, option_string=None):
+        """Parse option value and update namespace."""
         values = value.split(',')
         prev = getattr(namespace, self.dest, None)
         if isinstance(prev, list):
@@ -24,6 +26,8 @@ class CommaSeparatedAction(argparse.Action):
 
 
 class ArgParse(SafeArgumentParser):
+    """Browsepy argument parser class."""
+
     default_directory = app.config['DIRECTORY_BASE']
     default_initial = (
         None
@@ -44,6 +48,7 @@ class ArgParse(SafeArgumentParser):
         }
 
     def __init__(self, sep=os.sep):
+        """Initialize."""
         super(ArgParse, self).__init__(**self.defaults)
         self.add_argument(
             'host', nargs='?',
@@ -115,6 +120,7 @@ class ArgParse(SafeArgumentParser):
 
 
 def create_exclude_fnc(patterns, base, sep=os.sep):
+    """Create browsepy exclude function from list of glob patterns."""
     if patterns:
         regex = '|'.join(translate(pattern, sep, base) for pattern in patterns)
         return re.compile(regex).search
@@ -122,6 +128,7 @@ def create_exclude_fnc(patterns, base, sep=os.sep):
 
 
 def collect_exclude_patterns(paths):
+    """Extract list of glob patterns from given list of glob files."""
     patterns = []
     for path in paths:
         with open(path, 'r') as f:
@@ -133,11 +140,13 @@ def collect_exclude_patterns(paths):
 
 
 def list_union(*lists):
+    """Get unique union list from given iterables."""
     lst = [i for l in lists for i in l]
     return sorted(frozenset(lst), key=lst.index)
 
 
 def filter_union(*functions):
+    """Get union of given filter callables."""
     filtered = [fnc for fnc in functions if fnc]
     if filtered:
         if len(filtered) == 1:
@@ -147,6 +156,7 @@ def filter_union(*functions):
 
 
 def main(argv=sys.argv[1:], app=app, parser=ArgParse, run_fnc=flask.Flask.run):
+    """Run browsepy."""
     plugin_manager = app.extensions['plugin_manager']
     args = plugin_manager.load_arguments(argv, parser())
     patterns = args.exclude + collect_exclude_patterns(args.exclude_from)
diff --git a/browsepy/appconfig.py b/browsepy/appconfig.py
index fb45101..14f65bd 100644
--- a/browsepy/appconfig.py
+++ b/browsepy/appconfig.py
@@ -6,8 +6,6 @@ import warnings
 import flask
 import flask.config
 
-from . import compat
-
 
 T = typing.TypeVar('T')
 
diff --git a/browsepy/compat.py b/browsepy/compat.py
index ed1e549..48d9f05 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -6,10 +6,8 @@ import os.path
 import sys
 import six
 import errno
-import abc
 import time
 import tempfile
-import itertools
 import functools
 import contextlib
 import warnings
@@ -81,7 +79,7 @@ class HelpFormatter(argparse.RawTextHelpFormatter):
 
     def __init__(self, prog, indent_increment=2, max_help_position=24,
                  width=None):
-        """Initialize object."""
+        """Initialize."""
         if width is None:
             try:
                 width = shutil.get_terminal_size().columns - 2
@@ -322,14 +320,17 @@ def usedoc(other):
 
     Usage:
 
-    >>> def fnc1():
-    ...     \"""docstring\"""
-    ...     pass
-    >>> @usedoc(fnc1)
-    ... def fnc2():
-    ...     pass
-    >>> fnc2.__doc__
-    'docstring'collections.abc.D
+    .. code-block:: python
+
+        def fnc1():
+            '''docstring'''
+            pass
+
+        @usedoc(fnc1)
+        def fnc2():
+            pass
+
+        print(fnc2.__doc__)  # 'docstring'
 
     """
     def inner(fnc):
@@ -405,7 +406,6 @@ def pathconf(path,
     :returns: dictionary containing pathconf keys and their values (both str)
     :rtype: dict
     """
-
     if pathconf_fnc and pathconf_names:
         return {key: pathconf_fnc(path, key) for key in pathconf_names}
     if os_name == 'nt':
diff --git a/browsepy/exceptions.py b/browsepy/exceptions.py
index e5d362d..2ad5242 100644
--- a/browsepy/exceptions.py
+++ b/browsepy/exceptions.py
@@ -1,89 +1,109 @@
-# -*- coding: UTF-8 -*-
+"""Common browsepy exceptions."""
 
 
 class OutsideDirectoryBase(Exception):
     """
+    Access denied because path outside DIRECTORY_BASE.
+
     Exception raised when trying to access to a file outside path defined on
     `DIRECTORY_BASE` config property.
     """
-    pass
 
 
 class OutsideRemovableBase(Exception):
     """
+    Access denied because path outside DIRECTORY_REMOVE.
+
     Exception raised when trying to access to a file outside path defined on
-    `directory_remove` config property.
+    `DIRECTORY_REMOVE` config property.
     """
-    pass
 
 
 class InvalidPathError(ValueError):
-    """
-    Exception raised when a path is not valid.
+    """Invalid path error, raised when a path is invalid."""
 
-    :property path: value whose length raised this Exception
-    """
     code = 'invalid-path'
     template = 'Path {0.path!r} is not valid.'
 
     def __init__(self, message=None, path=None):
+        """
+        Initialize.
+
+        :param message: custom error message
+        :param path: path causing this exception
+        """
         self.path = path
         message = self.template.format(self) if message is None else message
         super(InvalidPathError, self).__init__(message)
 
 
 class InvalidFilenameError(InvalidPathError):
-    """
-    Exception raised when a filename is not valid.
+    """Invalid filename error, raised when a provided filename is invalid."""
 
-    :property filename: value whose length raised this Exception
-    """
     code = 'invalid-filename'
     template = 'Filename {0.filename!r} is not valid.'
 
     def __init__(self, message=None, path=None, filename=None):
+        """
+        Initialize.
+
+        :param message: custom error message
+        :param path: target path
+        :param filename: filemane causing this exception
+        """
         self.filename = filename
         super(InvalidFilenameError, self).__init__(message, path=path)
 
 
 class PathTooLongError(InvalidPathError):
-    """
-    Exception raised when maximum filesystem path length is reached.
+    """Path too long for filesystem error."""
 
-    :property limit: value length limit
-    """
     code = 'invalid-path-length'
     template = 'Path {0.path!r} is too long, max length is {0.limit}'
 
     def __init__(self, message=None, path=None, limit=0):
+        """
+        Initialize.
+
+        :param message: custom error message
+        :param path: path causing this exception
+        :param limit: known path length limit
+        """
         self.limit = limit
         super(PathTooLongError, self).__init__(message, path=path)
 
 
 class FilenameTooLongError(InvalidFilenameError):
-    """
-    Exception raised when maximum filesystem filename length is reached.
-    """
+    """Filename too long for filesystem error."""
+
     code = 'invalid-filename-length'
     template = 'Filename {0.filename!r} is too long, max length is {0.limit}'
 
     def __init__(self, message=None, path=None, filename=None, limit=0):
+        """
+        Initialize.
+
+        :param message: custom error message
+        :param path: target path
+        :param filename: filename causing this exception
+        :param limit: known filename length limit
+        """
         self.limit = limit
         super(FilenameTooLongError, self).__init__(
             message, path=path, filename=filename)
 
 
 class PluginNotFoundError(ImportError):
-    pass
+    """Plugin not found error."""
 
 
 class WidgetException(Exception):
-    pass
+    """Base widget exception."""
 
 
 class WidgetParameterException(WidgetException):
-    pass
+    """Invalid widget parameter exception."""
 
 
 class InvalidArgumentError(ValueError):
-    pass
+    """Invalid manager register_widget argument exception."""
diff --git a/browsepy/file.py b/browsepy/file.py
index 04c9289..fc95a01 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -18,8 +18,10 @@ from . import stream
 from .compat import cached_property
 from .http import Headers
 
-from .exceptions import OutsideDirectoryBase, OutsideRemovableBase, \
-                        PathTooLongError, FilenameTooLongError
+from .exceptions import (
+    OutsideDirectoryBase, OutsideRemovableBase,
+    PathTooLongError, FilenameTooLongError
+    )
 
 
 underscore_replace = '%s:underscore' % __name__
@@ -59,6 +61,7 @@ class Node(object):
     * :attr:`directory_class`, class will be used for directory nodes,
     * :attr:`file_class`, class will be used for file nodes.
     """
+
     generic = True
     directory_class = None  # type: typing.Type[Node]
     file_class = None  # type: typing.Type[Node]
@@ -102,7 +105,7 @@ class Node(object):
     @cached_property
     def plugin_manager(self):
         """
-        Get current app's plugin manager.
+        Get current app plugin manager.
 
         :returns: plugin manager instance
         :type: browsepy.manager.PluginManagerBase
@@ -115,7 +118,7 @@ class Node(object):
     @cached_property
     def widgets(self):
         """
-        List widgets with filter return True for this node (or without filter).
+        List widgets for this node (or without filter).
 
         Remove button is prepended if :property:can_remove returns true.
 
@@ -152,8 +155,9 @@ class Node(object):
     @cached_property
     def can_remove(self):
         """
-        Get if current node can be removed based on app config's
-        `DIRECTORY_REMOVE`.
+        Get if current node can be removed.
+
+        This depends on app `DIRECTORY_REMOVE` config property.
 
         :returns: True if current node can be removed, False otherwise.
         :rtype: bool
@@ -180,6 +184,7 @@ class Node(object):
     def pathconf(self):
         """
         Get filesystem config for current path.
+
         See :func:`compat.pathconf`.
 
         :returns: fs config
@@ -233,8 +238,10 @@ class Node(object):
     @property
     def urlpath(self):
         """
-        Get the url substring corresponding to this node for those endpoints
-        accepting a 'path' parameter, suitable for :meth:`from_urlpath`.
+        Get public url for this node, suitable for path endpoints.
+
+        Endpoints accepting this value as 'path' parameter are also
+        expected to use :meth:`Node.from_urlpath`.
 
         :returns: relative-url-like for node's path
         :rtype: str
@@ -257,7 +264,7 @@ class Node(object):
     @property
     def type(self):
         """
-        Get the mime portion of node's mimetype (without the encoding part).
+        Get mimetype mime part (mimetype without encoding).
 
         :returns: mimetype
         :rtype: str
@@ -267,7 +274,7 @@ class Node(object):
     @property
     def category(self):
         """
-        Get mimetype category (first portion of mimetype before the slash).
+        Get mimetype category part (mimetype part before the slash).
 
         :returns: mimetype category
         :rtype: str
@@ -283,6 +290,7 @@ class Node(object):
             * multipart
             * text
             * video
+
         """
         return self.type.split('/', 1)[0]
 
@@ -311,7 +319,7 @@ class Node(object):
 
     def remove(self):
         """
-        Does nothing except raising if can_remove property returns False.
+        Do nothing but raising if can_remove property returns False.
 
         :raises: OutsideRemovableBase if :property:`can_remove` returns false
         """
@@ -321,7 +329,9 @@ class Node(object):
     @classmethod
     def from_urlpath(cls, path, app=None):
         """
-        Alternative constructor which accepts a path as taken from URL and uses
+        Create appropriate node from given url path.
+
+        Alternative constructor accepting a path as taken from URL using
         the given app or the current app config to get the real path.
 
         If class has attribute `generic` set to True, `directory_class` or
@@ -399,6 +409,7 @@ class File(Node):
     * :attr:`generic` is set to False, so static method :meth:`from_urlpath`
       will always return instances of this class.
     """
+
     can_download = True
     can_upload = False
     is_directory = False
@@ -409,9 +420,9 @@ class File(Node):
         """
         List widgets with filter return True for this file (or without filter).
 
-        Entry link is prepended.
-        Download button is prepended if :property:can_download returns true.
-        Remove button is prepended if :property:can_remove returns true.
+        - Entry link is prepended.
+        - Download button is prepended if :property:can_download returns true.
+        - Remove button is prepended if :property:can_remove returns true.
 
         :returns: list of widgets
         :rtype: list of namedtuple instances
@@ -467,6 +478,7 @@ class File(Node):
     def size(self):
         """
         Get human-readable node size in bytes.
+
         If directory, this will corresponds with own inode size.
 
         :returns: fuzzy size with unit
@@ -500,6 +512,7 @@ class File(Node):
     def remove(self):
         """
         Remove file.
+
         :raises OutsideRemovableBase: when not under removable base directory
         """
         super(File, self).remove()
@@ -531,6 +544,7 @@ class Directory(Node):
     * :attr:`generic` is set to False, so static method :meth:`from_urlpath`
       will always return instances of this class.
     """
+
     stream_class = stream.TarFileStream
 
     _listdir_cache = None
@@ -555,10 +569,10 @@ class Directory(Node):
         """
         List widgets with filter return True for this dir (or without filter).
 
-        Entry link is prepended.
-        Upload scripts and widget are added if :property:can_upload is true.
-        Download button is prepended if :property:can_download returns true.
-        Remove button is prepended if :property:can_remove returns true.
+        - Entry link is prepended.
+        - Upload scripts and widget are added if :property:can_upload is true.
+        - Download button is prepended if :property:can_download returns true.
+        - Remove button is prepended if :property:can_remove returns true.
 
         :returns: list of widgets
         :rtype: list of namedtuple instances
@@ -617,7 +631,7 @@ class Directory(Node):
     @cached_property
     def is_root(self):
         """
-        Get if directory is filesystem's root
+        Get if directory is filesystem root.
 
         :returns: True if FS root, False otherwise
         :rtype: bool
@@ -627,8 +641,9 @@ class Directory(Node):
     @cached_property
     def can_download(self):
         """
-        Get if path is downloadable (if app's `DIRECTORY_DOWNLOADABLE` config
-        property is True).
+        Get if node path is downloadable.
+
+        This depends on app `DIRECTORY_DOWNLOADABLE` config property.
 
         :returns: True if downloadable, False otherwise
         :rtype: bool
@@ -638,8 +653,9 @@ class Directory(Node):
     @cached_property
     def can_upload(self):
         """
-        Get if a file can be uploaded to path (if directory path is under app's
-        `DIRECTORY_UPLOAD` config property).
+        Get if a file can be uploaded to node path.
+
+        This depends on app `DIRECTORY_UPLOAD` config property.
 
         :returns: True if a file can be upload to directory, False otherwise
         :rtype: bool
@@ -650,8 +666,9 @@ class Directory(Node):
     @cached_property
     def can_remove(self):
         """
-        Get if current node can be removed based on app config's
-        directory_remove.
+        Get if current node can be removed.
+
+        This depends on app `DIRECTORY_REMOVE` config property.
 
         :returns: True if current node can be removed, False otherwise.
         :rtype: bool
@@ -661,7 +678,7 @@ class Directory(Node):
     @cached_property
     def is_empty(self):
         """
-        Get if directory is empty (based on :meth:`_listdir`).
+        Get if directory is empty.
 
         :returns: True if this directory has no entries, False otherwise.
         :rtype: bool
@@ -695,7 +712,7 @@ class Directory(Node):
 
     def download(self):
         """
-        Get a Flask Response object streaming a tarball of this directory.
+        Generate Flask Response object streaming a tarball of this directory.
 
         :returns: Response object
         :rtype: flask.Response
@@ -739,8 +756,7 @@ class Directory(Node):
 
     def choose_filename(self, filename, attempts=999):
         """
-        Get a new filename which does not colide with any entry on directory,
-        based on given filename.
+        Get a filename for considered safe for this directory.
 
         :param filename: base filename
         :type filename: str
@@ -911,14 +927,12 @@ def urlpath_to_abspath(path, base, os_sep=os.sep):
 
 def generic_filename(path):
     """
-    Extract filename of given path os-indepently, taking care of known path
-    separators.
+    Extract filename from given path based on all known path separators.
 
     :param path: path
     :return: filename
     :rtype: str or unicode (depending on given path)
     """
-
     for sep in common_path_separators:
         if sep in path:
             _, path = path.rsplit(sep, 1)
@@ -1053,7 +1067,7 @@ def secure_filename(path, destiny_os=os.name, fs_encoding=compat.FS_ENCODING):
 
 def alternative_filename(filename, attempt=None):
     """
-    Generates an alternative version of given filename.
+    Generate an alternative version of given filename.
 
     If an number attempt parameter is given, will be used on the alternative
     name, a random value will be used otherwise.
diff --git a/browsepy/manager.py b/browsepy/manager.py
index 3253430..06bf1e4 100644
--- a/browsepy/manager.py
+++ b/browsepy/manager.py
@@ -531,8 +531,7 @@ class MimetypePluginManager(RegistrablePluginManager):
 
     def get_mimetype(self, path):
         """
-        Get mimetype of given path calling all registered mime functions (and
-        default ones).
+        Get mimetype of given path based on registered mimetype functions.
 
         :param path: filesystem path of file
         :type path: str
@@ -613,7 +612,7 @@ class ArgumentPluginManager(PluginManagerBase):
 
     def extract_plugin_arguments(self, plugin):
         """
-        Extract registered argument pairs from given plugin name,
+        Extract registered argument pairs from given plugin name.
 
         Arguments are returned as an iterable of (args, kwargs) tuples.
 
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index c5487d7..13db710 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -112,6 +112,7 @@ class PlayableDirectory(PlayableNode, Directory):
 
     @property
     def parent(self):
+        """Get directory."""
         return Directory(self.path, self.app)
 
     def entries(self, sortkey=None, reverse=None):
diff --git a/browsepy/tests/test_code.py b/browsepy/tests/test_code.py
index 41c7944..fda2512 100644
--- a/browsepy/tests/test_code.py
+++ b/browsepy/tests/test_code.py
@@ -1,6 +1,7 @@
+
 import re
 
-import unittest_resources.testing as bases
+import unittest_resources.testing as base
 
 
 class Rules:
@@ -11,25 +12,23 @@ class Rules:
     meta_resource_pattern = re.compile(r'^([^t]*|t(?!ests?))+\.py$')
 
 
-# class TypingTestCase(Rules, bases.TypingTestCase):
-#     """TestCase checking :module:`mypy`."""
-#
-#     pass
+class TypingTestCase(Rules, base.TypingTestCase):
+    """TestCase checking :module:`mypy`."""
 
 
-class CodeStyleTestCase(Rules, bases.CodeStyleTestCase):
+class CodeStyleTestCase(Rules, base.CodeStyleTestCase):
     """TestCase checking :module:`pycodestyle`."""
 
 
-# class DocStyleTestCase(Rules, bases.DocStyleTestCase):
-#     """TestCase checking :module:`pydocstyle`."""
+class DocStyleTestCase(Rules, base.DocStyleTestCase):
+    """TestCase checking :module:`pydocstyle`."""
 
 
-class MaintainabilityIndexTestCase(Rules, bases.MaintainabilityIndexTestCase):
+class MaintainabilityIndexTestCase(Rules, base.MaintainabilityIndexTestCase):
     """TestCase checking :module:`radon` maintainability index."""
 
 
-class CodeComplexityTestCase(Rules, bases.CodeComplexityTestCase):
+class CodeComplexityTestCase(Rules, base.CodeComplexityTestCase):
     """TestCase checking :module:`radon` code complexity."""
 
     max_class_complexity = 7
-- 
GitLab


From c509461e020f70b1e4b6393fc9f9f3c8d84bf811 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 3 Jan 2020 13:15:11 +0000
Subject: [PATCH 161/171] fixes

---
 .gitlab-ci.yml                     |  2 +-
 browsepy/plugin/player/playable.py |  5 -----
 browsepy/plugin/player/tests.py    | 14 ++++++--------
 browsepy/templates/manifest.json   | 12 ++++++------
 browsepy/transform/compress.py     |  5 +----
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95f8105..6d79b12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ stages:
   dependencies: []
   before_script:
   - |
-    apk add --no-cache build-base libffi-dev python3-dev
+    apk add --no-cache build-base libressl-dev libffi-dev python3-dev
     pip install twine
 
 # stage: tests
diff --git a/browsepy/plugin/player/playable.py b/browsepy/plugin/player/playable.py
index 13db710..3a64bb2 100644
--- a/browsepy/plugin/player/playable.py
+++ b/browsepy/plugin/player/playable.py
@@ -110,11 +110,6 @@ class PlayableDirectory(PlayableNode, Directory):
 
     playable_list = True
 
-    @property
-    def parent(self):
-        """Get directory."""
-        return Directory(self.path, self.app)
-
     def entries(self, sortkey=None, reverse=None):
         """Iterate playable directory playable files."""
         for node in self.listdir(sortkey=sortkey, reverse=reverse):
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index da6adff..958e409 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -171,7 +171,7 @@ class TestPlayable(TestIntegrationBase):
             None
             )
 
-    def test_playablefile(self):
+    def test_playable_file(self):
         exts = {
             'mp3': 'mp3',
             'wav': 'wav',
@@ -182,7 +182,7 @@ class TestPlayable(TestIntegrationBase):
             self.assertEqual(pf.extension, extension)
             self.assertEqual(pf.title, 'asdf.%s' % ext)
 
-    def test_playabledirectory(self):
+    def test_playable_directory(self):
         file = p(self.base, 'playable.mp3')
         open(file, 'w').close()
         node = browsepy_file.Directory(self.base, app=self.app)
@@ -190,8 +190,6 @@ class TestPlayable(TestIntegrationBase):
 
         directory = self.module.PlayableDirectory(self.base, app=self.app)
 
-        self.assertEqual(directory.parent.path, directory.path)
-
         entries = directory.entries()
         self.assertEqual(next(entries).path, file)
         self.assertRaises(StopIteration, next, entries)
@@ -199,7 +197,7 @@ class TestPlayable(TestIntegrationBase):
         os.remove(file)
         self.assertFalse(self.module.PlayableDirectory.detect(node))
 
-    def test_playlistfile(self):
+    def test_playlist(self):
         pf = self.module.PlayableNode.from_urlpath(
             path='filename.m3u', app=self.app)
         self.assertTrue(isinstance(pf, self.module.PlayableFile))
@@ -210,7 +208,7 @@ class TestPlayable(TestIntegrationBase):
             path='filename.pls', app=self.app)
         self.assertTrue(isinstance(pf, self.module.PlayableFile))
 
-    def test_m3ufile(self):
+    def test_m3u_file(self):
         data = (
             '{0}/valid.mp3\n'
             '/outside.ogg\n'
@@ -226,7 +224,7 @@ class TestPlayable(TestIntegrationBase):
             [p(self.base, 'valid.mp3'), p(self.base, 'relative.ogg')]
             )
 
-    def test_plsfile(self):
+    def test_pls_file(self):
         data = (
             '[playlist]\n'
             'File1={0}/valid.mp3\n'
@@ -243,7 +241,7 @@ class TestPlayable(TestIntegrationBase):
             [p(self.base, 'valid.mp3'), p(self.base, 'relative.ogg')]
             )
 
-    def test_plsfile_with_holes(self):
+    def test_pls_file_with_holes(self):
         data = (
             '[playlist]\n'
             'File1={0}/valid.mp3\n'
diff --git a/browsepy/templates/manifest.json b/browsepy/templates/manifest.json
index 48e3645..c0fecd3 100644
--- a/browsepy/templates/manifest.json
+++ b/browsepy/templates/manifest.json
@@ -2,37 +2,37 @@
     "name": "{{ config.get('APPLICATION_NAME', 'browsepy') }}",
     "icons": [
         {
-            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-36x36.png') }}",
+            "src": "{{ url_for('static', filename='icon/android-icon-36x36.png') }}",
             "sizes": "36x36",
             "type": "image/png",
             "density": "0.75"
         },
         {
-            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-48x48.png') }}",
+            "src": "{{ url_for('static', filename='icon/android-icon-48x48.png') }}",
             "sizes": "48x48",
             "type": "image/png",
             "density": "1.0"
         },
         {
-            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-72x72.png') }}",
+            "src": "{{ url_for('static', filename='icon/android-icon-72x72.png') }}",
             "sizes": "72x72",
             "type": "image/png",
             "density": "1.5"
         },
         {
-            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-96x96.png') }}",
+            "src": "{{ url_for('static', filename='icon/android-icon-96x96.png') }}",
             "sizes": "96x96",
             "type": "image/png",
             "density": "2.0"
         },
         {
-            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-144x144.png') }}",
+            "src": "{{ url_for('static', filename='icon/android-icon-144x144.png') }}",
             "sizes": "144x144",
             "type": "image/png",
             "density": "3.0"
         },
         {
-            "src": "{{ url_for('browsepy.static', filename='icon/android-icon-192x192.png') }}",
+            "src": "{{ url_for('static', filename='icon/android-icon-192x192.png') }}",
             "sizes": "192x192",
             "type": "image/png",
             "density": "4.0"
diff --git a/browsepy/transform/compress.py b/browsepy/transform/compress.py
index 436d7a1..030d8ff 100755
--- a/browsepy/transform/compress.py
+++ b/browsepy/transform/compress.py
@@ -2,7 +2,6 @@
 
 import re
 
-import abc
 import jinja2
 import jinja2.ext
 import jinja2.lexer
@@ -10,15 +9,13 @@ import jinja2.lexer
 from . import StateMachine
 
 
-class Context(abc.ABC):
+class Context(object):
     """Compression context stub class."""
 
-    @abc.abstractmethod
     def feed(self, token):
         """Add token to context an yield tokens."""
         yield token
 
-    @abc.abstractmethod
     def finish(self):
         """Finish context and yield tokens."""
         return
-- 
GitLab


From 487491faf1e77ea437fdf89adb0ac3f940b309d4 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 3 Jan 2020 13:20:14 +0000
Subject: [PATCH 162/171] fix directory play breadcrumbs

---
 browsepy/plugin/player/templates/audio.player.html | 2 +-
 browsepy/templates/base.html                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browsepy/plugin/player/templates/audio.player.html b/browsepy/plugin/player/templates/audio.player.html
index de66d18..4792153 100644
--- a/browsepy/plugin/player/templates/audio.player.html
+++ b/browsepy/plugin/player/templates/audio.player.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block header %}
-  <h1>{{ breadcrumbs(file) }}</h1>
+  <h1>{{ breadcrumbs(file, circular=True) }}</h1>
   <h2>Play</h2>
 {% endblock %}
 
diff --git a/browsepy/templates/base.html b/browsepy/templates/base.html
index bcc09f0..620315b 100644
--- a/browsepy/templates/base.html
+++ b/browsepy/templates/base.html
@@ -9,7 +9,7 @@
     {% for parent in file.ancestors[::-1] %}
       <li>{{ breadcrumb(parent) }}</li>
     {% endfor %}
-    {% if circular %}
+    {% if circular and file.is_directory %}
       <li>{{ breadcrumb(file) }}</li>
     {% elif file.name %}
       <li><span>{{ file.name }}</span></li>
-- 
GitLab


From 547e00915e4c117c725fd7722cc2a339ec4551b9 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 3 Jan 2020 15:25:47 +0000
Subject: [PATCH 163/171] move alpha versioning to setup command, use for docs

---
 .gitlab-ci.yml | 18 ++++++++---------
 setup.py       | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d79b12..1ef5c6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,9 +39,7 @@ stages:
     apk add --no-cache build-base libffi-dev python3-dev
     pip install coverage flake8 wheel
   script:
-  - |
-    flake8 ${MODULE}
-    coverage run -p setup.py test
+  - coverage run -p setup.py flake8 test
 
 .report:
   extends: .python
@@ -102,7 +100,7 @@ coverage:
     - htmlcov
   coverage: '/^TOTAL\s+(?:\d+\s+)*(\d+\%)$/'
   before_script:
-    - pip install coverage
+  - pip install coverage
   script:
   - |
     coverage combine
@@ -120,7 +118,11 @@ doc:
     apk add --no-cache make
     pip install -r requirements/doc.txt
   script:
-  - make -C doc html
+  - |
+    if [ "${CI_COMMIT_REF_NAME}" != "master" ]; then
+      python setup.py alpha_version
+    fi
+    make -C doc html
 
 # stage: publish
 
@@ -174,11 +176,7 @@ publish-next:
     - next
   script:
   - |
-    ALPHA=$(date +%s)
-    SED_REGEX="s/^__version__\s*=\s*[\"']([^\"']+)[\"']\$/__version__ = '\\1a${ALPHA}'/g"
-    SED_PATH="${MODULE}/__init__.py"
-    sed -ri "${SED_REGEX}" "${SED_PATH}"
-    python setup.py bdist_wheel sdist
+    python setup.py alpha_version bdist_wheel sdist
     twine upload --repository-url=https://test.pypi.org/legacy/ dist/*
 
 publish-master:
diff --git a/setup.py b/setup.py
index 2c149bc..5a20a49 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,20 @@
-# -*- coding: utf-8 -*-
+"""
+Browsepy package setup script.
 
+Usage
+-----
+
+..code-block:: python
+
+    python setup.py --help-commands
+
+"""
 import io
 import re
 import os
 import sys
+import time
+import distutils
 
 from setuptools import setup, find_packages
 
@@ -19,6 +30,44 @@ for debugger in ('ipdb', 'pudb', 'pdb'):
         os.environ['UNITTEST_DEBUG'] = debugger
         sys.argv.remove(opt)
 
+
+class AlphaVersionCommand(distutils.cmd.Command):
+    """Command which update package version with alpha timestamp."""
+
+    description = 'update package version with alpha timestamp'
+    user_options = [('alpha=', None, 'alpha version (defaults to timestamp)')]
+
+    def initialize_options(self):
+        """Set alpha version."""
+        self.alpha = '{:.0f}'.format(time.time())
+
+    def finalize_options(self):
+        """Check alpha version."""
+        assert self.alpha, 'alpha cannot be empty'
+
+    def iter_package_paths(self):
+        for package in self.distribution.packages:
+            path = '{}/__init__.py'.format(package.replace('.', os.sep))
+            if os.path.isfile(path):
+                yield path
+
+    def run(self):
+        """Run command."""
+        for p in self.iter_package_paths():
+            self.announce('Updating: {}'.format(p), level=distutils.log.INFO)
+            with io.open(p, 'r+', encoding='utf8') as f:
+                data = re.sub(
+                    r'__version__ = \'(?P<version>[^a\']+)(a\d+)?\'',
+                    lambda m: '__version__ = {!r}'.format(
+                        '{}a{}'.format(m.groupdict()['version'], self.alpha)
+                        ),
+                    f.read(),
+                    )
+                f.seek(0)
+                f.write(data)
+                f.truncate()
+
+
 setup(
     name='browsepy',
     version=version,
@@ -37,6 +86,9 @@ setup(
         ],
     keywords=['web', 'file', 'browser'],
     packages=find_packages(),
+    cmdclass={
+        'alpha_version': AlphaVersionCommand,
+    },
     entry_points={
         'console_scripts': (
             'browsepy=browsepy.__main__:main'
-- 
GitLab


From 8c6bc2dd5b16d5ecc1a5957aecaac3835fc3d8d5 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Fri, 3 Jan 2020 18:17:32 +0000
Subject: [PATCH 164/171] drop six dependency, add xml and js compression

---
 browsepy/__init__.py               | 19 ++++----
 browsepy/compat.py                 |  7 +--
 browsepy/plugin/player/playlist.py |  3 +-
 browsepy/plugin/player/tests.py    |  6 ---
 browsepy/tests/test_transform.py   | 39 +++++++++++++++
 browsepy/transform/__init__.py     |  4 +-
 browsepy/transform/compress.py     | 77 ++++++++++++++++++++++++++----
 requirements/base.txt              |  1 -
 setup.py                           |  1 -
 9 files changed, 122 insertions(+), 35 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index 7a054e6..a18044c 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -218,6 +218,10 @@ def browse(path):
     sort_fnc, sort_reverse = browse_sortkey_reverse(sort_property)
     directory = Node.from_urlpath(path)
     if directory.is_directory and not directory.is_excluded:
+        last_modified = max(
+            directory.content_mtime,
+            current_app.config['APPLICATION_TIME'],
+            )
         response = stream_template(
             'browse.html',
             file=directory,
@@ -225,13 +229,10 @@ def browse(path):
             sort_fnc=sort_fnc,
             sort_reverse=sort_reverse,
             )
-        response.last_modified = max(
-            directory.content_mtime,
-            current_app.config['APPLICATION_TIME'],
-            )
+        response.last_modified = last_modified
         response.set_etag(
             etag(
-                content_mtime=directory.content_mtime,
+                last_modified=last_modified,
                 sort_property=sort_property,
                 ),
             )
@@ -314,11 +315,11 @@ def upload(path):
 @create_app.route('/<any("manifest.json", "browserconfig.xml"):filename>')
 def metadata(filename):
     """Handle metadata request, serve browse metadata file."""
-    response = current_app.response_class(
-        render_template(filename),
-        content_type=mimetype.by_python(filename),
-        )
+    last_modified = current_app.config['APPLICATION_TIME']
+    response = stream_template(filename)
+    response.content_type = mimetype.by_python(filename)
     response.last_modified = current_app.config['APPLICATION_TIME']
+    response.set_etag(etag(last_modified=last_modified))
     response.make_conditional(request)
     return response
 
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 48d9f05..383fd1f 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -4,7 +4,6 @@ import typing
 import os
 import os.path
 import sys
-import six
 import errno
 import time
 import tempfile
@@ -142,7 +141,6 @@ def rmtree(path):
 
     :param path: path to remove
     """
-    exc_info = ()
     for retry in range(10):
         try:
             return _unsafe_rmtree(path)
@@ -151,10 +149,9 @@ def rmtree(path):
               getattr(error, prop, None) in values
               for prop, values in RETRYABLE_OSERROR_PROPERTIES.items()
               ):
-                raise
-            exc_info = sys.exc_info()
+                break
         time.sleep(0.1)
-    six.reraise(*exc_info)
+    raise error
 
 
 @contextlib.contextmanager
diff --git a/browsepy/plugin/player/playlist.py b/browsepy/plugin/player/playlist.py
index f462308..5472a3b 100644
--- a/browsepy/plugin/player/playlist.py
+++ b/browsepy/plugin/player/playlist.py
@@ -4,8 +4,7 @@ import sys
 import codecs
 import os.path
 import warnings
-
-from six.moves import configparser, range
+import configparser
 
 from browsepy.file import underscore_replace, check_under_base
 
diff --git a/browsepy/plugin/player/tests.py b/browsepy/plugin/player/tests.py
index 958e409..fefc53a 100644
--- a/browsepy/plugin/player/tests.py
+++ b/browsepy/plugin/player/tests.py
@@ -5,8 +5,6 @@ import os.path
 import unittest
 import tempfile
 
-import six
-import six.moves
 import flask
 
 import browsepy
@@ -319,8 +317,4 @@ class TestBlueprint(TestPlayerBase):
 
 
 def p(*args):
-    args = [
-        arg if isinstance(arg, six.text_type) else arg.decode('utf-8')
-        for arg in args
-        ]
     return os.path.join(*args)
diff --git a/browsepy/tests/test_transform.py b/browsepy/tests/test_transform.py
index 0fd9362..dfb324c 100755
--- a/browsepy/tests/test_transform.py
+++ b/browsepy/tests/test_transform.py
@@ -5,6 +5,7 @@ import warnings
 
 import browsepy.transform
 import browsepy.transform.glob
+import browsepy.transform.compress
 
 
 class TestStateMachine(unittest.TestCase):
@@ -99,3 +100,41 @@ class TestGlob(unittest.TestCase):
                 warnings.simplefilter("always")
                 self.assertEqual(self.translate(source, sep='/'), result)
                 self.assertSubclass(w[-1].category, Warning)
+
+
+class TestXML(unittest.TestCase):
+    module = browsepy.transform.compress
+
+    @classmethod
+    def translate(cls, data):
+        return ''.join(cls.module.SGMLCompressContext(data))
+
+    def test_compression(self):
+        a = '''
+            <root
+                attr="true">with some text content </root>
+            '''
+        b = '<root attr="true">with some text content </root>'
+        self.assertEqual(self.translate(a), b)
+
+
+class TestJS(unittest.TestCase):
+    module = browsepy.transform.compress
+
+    @classmethod
+    def translate(cls, data):
+        return ''.join(cls.module.JSCompressContext(data))
+
+    def test_compression(self):
+        a = '''
+            function a() {
+                return 1 + 7 /2
+            }
+            var a = {b: ' this '}; // line comment
+            /*
+             * multiline comment
+             */
+            [1,2,3][0]
+            '''
+        b = 'function a(){return 1+7/2}var a={b:\' this \'};[1,2,3][0]'
+        self.assertEqual(self.translate(a), b)
diff --git a/browsepy/transform/__init__.py b/browsepy/transform/__init__.py
index 25afd2b..2086de4 100755
--- a/browsepy/transform/__init__.py
+++ b/browsepy/transform/__init__.py
@@ -1,7 +1,7 @@
 """Generic string transform module."""
 
 
-class StateMachine(object):
+class StateMachine:
     """
     Character-driven finite state machine.
 
@@ -133,7 +133,7 @@ class StateMachine(object):
         :yields: result chunks
         :ytype: str
         """
-        self.pending += data
         self.streaming = False
+        self.pending += data
         for i in self:
             yield i
diff --git a/browsepy/transform/compress.py b/browsepy/transform/compress.py
index 030d8ff..a04dcc0 100755
--- a/browsepy/transform/compress.py
+++ b/browsepy/transform/compress.py
@@ -1,6 +1,7 @@
 """Module providing HTML compression extension jinja2."""
 
 import re
+import functools
 
 import jinja2
 import jinja2.ext
@@ -9,7 +10,7 @@ import jinja2.lexer
 from . import StateMachine
 
 
-class Context(object):
+class UncompressedContext:
     """Compression context stub class."""
 
     def feed(self, token):
@@ -22,7 +23,7 @@ class Context(object):
         yield
 
 
-class CompressContext(StateMachine, Context):
+class CompressContext(StateMachine):
     """Base jinja2 template token finite state machine."""
 
     token_class = jinja2.lexer.Token
@@ -126,14 +127,76 @@ class HTMLCompressContext(SGMLCompressContext):
         }
 
 
+class JSCompressContext(CompressContext):
+    """Compression context for jinja2 JavaScript templates."""
+
+    jumps = {
+        'code': {
+            '\'': 'single_string',
+            '"': 'double_string',
+            '//': 'line_comment',
+            '/*': 'multiline_comment',
+            },
+        'single_string': {
+            '\'': 'code',
+            '\\\'': 'single_string_escape',
+            },
+        'single_string_escape': {
+            c: 'single-string' for c in ('\\', '\'', '')
+            },
+        'double_string': {
+            '"': 'code',
+            '\\"': 'double_string_escape',
+            },
+        'double_string_escape': {
+            c: 'double_string' for c in ('\\', '"', '')
+            },
+        'line_comment': {
+            '\n': 'ignore',
+            },
+        'multiline_comment': {
+            '*/': 'ignore',
+            },
+        'ignore': {
+            '': 'code',
+            }
+        }
+    current = 'code'
+    pristine = True
+    strip_tokens = staticmethod(
+        functools.partial(
+            re.compile(r'\s+[^\w\d\s]\s*|[^\w\d\s]\s+').sub,
+            lambda x: x.group(0).strip()
+            )
+        )
+
+    def transform_code(self, data, mark, next):
+        """Compress JS-like code."""
+        if self.pristine:
+            data = data.lstrip()
+            self.pristine = False
+        return self.strip_tokens(data)
+
+    def transform_ignore(self, data, mark, next):
+        """Ignore text."""
+        self.pristine = True
+        return ''
+
+    transform_line_comment = transform_ignore
+    transform_multiline_comment = transform_ignore
+
+
 class TemplateCompress(jinja2.ext.Extension):
     """Jinja2 HTML template compression extension."""
 
-    default_context_class = Context
+    default_context_class = UncompressedContext
     context_classes = {
+        '.xml': SGMLCompressContext,
         '.xhtml': HTMLCompressContext,
         '.html': HTMLCompressContext,
         '.htm': HTMLCompressContext,
+        '.json': JSCompressContext,
+        '.js': JSCompressContext,
         }
 
     def get_context(self, filename=None):
@@ -147,10 +210,6 @@ class TemplateCompress(jinja2.ext.Extension):
     def filter_stream(self, stream):
         """Yield compressed tokens from :class:`~jinja2.lexer.TokenStream`."""
         transform = self.get_context(stream.name)
-
         for token in stream:
-            for compressed in transform.feed(token):
-                yield compressed
-
-        for compressed in transform.finish():
-            yield compressed
+            yield from transform.feed(token)
+        yield from transform.finish()
diff --git a/requirements/base.txt b/requirements/base.txt
index 0738ade..c31d9ae 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -13,7 +13,6 @@
 # - requirements/doc.txt
 #
 
-six
 flask
 cookieman
 unicategories
diff --git a/setup.py b/setup.py
index 5a20a49..9fea65d 100644
--- a/setup.py
+++ b/setup.py
@@ -107,7 +107,6 @@ setup(
         'setuptools>36.2',
         ],
     install_requires=[
-        'six',
         'flask',
         'cookieman',
         'unicategories',
-- 
GitLab


From 4a1e2e8287e06a5ca413f59124791580b46c948a Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 4 Jan 2020 18:22:49 +0000
Subject: [PATCH 165/171] refactor/optimize state machines, use jinja2
 packageloader,

---
 browsepy/__init__.py                          |  9 +-
 browsepy/tests/test_transform.py              | 29 +++---
 browsepy/transform/__init__.py                | 90 ++++++++++++-------
 .../transform/{compress.py => template.py}    | 64 ++++++-------
 4 files changed, 113 insertions(+), 79 deletions(-)
 rename browsepy/transform/{compress.py => template.py} (76%)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index a18044c..f612eb1 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -7,6 +7,7 @@ import os
 import os.path
 import time
 
+import jinja2
 import cookieman
 
 from flask import (
@@ -60,9 +61,13 @@ def init_config():
             ),
         EXCLUDE_FNC=None,
         )
+    current_app.jinja_loader = jinja2.PackageLoader(
+        __package__,
+        current_app.template_folder
+        )
     current_app.jinja_env.add_extension(
-        'browsepy.transform.compress.TemplateCompress')
-
+        'browsepy.transform.template.MinifyExtension',
+        )
     if 'BROWSEPY_SETTINGS' in os.environ:
         current_app.config.from_envvar('BROWSEPY_SETTINGS')
 
diff --git a/browsepy/tests/test_transform.py b/browsepy/tests/test_transform.py
index dfb324c..cbea4be 100755
--- a/browsepy/tests/test_transform.py
+++ b/browsepy/tests/test_transform.py
@@ -5,7 +5,7 @@ import warnings
 
 import browsepy.transform
 import browsepy.transform.glob
-import browsepy.transform.compress
+import browsepy.transform.template
 
 
 class TestStateMachine(unittest.TestCase):
@@ -103,13 +103,13 @@ class TestGlob(unittest.TestCase):
 
 
 class TestXML(unittest.TestCase):
-    module = browsepy.transform.compress
+    module = browsepy.transform.template
 
     @classmethod
     def translate(cls, data):
-        return ''.join(cls.module.SGMLCompressContext(data))
+        return ''.join(cls.module.SGMLMinifyContext(data))
 
-    def test_compression(self):
+    def test_minify(self):
         a = '''
             <root
                 attr="true">with some text content </root>
@@ -119,22 +119,29 @@ class TestXML(unittest.TestCase):
 
 
 class TestJS(unittest.TestCase):
-    module = browsepy.transform.compress
+    module = browsepy.transform.template
 
     @classmethod
     def translate(cls, data):
-        return ''.join(cls.module.JSCompressContext(data))
+        return ''.join(cls.module.JSMinifyContext(data))
 
-    def test_compression(self):
-        a = '''
-            function a() {
+    def test_minify(self):
+        a = r'''
+            function    a() {
                 return 1 + 7 /2
             }
-            var a = {b: ' this '}; // line comment
+            var a = {b: ' this\' '}; // line comment
             /*
              * multiline comment
              */
+            window
+            .location
+            .href =      '#top';
             [1,2,3][0]
             '''
-        b = 'function a(){return 1+7/2}var a={b:\' this \'};[1,2,3][0]'
+        b = (
+            'function a(){return 1+7/2}var a={b:\' this\\\' \'};'
+            'window.location.href=\'#top\';'
+            '[1,2,3][0]'
+            )
         self.assertEqual(self.translate(a), b)
diff --git a/browsepy/transform/__init__.py b/browsepy/transform/__init__.py
index 2086de4..c1ed656 100755
--- a/browsepy/transform/__init__.py
+++ b/browsepy/transform/__init__.py
@@ -1,25 +1,64 @@
 """Generic string transform module."""
 
+import typing
+
+
+NearestOptions = typing.List[typing.Tuple[str, str]]
+
 
 class StateMachine:
     """
     Character-driven finite state machine.
 
-    Useful for implementig simple string transforms, transpilators,
+    Useful to implement simple string transforms, transpilators,
     compressors and so on.
 
     Important: when implementing this class, you must set the :attr:`current`
     attribute to a key defined in :attr:`jumps` dict.
     """
 
-    jumps = {}  # finite state machine jumps
+    # finite state machine jumps
+    jumps = {}  # type: typing.Mapping[str, typing.Mapping[str, str]]
+
     start = ''  # character which started current state
     current = ''  # current state (an initial value must be set)
     pending = ''  # unprocessed remaining data
-    streaming = False  # stream mode toggle
+    streaming = False  # streaming mode flag
+
+    @property
+    def nearest_options(self):
+        # type: () -> typing.Tuple[int, NearestOptions, typing.Optional[str]]
+        """
+        Get both margin and jump options for current state.
+
+        Jump option pairs are sorted by search order.
+
+        :returns: tuple with right margin and sorted list of jump options.
+        """
+        cached = self.nearest_cache.get(self.current)
+        if cached:
+            return cached
+
+        try:
+            jumps = self.jumps[self.current]
+        except KeyError:
+            raise KeyError(
+                'Current state %r not defined in %s.jumps.'
+                % (self.current, self.__class__)
+                )
+        margin = max(map(len, jumps), default=0)
+        options = sorted(
+            jumps.items(),
+            key=lambda x: (len(x[0]), x[0]),
+            reverse=True,
+            )
+        fallback = options.pop()[1] if options and not options[-1][0] else None
+        self.nearest_cache[self.current] = margin, options, fallback
+        return margin, options, fallback
 
     @property
     def nearest(self):
+        # type: () -> typing.Tuple[int, str, typing.Optional[str]]
         """
         Get the next state jump.
 
@@ -30,42 +69,30 @@ class StateMachine:
         If none is found, the returned next state label will be None.
 
         :returns: tuple with index, substring and next state label
-        :rtype: tuple
         """
-        try:
-            options = self.jumps[self.current]
-        except KeyError:
-            raise KeyError(
-                'Current state %r not defined in %s.jumps.'
-                % (self.current, self.__class__)
-                )
+        margin, options, fallback = self.nearest_options
         offset = len(self.start)
-        index = len(self.pending)
-        if self.streaming:
-            index -= max(map(len, options))
-        key = (index, 1)
-        result = (index, '', None)
-        for amark, anext in options.items():
-            asize = len(amark)
-            aindex = self.pending.find(amark, offset, index + asize)
+        index = len(self.pending) - (margin if self.streaming else 0)
+        result = (offset, '', fallback)
+        for amark, anext in options:
+            aindex = self.pending.find(amark, offset, index)
             if aindex > -1:
                 index = aindex
-                akey = (aindex, -asize)
-                if akey < key:
-                    key = akey
-                    result = (aindex, amark, anext)
+                result = (aindex, amark, anext)
         return result
 
     def __init__(self, data=''):
+        # type: (str) -> None
         """
         Initialize.
 
         :param data: content will be added to pending data
-        :type data: str
         """
         self.pending += data
+        self.nearest_cache = {}
 
     def __iter__(self):
+        # type: () -> typing.Generator[str, None, None]
         """
         Yield over result chunks, consuming :attr:`pending` data.
 
@@ -74,8 +101,7 @@ class StateMachine:
         On non :attr:`streaming` mode, yield last state's result chunk
         even if unfinished, consuming all pending data.
 
-        :yields: transformation result chunka
-        :ytype: str
+        :yields: transformation result chunks
         """
         index, mark, next = self.nearest
         while next is not None:
@@ -94,6 +120,7 @@ class StateMachine:
                 yield data
 
     def transform(self, data, mark, next):
+        # type: (str, str, typing.Optional[str]) -> str
         """
         Apply the appropriate transformation method.
 
@@ -102,24 +129,19 @@ class StateMachine:
         better know the state is being left.
 
         :param data: string to transform (includes start)
-        :type data: str
         :param mark: string producing the new state jump
-        :type mark: str
         :param next: state is about to star, None on finish
-        :type next: str or None
-
         :returns: transformed data
-        :rtype: str
         """
         method = getattr(self, 'transform_%s' % self.current, None)
         return method(data, mark, next) if method else data
 
     def feed(self, data=''):
+        # type: (str) -> typing.Generator[str, None, None]
         """
         Add input data and yield partial output results.
 
         :yields: result chunks
-        :ytype: str
         """
         self.streaming = True
         self.pending += data
@@ -127,11 +149,11 @@ class StateMachine:
             yield i
 
     def finish(self, data=''):
+        # type: (str) -> typing.Generator[str, None, None]
         """
-        Add input data, end procesing and yield all remaining output.
+        Add input data, end processing and yield all remaining output.
 
         :yields: result chunks
-        :ytype: str
         """
         self.streaming = False
         self.pending += data
diff --git a/browsepy/transform/compress.py b/browsepy/transform/template.py
similarity index 76%
rename from browsepy/transform/compress.py
rename to browsepy/transform/template.py
index a04dcc0..d4cf43c 100755
--- a/browsepy/transform/compress.py
+++ b/browsepy/transform/template.py
@@ -10,8 +10,8 @@ import jinja2.lexer
 from . import StateMachine
 
 
-class UncompressedContext:
-    """Compression context stub class."""
+class OriginalContext:
+    """Non-minifying context stub class."""
 
     def feed(self, token):
         """Add token to context an yield tokens."""
@@ -23,8 +23,8 @@ class UncompressedContext:
         yield
 
 
-class CompressContext(StateMachine):
-    """Base jinja2 template token finite state machine."""
+class MinifyContext(StateMachine):
+    """Base minifying jinja2 template token finite state machine."""
 
     token_class = jinja2.lexer.Token
     block_tokens = {
@@ -49,18 +49,18 @@ class CompressContext(StateMachine):
             if not self.pending:
                 self.lineno = token.lineno
 
-            for data in super(CompressContext, self).feed(token.value):
+            for data in super().feed(token.value):
                 yield self.token_class(self.lineno, 'data', data)
                 self.lineno = token.lineno
 
     def finish(self):
         """Set state machine as finished, yielding remaining tokens."""
-        for data in super(CompressContext, self).finish():
+        for data in super().finish():
             yield self.token_class(self.lineno, 'data', data)
 
 
-class SGMLCompressContext(CompressContext):
-    """Compression context for jinja2 SGML templates."""
+class SGMLMinifyContext(MinifyContext):
+    """Minifying context for jinja2 SGML templates."""
 
     re_whitespace = re.compile('[ \\t\\r\\n]+')
     block_tags = {}  # block content will be treated as literal text
@@ -92,10 +92,10 @@ class SGMLCompressContext(CompressContext):
             if index == -1:
                 return len(self.pending), '', None
             return index, mark, self.current
-        return super(SGMLCompressContext, self).nearest
+        return super().nearest
 
     def transform_tag(self, data, mark, next):
-        """Compress SML tag node."""
+        """Minify SML tag node."""
         tagstart = self.start == '<'
         data = self.re_whitespace.sub(' ', data[1:] if tagstart else data)
         if tagstart:
@@ -108,7 +108,7 @@ class SGMLCompressContext(CompressContext):
         return self.start if data.strip() == self.start else data
 
     def transform_text(self, data, mark, next):
-        """Compress SGML text node."""
+        """Minify SGML text node."""
         if not self.skip_until_text:
             return self.start if data.strip() == self.start else data
         elif next is not None:
@@ -116,8 +116,8 @@ class SGMLCompressContext(CompressContext):
         return data
 
 
-class HTMLCompressContext(SGMLCompressContext):
-    """Compression context for jinja2 HTML templates."""
+class HTMLMinifyContext(SGMLMinifyContext):
+    """Minifying context for jinja2 HTML templates."""
 
     block_tags = {
         'textarea': '</textarea>',
@@ -127,8 +127,8 @@ class HTMLCompressContext(SGMLCompressContext):
         }
 
 
-class JSCompressContext(CompressContext):
-    """Compression context for jinja2 JavaScript templates."""
+class JSMinifyContext(MinifyContext):
+    """Minifying context for jinja2 JavaScript templates."""
 
     jumps = {
         'code': {
@@ -139,14 +139,14 @@ class JSCompressContext(CompressContext):
             },
         'single_string': {
             '\'': 'code',
-            '\\\'': 'single_string_escape',
+            '\\': 'single_string_escape',
             },
         'single_string_escape': {
-            c: 'single-string' for c in ('\\', '\'', '')
+            c: 'single_string' for c in ('\\', '\'', '')
             },
         'double_string': {
             '"': 'code',
-            '\\"': 'double_string_escape',
+            '\\': 'double_string_escape',
             },
         'double_string_escape': {
             c: 'double_string' for c in ('\\', '"', '')
@@ -165,13 +165,13 @@ class JSCompressContext(CompressContext):
     pristine = True
     strip_tokens = staticmethod(
         functools.partial(
-            re.compile(r'\s+[^\w\d\s]\s*|[^\w\d\s]\s+').sub,
-            lambda x: x.group(0).strip()
+            re.compile(r'\s+[^\w\d\s]\s*|[^\w\d\s]\s+|\s{2,}').sub,
+            lambda x: x.group(0).strip() or ' '
             )
         )
 
     def transform_code(self, data, mark, next):
-        """Compress JS-like code."""
+        """Minify JS-like code."""
         if self.pristine:
             data = data.lstrip()
             self.pristine = False
@@ -186,21 +186,21 @@ class JSCompressContext(CompressContext):
     transform_multiline_comment = transform_ignore
 
 
-class TemplateCompress(jinja2.ext.Extension):
-    """Jinja2 HTML template compression extension."""
+class MinifyExtension(jinja2.ext.Extension):
+    """Jinja2 template minifying extension."""
 
-    default_context_class = UncompressedContext
+    default_context_class = OriginalContext
     context_classes = {
-        '.xml': SGMLCompressContext,
-        '.xhtml': HTMLCompressContext,
-        '.html': HTMLCompressContext,
-        '.htm': HTMLCompressContext,
-        '.json': JSCompressContext,
-        '.js': JSCompressContext,
+        '.xml': SGMLMinifyContext,
+        '.xhtml': HTMLMinifyContext,
+        '.html': HTMLMinifyContext,
+        '.htm': HTMLMinifyContext,
+        '.json': JSMinifyContext,
+        '.js': JSMinifyContext,
         }
 
     def get_context(self, filename=None):
-        """Get compression context bassed on given filename."""
+        """Get minifying context based on given filename."""
         if filename:
             for extension, context_class in self.context_classes.items():
                 if filename.endswith(extension):
@@ -208,7 +208,7 @@ class TemplateCompress(jinja2.ext.Extension):
         return self.default_context_class()
 
     def filter_stream(self, stream):
-        """Yield compressed tokens from :class:`~jinja2.lexer.TokenStream`."""
+        """Yield minified tokens from :class:`~jinja2.lexer.TokenStream`."""
         transform = self.get_context(stream.name)
         for token in stream:
             yield from transform.feed(token)
-- 
GitLab


From b3e381389060150f623bafc224fe56f99fce4c01 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sat, 4 Jan 2020 18:25:05 +0000
Subject: [PATCH 166/171] ignore mypy_cache

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4099e7b..40d9a68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .coverage
 .vscode
 
+
 htmlcov
 dist
 build
@@ -21,3 +22,4 @@ package-lock.json
 **/node_modules
 **/*.py[co]
 **/__pycache__
+**/.mypy_cache
-- 
GitLab


From 8882ee6b97053d830cd407c9493321e54d01b2f8 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 5 Jan 2020 02:02:53 +0000
Subject: [PATCH 167/171] remove more legacy code

---
 browsepy/__init__.py              |   7 +-
 browsepy/compat.py                | 162 ++++++++----------------------
 browsepy/file.py                  |  18 ++--
 browsepy/tests/test_app.py        |   4 +-
 browsepy/tests/test_compat.py     |  60 -----------
 browsepy/tests/test_extensions.py |   4 +-
 browsepy/tests/test_plugins.py    |   4 +-
 browsepy/transform/template.py    |   2 +-
 doc/compat.rst                    |  50 +--------
 9 files changed, 59 insertions(+), 252 deletions(-)

diff --git a/browsepy/__init__.py b/browsepy/__init__.py
index f612eb1..0b65493 100644
--- a/browsepy/__init__.py
+++ b/browsepy/__init__.py
@@ -17,7 +17,6 @@ from flask import (
     )
 
 import browsepy.mimetype as mimetype
-import browsepy.compat as compat
 
 from browsepy.appconfig import CreateApp
 from browsepy.manager import PluginManager
@@ -44,7 +43,7 @@ def init_config():
         SECRET_KEY=os.urandom(4096),
         APPLICATION_NAME='browsepy',
         APPLICATION_TIME=0,
-        DIRECTORY_BASE=compat.getcwd(),
+        DIRECTORY_BASE=os.getcwd(),
         DIRECTORY_START=None,
         DIRECTORY_REMOVE=None,
         DIRECTORY_UPLOAD=None,
@@ -63,10 +62,10 @@ def init_config():
         )
     current_app.jinja_loader = jinja2.PackageLoader(
         __package__,
-        current_app.template_folder
+        current_app.template_folder,
         )
     current_app.jinja_env.add_extension(
-        'browsepy.transform.template.MinifyExtension',
+        'browsepy.transform.template.MinifyTemplateExtension',
         )
     if 'BROWSEPY_SETTINGS' in os.environ:
         current_app.config.from_envvar('BROWSEPY_SETTINGS')
diff --git a/browsepy/compat.py b/browsepy/compat.py
index 383fd1f..88abe95 100644
--- a/browsepy/compat.py
+++ b/browsepy/compat.py
@@ -6,7 +6,6 @@ import os.path
 import sys
 import errno
 import time
-import tempfile
 import functools
 import contextlib
 import warnings
@@ -26,6 +25,9 @@ except ImportError:
     from werkzeug.utils import cached_property  # noqa
 
 
+TFunction = typing.Callable[..., typing.Any]
+TFunction2 = typing.Callable[..., typing.Any]
+OSEnvironType = typing.Mapping[str, str]
 FS_ENCODING = sys.getfilesystemencoding()
 TRUE_VALUES = frozenset(
     # Truthy values
@@ -48,7 +50,7 @@ RETRYABLE_OSERROR_PROPERTIES = {
             'EINPROGRESS',
             'EREMOTEIO',
             )
-        if prop and hasattr(errno, prop)
+        if hasattr(errno, prop)
         ),
     'winerror': frozenset(
         # Handle WindowsError instances without errno
@@ -141,126 +143,56 @@ def rmtree(path):
 
     :param path: path to remove
     """
+    error = EnvironmentError
     for retry in range(10):
         try:
             return _unsafe_rmtree(path)
-        except EnvironmentError as error:
-            if not any(
-              getattr(error, prop, None) in values
-              for prop, values in RETRYABLE_OSERROR_PROPERTIES.items()
-              ):
-                break
+        except EnvironmentError as e:
+            if all(getattr(e, p, None) not in v
+                   for p, v in RETRYABLE_OSERROR_PROPERTIES.items()):
+                raise
+            error = e
         time.sleep(0.1)
     raise error
 
 
-@contextlib.contextmanager
-def mkdtemp(suffix='', prefix='', dir=None):
-    """
-    Create a temporary directory context manager.
-
-    Backwards-compatible :class:`tmpfile.TemporaryDirectory` context
-    manager, as it was added on `3.2`.
-
-    :param path: path to iterate
-    :type path: str
-    """
-    path = tempfile.mkdtemp(suffix, prefix, dir)
-    try:
-        yield path
-    finally:
-        rmtree(path)
-
-
 def isexec(path):
+    # type: (str) -> bool
     """
     Check if given path points to an executable file.
 
     :param path: file path
-    :type path: str
     :return: True if executable, False otherwise
-    :rtype: bool
     """
     return os.path.isfile(path) and os.access(path, os.X_OK)
 
 
-def fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
-    """
-    Decode given path using filesystem encoding.
-
-    This is necessary as python has pretty bad filesystem support on
-    some platforms.
-
-    :param path: path will be decoded if using bytes
-    :type path: bytes or str
-    :param os_name: operative system name, defaults to os.name
-    :type os_name: str
-    :param fs_encoding: current filesystem encoding, defaults to autodetected
-    :type fs_encoding: str
-    :return: decoded path
-    :rtype: str
-    """
-    if not isinstance(path, bytes):
-        return path
-    if not errors:
-        errors = 'strict' if os_name == 'nt' else 'surrogateescape'
-    return path.decode(fs_encoding, errors=errors)
-
-
-def fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None):
-    """
-    Encode given path using filesystem encoding.
-
-    This is necessary as python has pretty bad filesystem support on
-    some platforms.
-
-    :param path: path will be encoded if not using bytes
-    :type path: bytes or str
-    :param os_name: operative system name, defaults to os.name
-    :type os_name: str
-    :param fs_encoding: current filesystem encoding, defaults to autodetected
-    :type fs_encoding: str
-    :return: encoded path
-    :rtype: bytes
-    """
-    if isinstance(path, bytes):
-        return path
-    if not errors:
-        errors = 'strict' if os_name == 'nt' else 'surrogateescape'
-    return path.encode(fs_encoding, errors=errors)
-
-
-def getcwd(fs_encoding=FS_ENCODING, cwd_fnc=os.getcwd):
-    """
-    Get current work directory's absolute path.
-
-    Like os.getcwd but garanteed to return an unicode-str object.
-
-    :param fs_encoding: filesystem encoding, defaults to autodetected
-    :type fs_encoding: str
-    :param cwd_fnc: callable used to get the path, defaults to os.getcwd
-    :type cwd_fnc: Callable
-    :return: path
-    :rtype: str
-    """
-    path = fsdecode(cwd_fnc(), fs_encoding=fs_encoding)
-    return os.path.abspath(path)
-
-
 def getdebug(environ=os.environ, true_values=TRUE_VALUES):
+    # type: (OSEnvironType, typing.Iterable[str]) -> bool
     """
     Get if app is running in debug mode.
 
     This is detected looking at environment variables.
 
     :param environ: environment dict-like object
-    :type environ: collections.abc.Mapping
+    :param true_values: iterable of truthy values
     :returns: True if debug contains a true-like string, False otherwise
-    :rtype: bool
     """
     return environ.get('DEBUG', '').lower() in true_values
 
 
+@typing.overload
+def deprecated(func_or_text, environ=os.environ):
+    # type: (str, OSEnvironType) -> typing.Callable[[TFunction], TFunction]
+    """Get deprecation decorator with given message."""
+
+
+@typing.overload
+def deprecated(func_or_text, environ=os.environ):
+    # type: (TFunction, OSEnvironType) -> TFunction
+    """Decorate with default deprecation message."""
+
+
 def deprecated(func_or_text, environ=os.environ):
     """
     Decorate function and mark it as deprecated.
@@ -268,11 +200,8 @@ def deprecated(func_or_text, environ=os.environ):
     Calling a deprected function will result in a warning message.
 
     :param func_or_text: message or callable to decorate
-    :type func_or_text: callable
     :param environ: optional environment mapping
-    :type environ: collections.abc.Mapping
     :returns: nested decorator or new decorated function (depending on params)
-    :rtype: callable
 
     Usage:
 
@@ -306,7 +235,7 @@ def deprecated(func_or_text, environ=os.environ):
 
 
 def usedoc(other):
-    # type: (typing.Any) -> typing.Callable[[...], typing.Any]
+    # type: (TFunction) -> typing.Callable[[TFunction2], TFunction2]
     """
     Get decorating function which copies given object __doc__.
 
@@ -337,17 +266,15 @@ def usedoc(other):
 
 
 def pathsplit(value, sep=os.pathsep):
+    # type: (str, str) -> typing.Generator[str, None, None]
     """
-    Get enviroment PATH elements as list.
+    Iterate environment PATH elements.
 
     This function only cares about spliting across OSes.
 
     :param value: path string, as given by os.environ['PATH']
-    :type value: str
     :param sep: PATH separator, defaults to os.pathsep
-    :type sep: str
     :yields: every path
-    :ytype: str
     """
     for part in value.split(sep):
         if part[:1] == part[-1:] == '"' or part[:1] == part[-1:] == '\'':
@@ -356,20 +283,17 @@ def pathsplit(value, sep=os.pathsep):
 
 
 def pathparse(value, sep=os.pathsep, os_sep=os.sep):
+    # type: (str, str, str) -> typing.Generator[str, None, None]
     """
-    Get enviroment PATH directories as list.
+    Iterate environment PATH directories.
 
     This function cares about spliting, escapes and normalization of paths
     across OSes.
 
     :param value: path string, as given by os.environ['PATH']
-    :type value: str
     :param sep: PATH separator, defaults to os.pathsep
-    :type sep: str
     :param os_sep: OS filesystem path separator, defaults to os.sep
-    :type os_sep: str
-    :yields: every path
-    :ytype: str
+    :yields: every path in PATH
     """
     escapes = []
     normpath = ntpath.normpath if os_sep == '\\' else posixpath.normpath
@@ -387,7 +311,7 @@ def pathparse(value, sep=os.pathsep, os_sep=os.sep):
             part = part[:-1]
         for original, escape, unescape in escapes:
             part = part.replace(escape, unescape)
-        yield normpath(fsdecode(part))
+        yield normpath(part)
 
 
 def pathconf(path,
@@ -419,28 +343,23 @@ ENV_PATH = tuple(pathparse(os.getenv('PATH', '')))
 ENV_PATHEXT = tuple(pathsplit(os.getenv('PATHEXT', '')))
 
 
-def which(name,
-          env_path=ENV_PATH,
-          env_path_ext=ENV_PATHEXT,
-          is_executable_fnc=isexec,
-          path_join_fnc=os.path.join,
-          os_name=os.name):
+def which(name,  # type: str
+          env_path=ENV_PATH,  # type: typing.Iterable[str]
+          env_path_ext=ENV_PATHEXT,  # type: typing.Iterable[str]
+          is_executable_fnc=isexec,  # type: typing.Callable[[str], bool]
+          path_join_fnc=os.path.join,  # type: typing.Callable[[...], str]
+          os_name=os.name,  # type: str
+          ):  # type: (...) -> typing.Optional[str]
     """
     Get command absolute path.
 
     :param name: name of executable command
-    :type name: str
     :param env_path: OS environment executable paths, defaults to autodetected
-    :type env_path: list of str
     :param is_executable_fnc: callable will be used to detect if path is
                               executable, defaults to `isexec`
-    :type is_executable_fnc: Callable
     :param path_join_fnc: callable will be used to join path components
-    :type path_join_fnc: Callable
     :param os_name: os name, defaults to os.name
-    :type os_name: str
     :return: absolute path
-    :rtype: str or None
     """
     for path in env_path:
         for suffix in env_path_ext:
@@ -451,6 +370,7 @@ def which(name,
 
 
 def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
+    # type: (str, typing.Iterable[str]) -> str
     """
     Escape pattern to include it safely into another regex.
 
@@ -460,9 +380,7 @@ def re_escape(pattern, chars=frozenset("()[]{}?*+|^$\\.-#")):
     Logic taken from regex module.
 
     :param pattern: regex pattern to escape
-    :type patterm: str
     :returns: escaped pattern
-    :rtype: str
     """
     chr_escape = '\\{}'.format
     uni_escape = '\\u{:04d}'.format
diff --git a/browsepy/file.py b/browsepy/file.py
index fc95a01..4258faa 100644
--- a/browsepy/file.py
+++ b/browsepy/file.py
@@ -304,7 +304,7 @@ class Node(object):
         :type app: flask.Flask
         :param **defaults: initial property values
         """
-        self.path = compat.fsdecode(path) if path else None
+        self.path = path if path else None
         self.app = utils.solve_local(app or flask.current_app)
         self.__dict__.update(defaults)  # only for attr and cached_property
 
@@ -1053,16 +1053,12 @@ def secure_filename(path, destiny_os=os.name, fs_encoding=compat.FS_ENCODING):
     if isinstance(path, bytes):
         path = path.decode('latin-1', errors=underscore_replace)
 
-    # Decode and recover from filesystem encoding in order to strip unwanted
-    # characters out
-    kwargs = {
-        'os_name': destiny_os,
-        'fs_encoding': fs_encoding,
-        'errors': underscore_replace,
-        }
-    fs_encoded_path = compat.fsencode(path, **kwargs)
-    fs_decoded_path = compat.fsdecode(fs_encoded_path, **kwargs)
-    return fs_decoded_path
+    # encode/decode with filesystem encoding to remove incompatible characters
+    return (
+        path
+        .encode(fs_encoding, errors=underscore_replace)
+        .decode(fs_encoding, errors=underscore_replace)
+        )
 
 
 def alternative_filename(filename, attempt=None):
diff --git a/browsepy/tests/test_app.py b/browsepy/tests/test_app.py
index f8f1d6a..7f791d8 100644
--- a/browsepy/tests/test_app.py
+++ b/browsepy/tests/test_app.py
@@ -3,9 +3,9 @@ import os
 import os.path
 import unittest
 import warnings
+import tempfile
 
 import browsepy
-import browsepy.compat as compat
 import browsepy.appconfig
 
 
@@ -17,7 +17,7 @@ class TestApp(unittest.TestCase):
         self.app.config._warned.clear()
 
     def test_config(self):
-        with compat.mkdtemp() as path:
+        with tempfile.TemporaryDirectory() as path:
             name = os.path.join(path, 'file.py')
             with open(name, 'w') as f:
                 f.write('DIRECTORY_DOWNLOADABLE = False\n')
diff --git a/browsepy/tests/test_compat.py b/browsepy/tests/test_compat.py
index 78292b8..39b57ee 100644
--- a/browsepy/tests/test_compat.py
+++ b/browsepy/tests/test_compat.py
@@ -51,49 +51,6 @@ class TestCompat(unittest.TestCase):
         self.assertTrue(self.module.which('python'))
         self.assertIsNone(self.module.which('lets-put-a-wrong-executable'))
 
-    def test_fsdecode(self):
-        path = b'/a/\xc3\xb1'
-        self.assertEqual(
-            self.module.fsdecode(path, os_name='posix', fs_encoding='utf-8'),
-            path.decode('utf-8')
-            )
-        path = b'/a/\xf1'
-        self.assertEqual(
-            self.module.fsdecode(path, os_name='nt', fs_encoding='latin-1'),
-            path.decode('latin-1')
-            )
-        path = b'/a/\xf1'
-        self.assertRaises(
-            UnicodeDecodeError,
-            self.module.fsdecode,
-            path,
-            fs_encoding='utf-8',
-            errors='strict'
-            )
-
-    def test_fsencode(self):
-        path = b'/a/\xc3\xb1'
-        self.assertEqual(
-            self.module.fsencode(
-                path.decode('utf-8'),
-                fs_encoding='utf-8'
-                ),
-            path
-            )
-        path = b'/a/\xf1'
-        self.assertEqual(
-            self.module.fsencode(
-                path.decode('latin-1'),
-                fs_encoding='latin-1'
-                ),
-            path
-            )
-        path = b'/a/\xf1'
-        self.assertEqual(
-            self.module.fsencode(path, fs_encoding='utf-8'),
-            path
-            )
-
     def test_pathconf(self):
         kwargs = {
             'os_name': 'posix',
@@ -123,23 +80,6 @@ class TestCompat(unittest.TestCase):
         self.assertEqual(pcfg['PC_PATH_MAX'], 246)
         self.assertEqual(pcfg['PC_NAME_MAX'], 242)
 
-    def test_getcwd(self):
-        self.assertIsInstance(self.module.getcwd(), str)
-        self.assertIsInstance(
-            self.module.getcwd(
-                fs_encoding='latin-1',
-                cwd_fnc=lambda: b'\xf1'
-                ),
-            str
-            )
-        self.assertIsInstance(
-            self.module.getcwd(
-                fs_encoding='utf-8',
-                cwd_fnc=lambda: b'\xc3\xb1'
-                ),
-            str
-            )
-
     def test_path(self):
         parse = self.module.pathparse
         self.assertListEqual(
diff --git a/browsepy/tests/test_extensions.py b/browsepy/tests/test_extensions.py
index 202a312..ade273b 100644
--- a/browsepy/tests/test_extensions.py
+++ b/browsepy/tests/test_extensions.py
@@ -2,11 +2,11 @@
 import unittest
 import jinja2
 
-import browsepy.transform.compress
+import browsepy.transform.template
 
 
 class TestHTMLCompress(unittest.TestCase):
-    extension = browsepy.transform.compress.TemplateCompress
+    extension = browsepy.transform.template.MinifyTemplateExtension
 
     def render(self, html, **kwargs):
         data = {'code.html': html}
diff --git a/browsepy/tests/test_plugins.py b/browsepy/tests/test_plugins.py
index 56d11d4..591c01b 100644
--- a/browsepy/tests/test_plugins.py
+++ b/browsepy/tests/test_plugins.py
@@ -3,13 +3,13 @@
 import sys
 import os
 import os.path
+import tempfile
 import unittest
 
 import flask
 
 import browsepy
 import browsepy.manager
-import browsepy.compat as compat
 import browsepy.exceptions as exceptions
 
 
@@ -116,7 +116,7 @@ class TestPlugins(unittest.TestCase):
             'browsepy_testing_',
             )
 
-        with compat.mkdtemp() as base:
+        with tempfile.TemporaryDirectory() as base:
             names = (
                 'browsepy_test_another_plugin',
                 'browsepy_testing_another_plugin',
diff --git a/browsepy/transform/template.py b/browsepy/transform/template.py
index d4cf43c..128b29e 100755
--- a/browsepy/transform/template.py
+++ b/browsepy/transform/template.py
@@ -186,7 +186,7 @@ class JSMinifyContext(MinifyContext):
     transform_multiline_comment = transform_ignore
 
 
-class MinifyExtension(jinja2.ext.Extension):
+class MinifyTemplateExtension(jinja2.ext.Extension):
     """Jinja2 template minifying extension."""
 
     default_context_class = OriginalContext
diff --git a/doc/compat.rst b/doc/compat.rst
index 421d8d7..66ec01c 100644
--- a/doc/compat.rst
+++ b/doc/compat.rst
@@ -10,19 +10,14 @@ Compat Module
   :members:
   :inherited-members:
   :undoc-members:
-  :exclude-members: which, getdebug, deprecated, fsencode, fsdecode, getcwd,
-                    FS_ENCODING, PY_LEGACY, ENV_PATH, TRUE_VALUES
+  :exclude-members: which, getdebug, deprecated,
+                    FS_ENCODING, ENV_PATH, ENV_PATHEXT, TRUE_VALUES
 
 .. attribute:: FS_ENCODING
   :annotation: = sys.getfilesystemencoding()
 
   Detected filesystem encoding: ie. `utf-8`.
 
-.. attribute:: PY_LEGACY
-  :annotation: = sys.version_info < (3, )
-
-  True on Python 2, False on newer.
-
 .. attribute:: ENV_PATH
   :annotation: = ('/usr/local/bin', '/usr/bin', ... )
 
@@ -37,41 +32,6 @@ Compat Module
 
   Values which should be equivalent to True, used by :func:`getdebug`
 
-.. attribute:: FileNotFoundError
-  :annotation: = OSError if PY_LEGACY else FileNotFoundError
-
-  Convenience python exception type reference.
-
-.. attribute:: range
-  :annotation: = xrange if PY_LEGACY else range
-
-  Convenience python builtin function reference.
-
-.. attribute:: filter
-  :annotation: = itertools.ifilter if PY_LEGACY else filter
-
-  Convenience python builtin function reference.
-
-.. attribute:: basestring
-  :annotation: = basestring if PY_LEGACY else str
-
-  Convenience python type reference.
-
-.. attribute:: unicode
-  :annotation: = unicode if PY_LEGACY else str
-
-  Convenience python type reference.
-
-.. attribute:: scandir
-  :annotation: = scandir.scandir or os.walk
-
-  New scandir, either from scandir module or Python3.6+ os module.
-
-.. attribute:: walk
-  :annotation: = scandir.walk or os.walk
-
-  New walk, either from scandir module or Python3.6+ os module.
-
 .. autofunction:: pathconf(path)
 
 .. autofunction:: isexec(path)
@@ -84,12 +44,6 @@ Compat Module
 
 .. autofunction:: usedoc(other)
 
-.. autofunction:: fsdecode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None)
-
-.. autofunction:: fsencode(path, os_name=os.name, fs_encoding=FS_ENCODING, errors=None)
-
-.. autofunction:: getcwd(fs_encoding=FS_ENCODING, cwd_fnc=os.getcwd)
-
 .. autofunction:: re_escape(pattern, chars="()[]{}?*+|^$\\.-#")
 
 .. autofunction:: pathsplit(value, sep=os.pathsep)
-- 
GitLab


From 0642a9771cf886ce6818947a8383afafddcced14 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 5 Jan 2020 10:22:47 +0000
Subject: [PATCH 168/171] setup alpha_version fixes

---
 setup.py | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/setup.py b/setup.py
index 9fea65d..2c764d2 100644
--- a/setup.py
+++ b/setup.py
@@ -18,11 +18,14 @@ import distutils
 
 from setuptools import setup, find_packages
 
+
+version_pattern = re.compile(r'__version__ = \'(.*?)\'')
+
 with io.open('README.rst', 'rt', encoding='utf8') as f:
     readme = f.read()
 
 with io.open('browsepy/__init__.py', 'rt', encoding='utf8') as f:
-    version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
+    version = version_pattern.search(f.read()).group(1)
 
 for debugger in ('ipdb', 'pudb', 'pdb'):
     opt = '--debug=%s' % debugger
@@ -45,27 +48,29 @@ class AlphaVersionCommand(distutils.cmd.Command):
         """Check alpha version."""
         assert self.alpha, 'alpha cannot be empty'
 
-    def iter_package_paths(self):
-        for package in self.distribution.packages:
-            path = '{}/__init__.py'.format(package.replace('.', os.sep))
-            if os.path.isfile(path):
-                yield path
+    def replace_version(self, path, version):
+        """Replace version dunder variable on given path with value."""
+        with io.open(path, 'r+', encoding='utf8') as f:
+            data = version_pattern.sub(
+                '__version__ = {!r}'.format(version),
+                f.read(),
+                )
+            f.seek(0)
+            f.write(data)
+            f.truncate()
 
     def run(self):
         """Run command."""
-        for p in self.iter_package_paths():
-            self.announce('Updating: {}'.format(p), level=distutils.log.INFO)
-            with io.open(p, 'r+', encoding='utf8') as f:
-                data = re.sub(
-                    r'__version__ = \'(?P<version>[^a\']+)(a\d+)?\'',
-                    lambda m: '__version__ = {!r}'.format(
-                        '{}a{}'.format(m.groupdict()['version'], self.alpha)
-                        ),
-                    f.read(),
-                    )
-                f.seek(0)
-                f.write(data)
-                f.truncate()
+        alpha = '{}a{}'.format(version.split('a', 1)[0], self.alpha)
+        path = '/'.join(
+            self.distribution.metadata.name.split('.') + ['__init__.py']
+            )
+        self.execute(
+            self.replace_version,
+            (path, version),
+            'updating {!r} __version__ with {!r}'.format(path, alpha),
+            )
+        self.distribution.metadata.version = alpha
 
 
 setup(
-- 
GitLab


From 113e000575abbc24957a68ee9b6b684f6a23a6bd Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 5 Jan 2020 12:19:54 +0000
Subject: [PATCH 169/171] only run code checks once

---
 .appveyor.yml               |  7 +++----
 .gitlab-ci.yml              | 11 ++++++++++-
 browsepy/tests/test_code.py |  8 ++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 85248bb..441c2e5 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,8 +4,6 @@ branches:
 
 environment:
   matrix:
-  - PYTHON: "C:\\Python27"
-  - PYTHON: "C:\\Python27-x64"
   - PYTHON: "C:\\Python35"
   - PYTHON: "C:\\Python35-x64"
   - PYTHON: "C:\\Python36"
@@ -31,7 +29,8 @@ install:
   SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   python --version
   python -c "import struct; print(struct.calcsize('P') * 8)"
-  pip install --disable-pip-version-check --user --upgrade pip setuptools wheel
 
 test_script:
-- "python setup.py test"
+- |
+  SET NOCODECHECKS=true
+  python setup.py test
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ef5c6d..79ce661 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ stages:
 .test:
   extends: .python
   stage: test
-  variables:
+  variables: &test-variables
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
     COVERAGE_FILE: "${CI_PROJECT_DIR}/.coverage.${CI_JOB_NAME}"
     MODULE: browsepy
@@ -59,14 +59,23 @@ stages:
 python35:
   extends: .test
   image: python:3.5-alpine
+  variables:
+    <<: *test-variables
+    NOCODECHECKS: true
 
 python36:
   extends: .test
   image: python:3.6-alpine
+  variables:
+    <<: *test-variables
+    NOCODECHECKS: true
 
 python37:
   extends: .test
   image: python:3.7-alpine
+  variables:
+    <<: *test-variables
+    NOCODECHECKS: true
 
 python38:
   extends: .test
diff --git a/browsepy/tests/test_code.py b/browsepy/tests/test_code.py
index fda2512..e9ee40f 100644
--- a/browsepy/tests/test_code.py
+++ b/browsepy/tests/test_code.py
@@ -1,9 +1,17 @@
 
 import re
+import os
+import unittest
+
+import browsepy.compat as compat
 
 import unittest_resources.testing as base
 
 
+@unittest.skipIf(
+    os.getenv('NOCODECHECKS') in compat.TRUE_VALUES,
+    'env NOCODECHECKS set to true.'
+    )
 class Rules:
     """Browsepy module mixin."""
 
-- 
GitLab


From 119c9effa6def97b33c075f73e8c4ed182eac566 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 5 Jan 2020 13:15:27 +0000
Subject: [PATCH 170/171] fix yaml

---
 .appveyor.yml  | 5 ++---
 .gitlab-ci.yml | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 441c2e5..b7950df 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,6 +3,7 @@ branches:
   - /^gh-pages(-.*)?$/
 
 environment:
+  NOCODECHECKS: "true"
   matrix:
   - PYTHON: "C:\\Python35"
   - PYTHON: "C:\\Python35-x64"
@@ -31,6 +32,4 @@ install:
   python -c "import struct; print(struct.calcsize('P') * 8)"
 
 test_script:
-- |
-  SET NOCODECHECKS=true
-  python setup.py test
+- python setup.py test
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79ce661..931d1ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,21 +61,21 @@ python35:
   image: python:3.5-alpine
   variables:
     <<: *test-variables
-    NOCODECHECKS: true
+    NOCODECHECKS: "true"
 
 python36:
   extends: .test
   image: python:3.6-alpine
   variables:
     <<: *test-variables
-    NOCODECHECKS: true
+    NOCODECHECKS: "true"
 
 python37:
   extends: .test
   image: python:3.7-alpine
   variables:
     <<: *test-variables
-    NOCODECHECKS: true
+    NOCODECHECKS: "true"
 
 python38:
   extends: .test
-- 
GitLab


From 163cf1ca0d4f86640478e36af23e9b31bad3ee85 Mon Sep 17 00:00:00 2001
From: ergoithz <ergoithz@gmail.com>
Date: Sun, 5 Jan 2020 14:38:55 +0000
Subject: [PATCH 171/171] revert appveyor setuptools upgrade

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index b7950df..f2c86e4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,6 +30,7 @@ install:
   SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   python --version
   python -c "import struct; print(struct.calcsize('P') * 8)"
+  pip install --disable-pip-version-check --user --upgrade pip setuptools wheel
 
 test_script:
 - python setup.py test
-- 
GitLab