- disabled submit during animations (fixes synchronization problems)

- changed FileHandler to close the file immediately after reading it

- disabled submit during animations (fixes synchronization problems)
- changed FileHandler to close the file immediately after reading it
Miguel Barão
1 parent 2285f4a5
Showing 4 changed files with 17 additions and 12 deletions Show diff stats
BUGS.md
serve.py
static/js/topic.js
templates/topic.html
 # BUGS
-- botao para mostrar a solução quando se acerta.
 - shift-enter não está a funcionar
 - falha intermitent no file handler quando o browser envia 2 GET requests ao mesmo tempo (porquê?)
 - nos topicos learn.yaml, qd falha acrescenta no fim. nao faz sentido.
@@ -34,6 +33,8 @@
 # FIXED
+- quando se pressiona "responde" rapido (enquanto a animacao dura), a pergunta passa para a seguinte sem haver o correspondente redraw, ou seja a proxima resposta nao é a da pergunta mostrada.
+- botao para mostrar a solução quando se acerta.
 - não está a guardar o resultado no final do topico
 - esta a permitir 2 logins em simultaneo do mesmo user. fica tudo baralhado se mxerem em simultaneo...
 - errar no ultimo topico nao mostra solucao?
@@ -178,11 +178,11 @@ class FileHandler(BaseHandler):
     SUPPORTED_METHODS = ['GET']
     @tornado.web.authenticated
-    # async
-    def get(self, filename):
+    async def get(self, filename):
         uid = self.current_user
         public_dir = self.learn.get_current_public_dir(uid)
         filepath = path.expanduser(path.join(public_dir, filename))
+        content_type, encoding = mimetypes.guess_type(filename)
         try:
             f = open(filepath, 'rb')
@@ -190,16 +190,16 @@ class FileHandler(BaseHandler):
             logging.error(f'File not found: {filepath}')
         except PermissionError:
             logging.error(f'No permission: {filepath}')
+        except Exception as e:
+            raise e
         else:
-            content_type = mimetypes.guess_type(filename)
-            self.set_header("Content-Type", content_type[0])
-            # divide the file into chunks and write one chunk at a time, so
-            # that the write does not block the ioloop for very long.
             with f:
                 data = f.read()
+                f.close()
+                self.set_header("Content-Type", content_type)
                 self.write(data)
-                # await self.flush()
-                self.flush()
+                await self.flush()
+                # self.flush()
 # ----------------------------------------------------------------------------
@@ -3,6 +3,7 @@ $.fn.extend({
         var animationEnd = 'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend';
         this.addClass('animated ' + animation).one(animationEnd, function() {
             $(this).removeClass('animated ' + animation);
+            $("#submit").removeClass("disabled");
         });
     }
 });
@@ -27,6 +28,8 @@ function showTriesLeft(tries) {
 // Get current question
 function getQuestion() {
+    $("#submit").addClass("disabled");
+
     $.ajax({
         type: "GET",
         url: "/question",
@@ -42,7 +45,7 @@ function updateQuestion(response) {
     var method = response["method"];
     var params = response["params"];
-    $('#right, #wrong').hide();
+    $("#right, #wrong").hide();
     switch (method) {
     case "new_question":
@@ -63,8 +66,8 @@ function new_question(type, question, tries, progress) {
     $("#question_div").html(question).animateCSS('bounceInDown');
     showTriesLeft(tries);
     $("#comments, #solution").html("");
-    var btn_text = (type == "info") ? "Continuar" : "Responder";
-    $("#submit").html(btn_text).off().click(postAnswer);
+    var btntext = (type == "info") ? "Continuar" : "Responder";
+    $("#submit").html(btntext).off().click(postAnswer);
     $('#topic_progress').css('width', (100*progress)+'%').attr('aria-valuenow', 100*progress);
     MathJax.Hub.Queue(["Typeset",MathJax.Hub,"question_div"]);
@@ -111,6 +111,7 @@
 	<div id="solution"></div>
+	<!-- reponder / continuar -->
 	<a class="btn btn-primary btn-lg btn-block my-5" id="submit" data-toggle="tooltip" data-placement="right" href="#solution"></a>
 	<!-- title="Shift-Enter" -->
 </div>
	@@ -111,6 +111,7 @@		@@ -111,6 +111,7 @@
111		111
112	<div id="solution"></div>	112	<div id="solution"></div>
113		113
		114	+ <!-- reponder / continuar -->
114	<a class="btn btn-primary btn-lg btn-block my-5" id="submit" data-toggle="tooltip" data-placement="right" href="#solution"></a>	115	<a class="btn btn-primary btn-lg btn-block my-5" id="submit" data-toggle="tooltip" data-placement="right" href="#solution"></a>
115	<!-- title="Shift-Enter" -->	116	<!-- title="Shift-Enter" -->
116	</div>	117	</div>