fix pack search

Author: concubidated

api/management/commands/scan_packs.py

@@ -55,10 +55,10 @@ def convert_seconds(seconds):
     return " ".join(parts)
 
 def print_warning(string):
-    RED = '\033[30m'
-    WARNING = '\033[93m'
-    RESET = '\033[0m'
-    print(f"{WARNING}{string}{RESET}")
+    """Add some color to terminal printing"""
+    warning = '\033[93m'
+    reset = '\033[0m'
+    print(f"{warning}{string}{reset}")
 
 def extract_file(zip_ref, member, path):
     """Extract s single file from the zip"""
@@ -512,7 +512,6 @@ def save_notedata(chart):
                     if line.strip().startswith("#NOTES:"):
                         # RhythmCodex converts put these on single line :facepalm:
                         if len(line.split(":")) > 6:
-                            rcodex = True
                             parts = line.split(":")
                             file_charttype = parts[1]
                             file_description = parts[2]
@@ -538,7 +537,6 @@ def save_notedata(chart):
                             diff_name = "Challenge"
 
                     # if all these match, it means this is the correct notedata, let save it
-                    #print(f"{type(file_charttype)} {type(charttype)} {type(file_meter)} {type(meter)} {type(diff_name)} {type(difficulty)}")
                     if (file_charttype.lower(), file_meter, diff_name.lower()) == \
                         (charttype.lower(), meter, difficulty.lower()):
                         notedata = ""
@@ -553,9 +551,9 @@ def save_notedata(chart):
                         while True:
                             line = next(lines, None)
                             # Simfile  corrupt, lame.
-                            if(line is None):
+                            if line is None:
                                 print("chart ended early")
-                                break;
+                                break
                             notedata += line
                             notedata += '\n'
                             if ';' in line:

web/templates/components/search-bar.html

@@ -8,7 +8,7 @@
                 <option {% if "pack" in request.path %}selected{% endif %} value="pack">Pack Name</option>
                 <option {% if "credit" in request.path %}selected{% endif %} value="credit">Chart Author</option>
             </select>
-            <input type="text" id="search" name="search" class="form-control" placeholder="">
+            <input type="text" id="search" name="search" class="form-control" {% if search_query %} value="{{ search_query }}" {% endif %} placeholder="">
             <button type="submit" name="submit" class="btn btn-primary">Search</button>
         </div>
     </form>
@@ -26,6 +26,12 @@
                 <div><label><input type="checkbox" class="filter-checkbox" value="smx"> SMX</label></div>
                 <div><label><input type="checkbox" class="filter-checkbox" value="techno"> Techno</label></div>
             </div>
+            <div>
+                <label>Filter by Style:</label>
+                <div><label><input type="checkbox" class="filter-checkbox" value="single"> Singles</label></div>
+                <div><label><input type="checkbox" class="filter-checkbox" value="double"> Doubles</label></div>
+                <div><label><input type="checkbox" class="filter-checkbox" value="solo"> Solo</label></div>
+            </div>
         </div>
     </div> 
 </div>

web/templates/main.html

@@ -25,7 +25,7 @@
         <tbody>
         {% for pack in packs %}
 		<tr>
-			<td><img loading="lazy" class="img-fluid rounded" style="max-width:200px;" src="/media/images/packs/{% if pack.banner %}{{ pack.banner }}{% else %}nobanner.png{% endif %}"></td>
+			<td><img loading="lazy" class="img-fluid rounded" style="max-height:50px;" src="/media/images/packs/{% if pack.banner %}{{ pack.banner }}{% else %}nobanner.png{% endif %}"></td>
             <td class="small"><a href="/pack/{{ pack.id }}">{{ pack.name|slice:":64" }}{% if pack.name|length > 64 %}...{% endif %}</a></td>
             <td data-sort="{{ pack.size }}" class="small">{{ pack.size|filesizeformat }}</td>
             <td class="small">{{ pack.song_count }}</td>

web/templates/search.html

@@ -88,6 +88,18 @@
 
     var table = $('#songTable').DataTable();
 
+
+    const match = window.location.hash.match(/page=(\d+)/);
+    if (match) {
+        const pageNum = parseInt(match[1], 10) - 1;
+        table.page(pageNum).draw('page');
+    }
+
+    table.on('page.dt', function () {
+        const info = table.page.info();
+        window.location.hash = `page=${info.page + 1}`;
+    });
+
     // Track active filters
     let activeFilters = [];
 

web/views.py

@@ -66,26 +66,14 @@ def search(request, search_type=None, search_query=None):
             )
             .filter(credit__icontains=search_query))
     elif "pack" in search_type:
-        songs = (
-            Song.objects.prefetch_related(
-                Prefetch("charts", queryset=charts_qs)
-            )
-            .select_related("pack")
-            .annotate(
-                min_meter=Min("charts__meter"),
-                max_meter=Max("charts__meter")
-            )
-            .filter(pack__name__icontains=search_query))
+        packs = list(Pack.objects.filter(name__icontains=search_query)
+                     .annotate(song_count=Count('songs')).order_by("name"))
+        packs.sort(key=lambda pack: natural_sort_key(pack.name))
+        return render(request, "main.html", {"packs": packs, "search_query": search_query})
     else:
         redirect("/")
 
-    return render(request, "search.html", {"songs": songs})
-
-def pack_list(request):
-    """list all the packs"""
-    packs = list(Pack.objects.all().order_by("name"))
-    packs.sort(key=lambda pack: natural_sort_key(pack.name))
-    return render(request, "packs.html", {"packs": packs})
+    return render(request, "search.html", {"songs": songs, "search_query": search_query})
 
 def pack_view(request, packid):
     """list all the songs in a pack"""
@@ -271,6 +259,9 @@ def main(request):
 
     return render(request, "main.html", context)
 
+def faq_view(request):
+    """faq view"""
+    return render(request, "faq.html", {})
 #@cache_page(timeout=None)  # Cache the view for 1 day
 def list_all_songs(request):
     """list all songs will query all songs and charts"""