feat: Ordered filetree (#222)

* chore: fix merge conflicts with master

Author: yammesicka

lms/models/solutions.py

@@ -1,8 +1,7 @@
 from io import BytesIO
 from lms.extractors.base import File
-from operator import itemgetter
 import os
-from typing import Any, Dict, Iterable, List, Optional, Union
+from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
 from zipfile import ZipFile
 
 from flask_babel import gettext as _
@@ -63,19 +62,26 @@ def create_zip_from_solution(
         return memory_file.read()
 
 
+def order_files(file: Dict[str, Any]) -> Tuple[str, bool]:
+    return (
+        os.path.split(file['fullpath'])[0],
+        not file['is_folder'],  # folders should be before the files
+    )
+
+
 def get_files_tree(files: Iterable[SolutionFile]) -> List[Dict[str, Any]]:
     file_details = [
         {
-            'id': file.id,
+            'id': file.id,  # type: ignore
             'fullpath': file.path,
-            'path': file.path.strip('/').rpartition('/')[2],
-            'indent': file.path.strip('/').count('/'),
+            'path': os.path.split(file.path.strip('/'))[1],  # type: ignore
+            'indent': file.path.strip('/').count('/'),  # type: ignore
             'is_folder': file.path.endswith('/'),
             'code': file.code,
         }
         for file in files
     ]
-    file_details.sort(key=itemgetter('fullpath'))
+    file_details.sort(key=order_files)
     for file in file_details:
         del file['fullpath']
     return file_details

lms/models/upload.py

@@ -28,7 +28,8 @@ def _upload_to_db(
     elif not exercise.open_for_new_solutions():
         raise UploadError(
             f'Exercise {exercise_id} is closed for new solutions.')
-    if _is_uploaded_before(user, solution_hash):
+
+    if solution_hash and _is_uploaded_before(user, solution_hash):
         raise AlreadyExists('You try to reupload an old solution.')
     elif not files:
         raise UploadError(f'There are no files to upload for {exercise_id}.')

lms/static/my.css

@@ -283,6 +283,14 @@ button#share-action:hover {
   flex-direction: column;
 }
 
+.file-comments-count {
+  height: 1.5em;
+  display: inline-flex;
+  align-self: center;
+  margin: 0 0.25em;
+  width: 1em;
+}
+
 #files .file {
   display: flex;
   flex-direction: row;

lms/templates/filetree.html

@@ -2,23 +2,38 @@
   <ol id="files">
     {%- for file in files %}
     <li class="file" data-id="{{ file.id }}">
-      <span class="indent" style="padding-left: {{ file.indent }}em"></span>
-      {%- if not shared_url %}
-        <div class="file-comments-count">
-          <span style="margin-left: {{ file.indent }}em"
-                class="badge bg-{%- if comments[file.id] -%}danger{%- else -%}success{%- endif -%}">
-            {{ comments[file.id] }}
-          </span>
-        </div>
+      <div class="file-comments-count">
+      {%- if not shared_url and not file.is_folder %}
+        <span class="badge bg-{%- if comments[file.id] -%}danger{%- else -%}success{%- endif -%}">
+          {{ comments[file.id] }}
+        </span>
       {% endif -%}
+      </div>
+      <span class="indent" style="margin-left: {{ file.indent * 1.5 }}em"></span>
       <span class="
       {%- if file.is_folder -%}
       icon hawcons-icon-folder">
       {%- else -%}
       icon hawcons-icon-document-text hawcons-icon-file-{{ file.path.rsplit('.')[-1] | e }} file-icon">
       {%- endif -%}
       </span>
-      <a {% if not file.is_folder %}href="/{%- if not shared_url %}view/{{ solution.id }}{%- else %}shared/{{ shared_url }}{% endif -%}/{{ file.id }}"{% endif %} class="filename link" title="{{ file.path | e }}">{{ file.path | truncate(25, killwords=True) | e }}</a>
+      {% if not file.is_folder -%}
+        <a href="/
+        {%- if not shared_url -%}
+          view/{{ solution.id }}
+        {%- else -%}
+          shared/{{ shared_url }}
+        {%- endif -%}
+        /{{ file.id }}" 
+      {% else -%}
+      <span
+      {% endif -%}
+      class="filename link" title="{{ file.path | e }}">{{ file.path | truncate(25, killwords=True) | e }}
+      {%- if not file.is_folder -%}
+        </a>
+      {%- else -%}
+        </span>
+      {%- endif -%}
     </li>
     {% endfor -%}
   </ol>