Skip to content

Commit

Permalink
update m ordering
Browse files Browse the repository at this point in the history
  • Loading branch information
@serge-reboul
serge-reboul committed Mar 3, 2024
1 parent 9be7bb7 commit f83e95b
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 10 deletions.
20 changes: 18 additions & 2 deletions src/web/lib/hakuneko/frontend@classic-dark/mangas.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</td>
<!--
<td width="1">
<i class="fas fa-fw fa-sync button" on-click="UpdateMangaFromEveryConnector" title="Click to sync every connecteor manga list"></i>
<i class="fas fa-fw fa-sync button" on-click="UpdateMangaFromEveryConnector" title="Click to sync every connector manga list"></i>
</td>
-->
<td width="1">
Expand Down Expand Up @@ -145,7 +145,7 @@
and go to the network tab
</li>
</template>
<template is="dom-repeat" items="[[ mangaList ]]" filter="[[ filterMangas(mangaPattern) ]]" rendered-item-count="{{ mangaFilteredCount }}">
<template is="dom-repeat" items="[[ reOrderMangaList(mangaList) ]]" filter="[[ filterMangas(mangaPattern) ]]" rendered-item-count="{{ mangaFilteredCount }}">
<li class$="manga [[ item.status ]] [[ getMangaClass(selectedManga, item.id) ]]" title$="[[ item.title ]]&#10;[[ item.connector.label ]]" on-click="onMangaClicked">[[ item.title ]]</li>
</template>
</ul>
Expand Down Expand Up @@ -335,6 +335,22 @@
return ( isUpdating ? 'fa-pulse disabled' : '' );
}

/**
*
*/
reOrderMangaList( mangaList ) {
console.log(mangaList)
const zXConnectorIds = ["hentai3z"]
var reOrderedMangaList = [...mangaList];
reOrderedMangaList.sort( ( a, b ) => {
var titleA = ((zXConnectorIds.includes(a.connector.id)) ? 'zx_' : '' ) + a.title.toLowerCase();
var titleB = ((zXConnectorIds.includes(b.connector.id)) ? 'zx_' : '' ) + b.title.toLowerCase();
return titleA < titleB ? -1 : 1;
//return a.title.toLowerCase() < b.title.toLowerCase() ? -1 : 1;
});
return reOrderedMangaList;
}

/**
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/web/lib/hakuneko/frontend@classic-dark/menu.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<label title="[[ item.description ]]"><i class="fas fa-fw fa-info-circle"></i> [[ item.label ]] </label>
</td>
<td>
<hakuneko-input item="{{ item }}"></hakuneko-input>
<hakuneko-input item="{{ item }}"></hakuneko-input>
</td>
</tr>
</template>
Expand Down
9 changes: 7 additions & 2 deletions src/web/lib/hakuneko/frontend@classic-dark/viewmanga.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,14 @@
/**
*
*/
getMangaUrl( manga ) {
getMangaUrl( manga ) {
console.log(manga)
return manga.connector.getMangaUrl(manga)
if (manga) {
return manga.connector.getMangaUrl(manga)
}
else {
return ""
}
}

/**
Expand Down
20 changes: 18 additions & 2 deletions src/web/lib/hakuneko/frontend@classic-light/mangas.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</td>
<!--
<td width="1">
<i class="fas fa-fw fa-sync button" on-click="UpdateMangaFromEveryConnector" title="Click to sync every connecteor manga list"></i>
<i class="fas fa-fw fa-sync button" on-click="UpdateMangaFromEveryConnector" title="Click to sync every connector manga list"></i>
</td>
-->
<td width="1">
Expand Down Expand Up @@ -152,7 +152,7 @@
and go to the network tab
</li>
</template>
<template is="dom-repeat" items="[[ mangaList ]]" filter="[[ filterMangas(mangaPattern) ]]" rendered-item-count="{{ mangaFilteredCount }}">
<template is="dom-repeat" items="[[ reOrderMangaList(mangaList) ]]" filter="[[ filterMangas(mangaPattern) ]]" rendered-item-count="{{ mangaFilteredCount }}">
<li class$="manga [[ item.status ]] [[ getMangaClass(selectedManga, item.id) ]]" title$="[[ item.title ]]&#10;[[ item.connector.label ]]" on-click="onMangaClicked">[[ item.title ]]</li>
</template>
</ul>
Expand Down Expand Up @@ -342,6 +342,22 @@
return ( isUpdating ? 'fa-pulse disabled' : '' );
}

/**
*
*/
reOrderMangaList( mangaList ) {
console.log(mangaList)
const zXConnectorIds = ["hentai3z"]
var reOrderedMangaList = [...mangaList];
reOrderedMangaList.sort( ( a, b ) => {
var titleA = ((zXConnectorIds.includes(a.connector.id)) ? 'zx_' : '' ) + a.title.toLowerCase();
var titleB = ((zXConnectorIds.includes(b.connector.id)) ? 'zx_' : '' ) + b.title.toLowerCase();
return titleA < titleB ? -1 : 1;
//return a.title.toLowerCase() < b.title.toLowerCase() ? -1 : 1;
});
return reOrderedMangaList;
}

/**
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/web/lib/hakuneko/frontend@classic-light/menu.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
<template is="dom-repeat" items="[[ item.settings ]]">
<tr>
<td width="1">
<label title="[[ item.description ]]"><i class="fas fa-fw fa-info-circle"></i> [[ item.label ]]</label>
<label title="[[ item.description ]]"><i class="fas fa-fw fa-info-circle"></i> [[ item.label ]] </label>
</td>
<td>
<hakuneko-input item="{{ item }}"></hakuneko-input>
Expand Down
9 changes: 7 additions & 2 deletions src/web/lib/hakuneko/frontend@classic-light/viewmanga.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,14 @@
/**
*
*/
getMangaUrl( manga ) {
getMangaUrl( manga ) {
console.log(manga)
return manga.connector.getMangaUrl(manga)
if (manga) {
return manga.connector.getMangaUrl(manga)
}
else {
return ""
}
}

/**
Expand Down
3 changes: 3 additions & 0 deletions src/web/mjs/connectors/system/BookmarkConnector.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ export default class BookmarkConnector {
*/
let mangas = Engine.BookmarkManager.bookmarks.map( bookmark => {
let manga = new Manga( this._getConnectorByID( bookmark.key.connector ), bookmark.key.manga, bookmark.title.manga );
//if (["hentai3z"].includes(manga.connector.id)){
// manga.title = "zx_" + manga.title
//}
// determine if manga directory exist on disk
Engine.Storage.mangaDirectoryExist( manga )
.then( () => {
Expand Down

0 comments on commit f83e95b

Please sign in to comment.