Skip to content

Commit 9abd2af

Browse files
TohruskyTohrusky
authored
feat: new model APISR-RRDB (#500)
1 parent a176690 commit 9abd2af

File tree

5 files changed

+14
-78
lines changed

5 files changed

+14
-78
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Final2x",
33
"productName": "Final2x",
4-
"version": "1.2.1",
4+
"version": "1.3.0",
55
"description": "A cross-platform image super-resolution tool.",
66
"main": "./out/main/index.js",
77
"author": "Tohrusky",

‎resources/download-core.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ const path = require('path')
88

99
const coreDict = {
1010
'macos-arm64':
11-
'https://github.com/Final2x/Final2x-core/releases/download/2024-01-01/Final2x-core-macos-arm64.zip',
11+
'https://github.com/Final2x/Final2x-core/releases/download/2024-06-28/Final2x-core-macos-arm64.zip',
1212
'macos-x64':
13-
'https://github.com/Final2x/Final2x-core/releases/download/2024-01-01/Final2x-core-macos-latest.zip',
13+
'https://github.com/Final2x/Final2x-core/releases/download/2024-06-28/Final2x-core-macos-latest.zip',
1414
'linux-x64':
15-
'https://github.com/Final2x/Final2x-core/releases/download/2024-01-01/Final2x-core-ubuntu-20.04.zip',
15+
'https://github.com/Final2x/Final2x-core/releases/download/2024-06-28/Final2x-core-ubuntu-20.04.zip',
1616
'windows-x64':
17-
'https://github.com/Final2x/Final2x-core/releases/download/2024-01-01/Final2x-core-windows-latest.zip'
17+
'https://github.com/Final2x/Final2x-core/releases/download/2024-06-28/Final2x-core-windows-latest.zip'
1818
}
1919

2020
console.log('-'.repeat(50))

‎src/renderer/src/locales/en.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ export const en = {
4040
text14: 'TTA',
4141
text15: 'Custom Scale',
4242
text16: 'Default',
43-
text17: 'Output Folder'
43+
text17: 'Output Folder',
44+
text18:
45+
'APISR aims at restoring and enhancing low-quality low-resolution anime images and video sources with various degradations from real-world scenarios'
4446
}
4547
}

