remove unnecessary line on .gitignore

style code
rename filter_ to show_
This commit is contained in:
wuyingren 2019-07-16 09:06:48 +08:00
parent a2b48580e3
commit 808cc9085e
No known key found for this signature in database
GPG Key ID: 3208310458103B10
4 changed files with 27 additions and 160 deletions

136
.gitignore vendored
View File

@ -1,133 +1,5 @@
# Created by https://www.gitignore.io/api/python __pycache__
# Edit at https://www.gitignore.io/?templates=python
### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/
# Translations
*.mo
*.pot
# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal
# Flask stuff:
instance/
.webassets-cache
# Scrapy stuff:
.scrapy
# Sphinx documentation
docs/_build/
# PyBuilder
target/
# Jupyter Notebook
.ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv
.python-version
# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock
# celery beat schedule file
celerybeat-schedule
# SageMath parsed files
*.sage.py
# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/
# Spyder project settings
.spyderproject
.spyproject
# Rope project settings
.ropeproject
# mkdocs documentation
/site
# mypy
.mypy_cache/
.dmypy.json
dmypy.json
# Pyre type checker
.pyre/
# End of https://www.gitignore.io/api/python
*.swp *.swp
.vscode/ venv
.vscode
.idea

View File

@ -25,26 +25,23 @@ app = Flask(__name__)
@app.route('/<domain>') @app.route('/<domain>')
def emojo(domain): def emojo(domain):
if request.args.get('filter_all','') == 'on': if request.args.get('show_all', '') == 'on':
filter_all = True show_all = True
else: else:
filter_all = False show_all = False
if request.args.get('filter_animated','') == 'on': if request.args.get('show_animated', '') == 'on':
filter_animated = True show_animated = True
else: else:
filter_animated = False show_animated = False
try: try:
url = urllib.parse.urlunsplit( url = urllib.parse.urlunsplit(('https', domain, '/api/v1/custom_emojis', '', ''))
('https', domain, '/api/v1/custom_emojis', '', '')) if show_all:
if filter_all: emojo = sorted(requests.get(url).json(), key=operator.itemgetter('shortcode'))
emojo = sorted(requests.get(url).json(),
key=operator.itemgetter('shortcode'))
else: else:
emojo = sorted(filter(lambda x: x.get('visible_in_picker', True), emojo = sorted(filter(lambda x: x.get('visible_in_picker', True), requests.get(url).json()),
requests.get(url).json()),
key=operator.itemgetter('shortcode')) key=operator.itemgetter('shortcode'))
return render_template('emojo.html', domain=domain, emojo=emojo, filter_animated=filter_animated) return render_template('emojo.html', domain=domain, emojo=emojo, show_animated=show_animated)
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
return render_template('oh_no.html', domain=domain) return render_template('oh_no.html', domain=domain)
@ -61,8 +58,7 @@ def code():
session = botocore.session.get_session() session = botocore.session.get_session()
# region name is detected from lambda environment # region name is detected from lambda environment
client = session.create_client('lambda') client = session.create_client('lambda')
code = client.get_function(FunctionName=context.function_name, code = client.get_function(FunctionName=context.function_name, Qualifier=context.function_version)
Qualifier=context.function_version)
return redirect(code['Code']['Location'], code=303) return redirect(code['Code']['Location'], code=303)
@ -70,10 +66,10 @@ def code():
def index(): def index():
if request.method == 'POST': if request.method == 'POST':
if 'instance' in request.form: if 'instance' in request.form:
filter_all = request.form.get('filter_all') show_all = request.form.get('show_all')
filter_animated = request.form.get('filter_animated') show_animated = request.form.get('show_animated')
return redirect(url_for('emojo', domain=request.form['instance'], return redirect(
filter_all=filter_all, filter_animated=filter_animated)) url_for('emojo', domain=request.form['instance'], show_all=show_all, show_animated=show_animated))
else: else:
return redirect(url_for('index')) return redirect(url_for('index'))
else: else:

View File

@ -6,14 +6,13 @@
click/touch to copy to clipboard click/touch to copy to clipboard
</p> </p>
<dl class="emojo"> <dl class="emojo">
{% if filter_animated %} {% if show_animated %}
{% for emoj in emojo %} {% for emoj in emojo %}
<div> <div>
<dt><img src="{{ emoj.url }}" alt=":{{ emoj.shortcode }}:"></dt> <dt><img src="{{ emoj.url }}" alt=":{{ emoj.shortcode }}:"></dt>
<dd>:{{ emoj.shortcode }}:</dd> <dd>:{{ emoj.shortcode }}:</dd>
</div> </div>
{% endfor %} {% endfor %}
{% else %} {% else %}
{% for emoj in emojo %} {% for emoj in emojo %}
<div> <div>

View File

@ -7,12 +7,12 @@
<input type="text" name="instance" placeholder="instance.domain"> <input type="text" name="instance" placeholder="instance.domain">
</div> </div>
<div> <div>
<input type="checkbox" name="filter_all"> <input type="checkbox" name="show_all">
<label for="filter_all">See unlisted emojos</label> <label for="show_all">See unlisted emojos</label>
</div> </div>
<div> <div>
<input type="checkbox" name="filter_animated"> <input type="checkbox" name="show_animated">
<label for="filter_animated">See animated emojos</label> <label for="show_animated">See animated emojos</label>
</div> </div>
<input type="submit" value="go"> <input type="submit" value="go">
</form> </form>