diff --git a/dlibrary/dlibrary.py b/dlibrary/dlibrary.py index 97d657c..82cf74f 100755 --- a/dlibrary/dlibrary.py +++ b/dlibrary/dlibrary.py @@ -821,47 +821,6 @@ def copy_recursive(src, dest): else: shutil.copyfile(item, dest / item.name) - -memoized_similarities = {} - -def similarity(a, b): - if len(a) < len(b): - shorter = a - longer = b - else: - shorter = b - longer = a - if len(shorter) == 0: - return 0 - - if (shorter, longer) in memoized_similarities: - return memoized_similarities[(shorter, longer)] - - options = [similarity(shorter[1:], longer)] - for i in range(1, len(shorter)+1): - match_idx = longer.find(shorter[:i]) - if match_idx == -1: - break - options.append(i*i + similarity(shorter[i:], longer[match_idx+i:])) - result = max(options) - - memoized_similarities[(shorter, longer)] = result - return result - -def top(items, n, key): - if len(items) == 0: - return [] - winners = items[:1] - for item in items[1:]: - if len(winners) < n or key(item) > key(winners[-1]): - for i in range(len(winners)): - if key(item) > key(winners[i]): - winners.insert(i, item) - break - if len(winners) > n: - winners.pop() - return winners - def generate(args): jenv = Environment( loader=PackageLoader("dlibrary"), @@ -906,28 +865,16 @@ def generate(args): 'authors': authors, 'tags': tags, 'thumbnail_path': thumbnail_path, - 'images': images, } works.append(work) - for (idx, work) in enumerate(works): - def suggestion_priority(other_work): - if other_work is work: - return -2 - if work['series'] and work['series'] == other_work['series']: - return -1 - return similarity(work['title'], other_work['title']) - suggested = top(works, 6, suggestion_priority) - - work_dir = site_dir / 'works' / work['id'] + work_dir = site_dir / 'works' / work_id viewer_dir = work_dir / 'view' viewer_dir.mkdir(parents=True, exist_ok=True) with open(work_dir / 'index.html', 'w') as f: - f.write(work_template.render(depth=2, work=work, title=work['title'], suggested=suggested)) + f.write(work_template.render(depth=2, work=work, title=title, images=images)) with open(viewer_dir / 'index.html', 'w') as f: - f.write(viewer_template.render(depth=3, work=work, title=work['title'])) - - print(f'\x1b[2K\r{idx+1}/{len(works)} works processed...', end='') + f.write(viewer_template.render(depth=3, work=work, title=title, images=images)) def make_categorization(categorization, query, work_filter, work_style_cards=False): categorization_dir = site_dir / categorization diff --git a/dlibrary/static/dlibrary.css b/dlibrary/static/dlibrary.css index 00c1846..fc6aa0b 100644 --- a/dlibrary/static/dlibrary.css +++ b/dlibrary/static/dlibrary.css @@ -78,7 +78,7 @@ body { margin-bottom: 25px; } -.card-listing { +#card-listing { display: flex; flex-wrap: wrap; justify-content: center; @@ -115,7 +115,6 @@ body { flex-wrap: wrap; justify-content: center; gap: 30px; - margin-bottom: 40px; } .work-preview { @@ -158,7 +157,3 @@ body { display: inline-block; margin-bottom: 5px; } - -#suggested-subheader { - text-align: center; -} diff --git a/dlibrary/static/index.js b/dlibrary/static/index.js index f818247..2ea74f5 100644 --- a/dlibrary/static/index.js +++ b/dlibrary/static/index.js @@ -32,7 +32,7 @@ document.addEventListener('DOMContentLoaded', () => { const shuffleButton = document.getElementById('shuffle'); const sortButton = document.getElementById('sort'); const searchBox = document.getElementById('search'); - const listContainer = document.getElementById('main-listing'); + const listContainer = document.getElementById('card-listing'); let ordering = localStorage.getItem('indexOrdering') || 'dateDesc'; let shuffleSeed = parseInt(localStorage.getItem('shuffleSeed')) || newSeed(); diff --git a/dlibrary/templates/categorization.html b/dlibrary/templates/categorization.html index 75a4c8b..40e6817 100644 --- a/dlibrary/templates/categorization.html +++ b/dlibrary/templates/categorization.html @@ -4,7 +4,7 @@ {% from 'utils.html' import urlcat, index, root with context %}

DLibrary > {{ categorization.capitalize() }}

{% include 'nav.html' %} -
+
{% for cat in categories %}
diff --git a/dlibrary/templates/index.html b/dlibrary/templates/index.html index fa432a9..836539f 100644 --- a/dlibrary/templates/index.html +++ b/dlibrary/templates/index.html @@ -23,6 +23,6 @@
-
+
{% endblock %} diff --git a/dlibrary/templates/list.html b/dlibrary/templates/list.html index fb68cf0..940ca91 100644 --- a/dlibrary/templates/list.html +++ b/dlibrary/templates/list.html @@ -1,11 +1,21 @@ {% extends 'base.html' %} {% block body %} -{% from 'utils.html' import index, root, card with context %} +{% from 'utils.html' import index, root with context %}

DLibrary{% if categorization %} > {{ categorization.capitalize() }}{% endif %}{% if title %} > {{ title }}{% endif %}

{% include 'nav.html' %} -
+ {% endblock %} diff --git a/dlibrary/templates/utils.html b/dlibrary/templates/utils.html index d0caf65..161dc38 100644 --- a/dlibrary/templates/utils.html +++ b/dlibrary/templates/utils.html @@ -1,17 +1,3 @@ {% macro root() %}{% if depth == 0 %}.{% else %}..{% endif %}{{ '/..' * (depth-1) }}{% endmacro %} {% macro index() %}{% if not noindex %}index.html{% endif %}{% endmacro %} {% macro urlcat(s) %}{{ s | replace('/', ' ') | urlencode }}{% endmacro %} - -{% macro card(work) %} -
- - -
- [{% if work['circle'] %}{{ work['circle'] }}{% endif %}{% if work['circle'] and work['authors'] %} ({% endif %}{{ ', '.join(work['authors']) }}{% if work['circle'] and work['authors'] %}){% endif %}] -
-
- {{ work['title'] }} -
- -
-{% endmacro %} diff --git a/dlibrary/templates/viewer.html b/dlibrary/templates/viewer.html index 9125ab2..aee53e8 100644 --- a/dlibrary/templates/viewer.html +++ b/dlibrary/templates/viewer.html @@ -6,7 +6,7 @@ const WORK_ID = "{{ work['id'] }}"; const INDEX = "{{ index() }}"; const IMAGES = [ - {% for filename in work['images'] %} + {% for filename in images %} "{{ root() }}/images/{{ work['id'] }}/{{ filename }}", {% endfor %} ]; @@ -18,7 +18,7 @@
- +
{{ work['images'] | length }}
{{ images | length }}
diff --git a/dlibrary/templates/work.html b/dlibrary/templates/work.html index e622c0b..c2860fa 100644 --- a/dlibrary/templates/work.html +++ b/dlibrary/templates/work.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} {% block body %} -{% from 'utils.html' import urlcat, root, index, card with context %} +{% from 'utils.html' import urlcat, root, index with context %}

DL > {{ title }}

@@ -41,10 +41,4 @@ {% endif %}
-

Suggested works

-
- {% for sugg in suggested %} - {{ card(sugg) }} - {% endfor %} -
{% endblock %}