Compare commits

...

3 Commits

Author SHA1 Message Date
Elia El Lazkani bafb1c5e68 Moving to clipboard for copying to clipboard 2 years ago
Elia El Lazkani d9d763a1d1 Migrating from aiohttp to flask due 2 years ago
Elia El Lazkani e37aa4bb13 Minor fixes 2 years ago
  1. 1
      requirements/development.txt
  2. 3
      requirements/requirements.txt
  3. 4
      shortenit/main.py
  4. 39
      shortenit/templates/index.html
  5. 84
      shortenit/web.py

1
requirements/development.txt

@ -1 +1,2 @@
-r requirements.txt
setuptools-git

3
requirements/requirements.txt

@ -1,5 +1,4 @@
pyyaml
cloudant
aiohttp
aiohttp-jinja2
flask
trafaret

4
shortenit/main.py

@ -27,6 +27,7 @@ def main() -> None:
"""
parser = argument_parse()
args = parser.parse_args()
debug = True if args.verbose > 0 else False
verbosity_level = verbosity(args.verbose)
setup_logging(args.logger, verbosity_level)
config = Config(CONFIGURATION).get_config()
@ -36,9 +37,8 @@ def main() -> None:
with DB(db_config) as db:
db.initialize_shortenit()
loop = asyncio.get_event_loop()
handler = SiteHandler(db, shorten_url, lenghten_url)
web = Web(loop, handler)
web = Web(handler, debug=debug)
web.host = server_config.get('host', None)
web.port = server_config.get('port', None)
web.start_up()

39
templates/index.html → shortenit/templates/index.html

@ -19,6 +19,7 @@
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.4/clipboard.min.js"></script>
</head>
<script type="text/javascript">
@ -33,6 +34,7 @@
data: JSON.stringify({'url' : $('#url-input').val(),
'timestamp': Date.now()}),
success: returnSuccess,
error: returnFailure,
dataType: 'json',
contentType: "application/json",
});
@ -41,28 +43,36 @@
function returnSuccess(data, textStatus, jqXHR) {
var url = href.concat(data.url);
console.log(window.location.href)
console.log(href)
if(data.url) {
document.getElementById("url-result").value = url;
} else {
document.getElementById("url-result").value = "Please enter a valid URL!";
document.getElementById("url-result").value = "The URL was too short and somehow got lost on the way, please try generating a new one.";
}
}
function copyToClipboard() {
/* Get the text field */
var copyText = document.querySelector("#url-result");
function returnFailure(data, textStatus, jqXHR) {
document.getElementById("url-result").value = "Please enter a valid URL!";
}
window.onload=function() {
console.log(ClipboardJS.isSupported())
var clipboard = new ClipboardJS('.btn', {
container: document.getElementById('copy-button')
});
/* Select the text field */
copyText.select();
copyText.setSelectionRange(0, 99999); /*For mobile devices*/
clipboard.on('success', function(e) {
console.info('Action:', e.action);
console.info('Text:', e.text);
console.info('Trigger:', e.trigger);
});
/* Copy the text inside the text field */
document.execCommand("copy");
clipboard.on('error', function(e) {
console.error('Action:', e.action);
console.error('Trigger:', e.trigger);
});
}
/* Alert the copied text */
alert("Copied the text: " + copyText.value);
}
</script>
<body>
@ -98,7 +108,8 @@
<input type="text" id="url-result" class="form-control" readonly>
</div>
<div class="col-3">
<button class="btn btn-outline-primary" type="button" id="copy-button" data-toggle="tooltip" onclick="copyToClipboard()" data-placement="button" title="Copy to Clipboard">Copy</button>
<div>
<button class="btn btn-outline-primary" data-clipboard-target="#url-result" data-clipboard-action="copy">Copy</button>
</div>
</div>
</div>

84
shortenit/web.py

@ -1,47 +1,40 @@
import os
import logging
import aiohttp_jinja2
import jinja2
import trafaret as t
import trafaret
from aiohttp import web
from pathlib import Path
from flask import Flask
from flask import render_template
from flask import request
from flask import redirect
from flask import abort
class Web:
def __init__(self, loop, handler):
def __init__(self, handler, debug=False):
self.logger = logging.getLogger(self.__class__.__name__)
self.loop = loop
self.app = None
self.host = None
self.port = None
self.handler = handler
self.router = None
self.loader = None
self.debug = debug
def start_up(self):
self.loop.run_until_complete(self.init())
web.run_app(self.app, host=self.host, port=self.port)
self.init()
self.app.run(host=self.host, port=self.port, debug=self.debug)
async def init(self):
self.app = web.Application(loop=self.loop)
templates = Path(__file__).absolute().parent.parent.joinpath('templates')
self.loader = jinja2.FileSystemLoader(str(templates))
self.logger.debug(str(templates))
aiohttp_jinja2.setup(self.app,
loader=self.loader)
def init(self):
self.app = Flask(__name__)
self.setup_routes()
def setup_routes(self):
self.router = self.app.router
self.router.add_get('/', self.handler.index,
name='index')
self.router.add_post('/shortenit', self.handler.shortenit,
name='shortenit')
self.router.add_get('/{identifier}', self.handler.redirect,
name='redirect')
self.app.add_url_rule('/', '/', self.handler.index,
methods=['GET'])
self.app.add_url_rule('/shortenit', '/shortenit', self.handler.shortenit,
methods=['POST'])
self.app.add_url_rule('/<identifier>', '/identifier', self.handler.short_redirect,
methods=['GET'])
class SiteHandler:
@ -50,29 +43,36 @@ class SiteHandler:
self.database = database
self.shorten_url = shorten_url
self.lenghten_url = lenghten_url
self.shortenit_load_format = t.Dict({
t.Key('url'): t.URL,
t.Key('timestamp'): t.Int
self.shortenit_load_format = trafaret.Dict({
trafaret.Key('url'): trafaret.URL,
trafaret.Key('timestamp'): trafaret.Int
})
async def shortenit(self, request):
data = await request.json()
self.logger.debug(data)
def shortenit(self):
data = request.get_json()
try:
data = self.shortenit_load_format(data)
except t.DataError:
raise web.HTTPBadRequest('URL is not valid')
short_url = self.shorten_url(self.database, data['url'], data['timestamp'])
except Exception as e:
self.logger.error(e)
return {}, 400
self.logger.error(e)
abort(400)
try:
short_url = self.shorten_url(
self.database, data['url'], data['timestamp'])
except KeyError as e:
self.logger.error(e)
abort(400)
self.logger.debug(short_url)
return web.json_response({"url": short_url})
return {"url": short_url}
async def redirect(self, request):
identifier = request.match_info['identifier']
def short_redirect(self, identifier):
url = self.lenghten_url(self.database, identifier)
self.logger.debug("The URL is...")
self.logger.debug(url)
if not url:
raise web.HTTPNotFound()
return web.HTTPFound(location=url)
abort(404)
return redirect(url)
@aiohttp_jinja2.template('index.html')
async def index(self, request):
return {}
def index(self):
return render_template('index.html')

Loading…
Cancel
Save