‎src/renderer/src/utils/ModelOptions.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { SelectOption } from 'naive-ui'
66
export const modelOptions: SelectOption[] = [
77
{ label: 'RealCUGAN-se', value: 'RealCUGAN-se' },
88
{ label: 'RealCUGAN-pro', value: 'RealCUGAN-pro' },
9+
{ label: 'APISR-RRDB', value: 'APISR-RRDB' },
910
{ label: 'RealESRGAN-animevideov3', value: 'RealESRGAN-animevideov3' },
1011
{ label: 'RealESRGAN', value: 'RealESRGAN' },
1112
{ label: 'RealESRGAN-anime', value: 'RealESRGAN-anime' },
@@ -34,6 +35,7 @@ export const modelScaleOptions: ModelScaleOptionsType = {
3435
{ label: '2', value: 2 },
3536
{ label: '3', value: 3 }
3637
],
38+
'APISR-RRDB': [{ label: '4', value: 4 }],
3739
'RealESRGAN-animevideov3': [
3840
{ label: '2', value: 2 },
3941
{ label: '3', value: 3 },
@@ -80,6 +82,7 @@ export function GetModelNoiseOptionsByNameAndScale(Model: string, Scale: number)
8082
]
8183
}
8284
} else if (
85+
Model === 'APISR-RRDB' ||
8386
Model === 'RealESRGAN-animevideov3' ||
8487
Model === 'RealESRGAN' ||
8588
Model === 'RealESRGAN-anime'

‎src/renderer/src/views/Final2xSettings.vue‎

Lines changed: 3 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,4 @@
11
<script lang="ts" setup>
2-
//
3-
// .........................................................................................
4-
// .........................................................................................
5-
// ..................................,]]/@@@@@@@@]]]]`......................................
6-
// ..............................,@@@@@@@@@@@@@@@@@@@@@@@@@\`...............................
7-
// .................... ......,/@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\.............................
8-
// .........................,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`..........................
9-
// ......................./@@@@@@@@O@@@@@@OO@OOoO@@@@@@@@@@@@@@@@@@`........................
10-
// ...................../O@@@@@@OO@OOOOoOOOOOO@OOOOO@@OO@@@@@@@@@@@@@`.]`...................
11-
// ...................,//@@@@@oOO@OOO\ooooooOOO@OOooOOO@@@@@@@@@OOOOO@@@O\..................
12-
// ................../\@@@@@ooOO@OOoooooooo/oooOO@OoooO@@@@/O@@@OOOOoO@OOOO\................
13-
// ................./=O@@@`ooooOOo/O\\oooooo\oooo\@OoooooO@@`\/@OOO\`*O\^=OO^...............
14-
// ................@=@@@@.\ooO/O/o=\///ooo^=,^[,`\\/O\\oooO@/@@@OOOO\`\*./o@`...............
15-
// ...............=^@@O@.^ooo\O\\*o=**\*`=***=^,/]=/OOoooooO^`\[O@@@O\\...,oOO].............
16-
// ...............@=@O@.,=oo/O^/,*`=*****=***^\/^,`,`O^oooooO/,o\,@OOOo]`.,OOO^.............
17-
// ...............@@@@..*o/\oO,*.,^o******^**=*@/^*,*^O^ooooooO@]=@OOOO\]OOoOO@^............
18-
// ...............@@@...=o,.=^.**=^o***********=\/\****O,ooooooO^=@@OOOOO@O@OO@^............
19-
// ...............@@^...,.*.=^***=^=***********=^,\\***=\,oooooO\=@@@@@@@@@@@@@^............
20-
// ...............\@......**O^***=^=^*....*..*^=^..\O/**\``o=oooO@@@\@@@O@@@@@@^............
21-
// ...............=^......^*\^***=^=^.....*..,^*.....\\*=^=`\`\ooO@\/@@@@O@@@@@@^...........
22-
// .............../.....,***=^..*O^.O.....,..=^=...,]]]@]O*\*\*=*OO@@@@@@@@@@/..............
23-
// .............../..^..o***=\.,\^=.^,....=..^.,.=/\@@@@@@@@`*\\,=OO@@@@@@@@@...............
24-
// ..............=^,,^..o***=O.,O..^=``..,^.^......=@@`=@^@.O*`=O\O@@@@@@@@@................
25-
// ..............=^==O..=`***O^O]@@@@@\.............[,`.O,O.=\**,oO@@@@@@@@@@...............
26-
// ..............=.^O=*.=^**.OO@/=@@/\@`..................@^*O\**,^@@@@@@@@@@\..............
27-
// ............../.\^=^`=\***=@@`.\Oo/[...................OO.=@\,,,@@@@@@@@@`...............
28-
// ..............O.=^.^\*O***,@\,^........................^O^*\@O,,,OO@@@@@@^...............
29-
// ..............O.O..O.OO^**.\O@........................=^=O`*OOO`\`O@@@@@@@^..............
30-
// ..............O.O..\..@O`***O@@`........,]`...........=**OO`,O\O@\\\@@@@O@@`.............
31-
// ..............=.O..=.`,@O***=@O@\........[OOOOO`.`..../^*=O@`,\`OOO@@@@@\@@O.............
32-
// ..............,^O..=.O.O@\***@@@@@\..../OOO@O\oO/\O,/@^o**o@O\*O*\OOO@@@,O\`\............
33-
// ...............\=..=.o^=OO@``,@@=OOO@OOOOOO\``.o./\O@@o=.*=O/OO\,\,O@@@@.\=@`............
34-
// ................O^.=`/O*OO\O@],@=OOOOOOOO^@oo,..*[[\@@O=^**O^^\O@O/[@@@@.=/..............
35-
// .................\`=^=O\=^OOO@O@=OOOOOOO@@@OooOO]],=O@O^^**O@=^/OOO@@@@@.................
36-
// ..................,O.OOOOO\=@@@^@@@@@@@@@@@@OOOOO^/@O@O^o`^=@O=//O\=O@@@.................
37-
// ................../.=^O@O`=O/@@\@@@@@@@@@@@@@\/@OoO@@@OO=^o=@@\\/\\@/\/@^................
38-
// ................,/,^=oO//,/^...\O@@[.....=`.,`\@@OO@@^@@=o==@@@@\//O@@O@=`......... . ...
39-
// ..............././\.o/o\@\/..[=`=^....[[@\]^...`@@@^\@=@=o\=@O@@\Oooo@@@o=^........... ..
40-
// ............./`/`/.=o//^/[....`./......,@@@@^].`.,[\]@^=^ooO@@@@/@Oooo@`\o/\.............
41-
// .........../\/../,,OO/@O]],.,/[=.......,@@@@@\....../@@/O=oo@@@@`,@@Oo\@.,O\O............
42-
// \`......]O/`..,/,`o@@/`..`....=`......,\,@@@O@@`...=@@@@@O/Oo\/*=/@@@OoO^..\\\`..........
43-
// OOOOO@@/`....,^=^o/OO...../@@/`....,]/@@O@@@@@@@\.=@@@@O@@/oOOoOO/,@@@@OO^..=O/^.........
44-
// OO/`......../\@//oOO....@@@@@.....,@@@@@@@@@@@@@@@@@@@@@@@@\\/[O^,\@@O@@[email protected]\/^........
45-
// ...........O/@@=OO@..../@[.[\`..==@@@@@@@@@@@@@@@@@@@@@@@@@\\O//./O[O\OO@^`..=O\O@.......
46-
// .........,@@@@\OO@@@@@@@`.....,\`=@@@@@@@@O.]/@@@@@@@@@O/=@@\o\[^OoO\O@OO@@`.=@@@@@......
47-
// ........=@@@@OOO@@@@@@@=.........,\@@@@@@@@OO[\/[\OO`=O/OO@@@@OO/^.,^\@@@@@@.=@@@@@@`....
48-
//
49-
// 黑塔保佑，永无BUG
50-
// Herta bless, no bug forever
51-
// 崩坏：星穹铁道，启动！ https://sr.mihoyo.com/ 点击下载
52-
// Honkai: Star Rail, START! https://sr.mihoyo.com/ Click to download
53-
// 🔥 🗡 😠 枪尖已经点燃🔥 🔥 💥 炎枪—— 🤺🔥 ➡️ ➡️ ➡️ 💥 冲锋—— 🤺🔥 🔪 ↘️ 🌋
54-
// 🤺让你尝尝👗 👇 ❄️ 本姑娘的厉害😬👌 🏹 ❄️ 嘿—— ♐ ♐ ♐ 🎆 ❄️ 🐰 ❄️ 🐰❄️ 🐰❄️ 🐰 ❄️ 🐰
55-
// 我们已经踏入风雪💂🏻‍♀️💂🏻‍♀️💂🏻‍♀️💂🏻‍♀️💂🏻‍♀️💂🏻‍♀️💂🏻‍♀️💂🏻‍♀️❄️❄️❄️❄️❄️❄️❄️❄️为了守护和捍卫，击溃他们！🗡️🗡️⚔️
56-
// 让开！😤😤😤漆黑的虎克大人驾到💃💃💃！！！😡😡😡嘟嘟嘟嘟👩‍🦽👩‍🦽👩‍🦽嘣！！！💥💥💥😄
57-
// 👋试探就到此为止了❄️万剑⚔天来~🗡❄️🗡❄️🗡~
58-
// 客人岂能不招待🦊咱们还是以和为贵💥嗯～额呵呵～🔔
59-
// 🏃🏃🏃没见过这么大的钻石💎吧？🔄🔨💎送给你！💎💥👪
60-
// 拜托让我摸个🐟吧，😣🤚🀄🤩🤚🀄这不就糊了🔪
61-
// 🤺😠🍢生死虚实，一念之间。😑😐🌳🍃洞天幻化🍃🍃长梦一觉！👿破！🍃🍃😡🍢
62-
// 见识一下星辰粉碎的样子吧！🦯🌑生存还是毁灭 ✂🌗你别无选择🤓🤔
63-
// 😠我以朗道之名，历经风雪✊，筑成此志🏔️，永不终结👨‍👩‍👧‍👧
64-
// 我想💺你可能还不明白🦵人类从不掩饰掌控星空的欲望🎆当然，也包括我在内☕👌🏻👩🏻
65-
// 随蝴蝶🦋一起消散吧😠，旧世的幻影👾
66-
// 离开克拉拉🤖🖐🏿帮帮我！史瓦罗先生😭
67-
// 我以朗道之名😠，冰雪铸成此志🛡️🛡️，永不终结❄️❄️❄️！
68-
// 这么大的钻石💎，送给你！
69-
// 🌊就让你看看，这葫芦里卖的是什么药🌊⛄💦
70-
// 生存还是毁灭，你别无选择👨🏻👓🖕🏻！🎆
71-
// 规则😠就是用来打破的🏏✊😠
72-
// -----------------------------------------------------------------------------------------
73-
742
import { computed } from 'vue'
753
import { storeToRefs } from 'pinia'
764
import { SelectOption } from 'naive-ui'
@@ -100,6 +28,8 @@ class MyPopoverMessages {
10028
static Model(): string {
10129
if (selectedModel.value == 'RealCUGAN-pro' || selectedModel.value == 'RealCUGAN-se') {
10230
return t('Final2xSettings.text1')
31+
} else if (selectedModel.value == 'APISR-RRDB') {
32+
return t('Final2xSettings.text18')
10333
} else if (
10434
selectedModel.value == 'RealESRGAN-animevideov3' ||
10535
selectedModel.value == 'RealESRGAN' ||
@@ -184,6 +114,7 @@ function ScaleOptionsFallBack(): SelectOption {
184114
const defaultScales: { [key: string]: number } = {
185115
'RealCUGAN-se': 2,
186116
'RealCUGAN-pro': 2,
117+
'APISR-RRDB': 4,
187118
'RealESRGAN-animevideov3': 2,
188119
RealESRGAN: 4,
189120
'RealESRGAN-anime': 4,

0 commit comments

Comments
 (0)