6767 <el-option :label =" $t('m.artistDescend')" value =" artistDescend" el-option >
6868 <el-option :label =" $t('m.titleAscend')" value =" titleAscend" el-option >
6969 <el-option :label =" $t('m.titleDescend')" value =" titleDescend" el-option >
70+ <el-option :label =" $t('m.pageAscend')" value =" pageAscend" el-option >
71+ <el-option :label =" $t('m.pageDescend')" value =" pageDescend" el-option >
7072 </el-option-group >
7173 </el-select >
7274 </el-col >
131133 @contextmenu =" onBookContextMenu($event, book)"
132134 />
133135 <el-tag class =" book-card-language" size =" small"
134- :effect =" isChineseTranslatedManga(book) ? 'dark' : 'light'"
135136 :type =" isChineseTranslatedManga(book) ? 'danger' : 'info'"
136137 @click =" handleSearchString(`:count=${book.readCount}`)"
137138 >{{book.readCount}}</el-tag >
175176 <p class =" book-title" :title =" book.title" p >
176177 <img class =" book-cover" :src =" book.coverPath" @click =" openCollection(book)"
177178 <el-tag class =" book-card-language" size =" small"
178- :effect =" isChineseTranslatedManga(book) ? 'dark' : 'light'"
179179 :type =" isChineseTranslatedManga(book) ? 'danger' : 'info'"
180180 @click =" handleSearchString(`:count=${book.readCount}`)"
181181 >{{book.readCount}}</el-tag >
360360 @contextmenu =" onBookContextMenu($event, book)"
361361 />
362362 <el-tag class =" book-card-language" size =" small"
363- :effect =" isChineseTranslatedManga(book) ? 'dark' : 'light'"
364363 :type =" isChineseTranslatedManga(book) ? 'danger' : 'info'"
365364 @click =" handleSearchString(`:count=${book.readCount}`)"
366365 >{{book.readCount}}</el-tag >
594593 :setting =" setting"
595594 @message =" printMessage"
596595 @resolve-search-result =" resolveSearchResult"
596+ @service-available =" setServiceAvailable"
597597 ></SearchDialog >
598598 <Setting
599599 ref =" SettingRef"
@@ -1309,12 +1309,15 @@ export default defineComponent({
13091309 if (type === ' hentag'
13101310 book .url = url
13111311 this .getBookInfoFromHentag (book)
1312- } else {
1312+ } else if (type === ' e-hentai ' ) {
13131313 book .url = url
13141314 this .getBookInfoFromEh (book)
13151315 }
13161316 this .$refs .SearchDialogRef .dialogVisibleEhSearch = false
13171317 },
1318+ setServiceAvailable (value ) {
1319+ this .serviceAvailable = value
1320+ },
13181321 async getBookInfoFromHentag (book ) {
13191322 const data = await fetch (` https://hentag.com/public/api/vault/${ book .url .slice (25 )} ` then (res => res .json ())
13201323 const tags = {}
@@ -1412,21 +1415,21 @@ export default defineComponent({
14121415 },
14131416 async resetMetadata (book ) {
14141417 book .title = this .returnFileName (book)
1415- book .title_jpn = ' '
1416- book .posted = 0
1417- book .filecount = 0
1418- book .rating = 0
1419- book .filesize = 0
1420- book .category = ' '
1418+ book .title_jpn = null
1419+ book .posted = null
1420+ book .filecount = null
1421+ book .rating = null
1422+ book .filesize = null
1423+ book .category = null
14211424 book .tags = {}
14221425 book .status = ' non-tag'
1423- book .url = ' '
1426+ book .url = null
14241427 await this .saveBook (book)
14251428 },
14261429 getBookInfo (book ) {
14271430 if (book .url .startsWith (' https://hentag.com'
14281431 this .getBookInfoFromHentag (book)
1429- } else {
1432+ } else if ( book . url . includes ( ' exhentai ' ) || book . url . includes ( ' e-hentai ' )) {
14301433 this .getBookInfoFromEh (book)
14311434 }
14321435 },
@@ -1572,6 +1575,14 @@ export default defineComponent({
15721575 this .displayBookList = bookList .toSorted ((a , b ) => this .getDisplayTitle (b).localeCompare (this .getDisplayTitle (a), undefined , {numeric: true , sensitivity: ' base'
15731576 this .chunkList ()
15741577 break
1578+ case ' pageAscend'
1579+ this .displayBookList = bookList .toSorted (this .sortList (' pageCount' toReversed ()
1580+ this .chunkList ()
1581+ break
1582+ case ' pageDescend'
1583+ this .displayBookList = bookList .toSorted (this .sortList (' pageCount'
1584+ this .chunkList ()
1585+ break
15751586 default :
15761587 this .displayBookList = this .bookList
15771588 this .chunkList ()
@@ -1586,7 +1597,7 @@ export default defineComponent({
15861597 if (queryString) {
15871598 const keywords = [... queryString .matchAll (/ \s + (?=(?:[^ \' "] * [\' "][^ \' "] * [\' "] )* [^ \' "] * $ )/ g
15881599 if (! _ .isEmpty (keywords)) {
1589- const nextKeyword = queryString .replace (/ (~| -)? [\w\d 一-龟 ] + :"[- . _\w\d 一-龟 ] + "\$ / g' ' trim ()
1600+ const nextKeyword = queryString .replace (/ (~| -)? [\w\d 一-龟 ] + :"[- . _\(\) \ w\d一-龟 ] + "\$ / g' ' trim ()
15901601 if (nextKeyword[0 ] === ' -' || nextKeyword[0 ] === ' ~'
15911602 result = _ .filter (options, (str ) => {
15921603 return _ .includes (str .value .toLowerCase (), nextKeyword .slice (1 ).toLowerCase ())
@@ -1624,11 +1635,11 @@ export default defineComponent({
16241635 },
16251636 handleInput (val ) {
16261637 try {
1627- if (/ ^ [\w\d 一-龟 ] + :"[- . _\w\d 一-龟 ] + "\$ $ / test (val) && this .searchString .trim () !== val .trim ()) {
1638+ if (/ ^ [\w\d 一-龟 ] + :"[- . _\(\) \ w\d一-龟 ] + "\$ $ / test (val) && this .searchString .trim () !== val .trim ()) {
16281639 const keywords = [... this .searchString .trim ().matchAll (/ \s + (?=(?:[^ \' "] * [\' "][^ \' "] * [\' "] )* [^ \' "] * $ )/ g
16291640 if (! _ .isEmpty (keywords)) {
1630- const keyword = this .searchString .replace (/ (~| -)? [\w\d 一-龟 ] + :"[- . _\w\d 一-龟 ] + "\$ / g' ' trim ()
1631- const matches = this .searchString .match (/ (~| -)? [\w\d 一-龟 ] + :"[- . _\w\d 一-龟 ] + "\$ / g
1641+ const keyword = this .searchString .replace (/ (~| -)? [\w\d 一-龟 ] + :"[- . _\(\) \ w\d一-龟 ] + "\$ / g' ' trim ()
1642+ const matches = this .searchString .match (/ (~| -)? [\w\d 一-龟 ] + :"[- . _\(\) \ w\d一-龟 ] + "\$ / g
16321643 if (keyword[0 ] === ' -'
16331644 this .searchString = matches .concat ([` -${ val} ` join (' '
16341645 } else if (keyword[0 ] === ' ~'
@@ -1828,8 +1839,12 @@ export default defineComponent({
18281839 this .folderTreeData = await ipcRenderer .invoke (' get-folder-tree'
18291840 },
18301841 async selectFolderTreeNode (selectNode ) {
1831- const clickLibraryPath = this .setting .library + this .pathSep + selectNode .folderPath
1832- this .bookList .map (book => book .folderHide = ! book .filepath .startsWith (clickLibraryPath))
1842+ if (selectNode .folderPath ) {
1843+ const clickLibraryPath = this .setting .library + this .pathSep + selectNode .folderPath + this .pathSep
1844+ this .bookList .map (book => book .folderHide = ! book .filepath .startsWith (clickLibraryPath))
1845+ } else {
1846+ this .bookList .map (book => book .folderHide = false )
1847+ }
18331848 this .chunkList ()
18341849 },
18351850 handleNodeExpand (nodeObject ) {
@@ -1866,6 +1881,7 @@ export default defineComponent({
18661881 const mark = _ .some (collectBook, ' mark'
18671882 const pageDiff = _ .some (collectBook, ' pageDiff' ? true : undefined
18681883 const readCount = _ .max (collectBook .map (book => book .readCount ))
1884+ const pageCount = _ .sum (collectBook .map (book => book .pageCount ))
18691885 const tags = _ .mergeWith ({}, ... collectBook .map (book => book .tags ), (obj , src ) => {
18701886 if (_ .isArray (obj) && _ .isArray (src)) {
18711887 return [... new Set (obj .concat (src))]
@@ -1882,7 +1898,7 @@ export default defineComponent({
18821898 title: collection .title ,
18831899 id: collection .id ,
18841900 coverPath: collectBook? .[0 ]? .coverPath ,
1885- date, posted, rating, mtime, mark, tags, title_jpn, category, status, pageDiff, readCount,
1901+ date, posted, rating, mtime, mark, tags, title_jpn, category, status, pageDiff, readCount, pageCount,
18861902 list: collection .list ,
18871903 filepath,
18881904 isCollection: true ,
@@ -2090,7 +2106,7 @@ export default defineComponent({
20902106 resolveGroupTagSelected () {
20912107 const letter2cat = _ .invert (this .cat2letter )
20922108 let tags = this .groupTagSelected .map (tag => {
2093- const match = / ([\w\d 一-龟 ] + ):"([- . _\w\d 一-龟 ] + )"\$ / .exec (tag)
2109+ const match = / ([\w\d 一-龟 ] + ):"([- . _\(\) \ w\d一-龟 ] + )"\$ / .exec (tag)
20942110 if (match[1 ] && match[2 ]) {
20952111 return {
20962112 category: letter2cat[match[1 ]] ? letter2cat[match[1 ]] : match[1 ],
0 commit comments