Skip to content

Commit 9a31213

Browse files
ilharpilharp
committed
refactor: cordis migrate - stage 1
1 parent c125ed5 commit 9a31213

File tree

33 files changed

+150
-173
lines changed

33 files changed

+150
-173
lines changed

‎.github/workflows/build.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -106,86 +106,86 @@ jobs:
106106
uses: actions/upload-artifact@v3
107107
with:
108108
name: koi-${{ matrix.target.rid }}-${{ github.sha }}.zip
109-
path: build/dist/koishi.zip
109+
path: build/dist/cordis.zip
110110

111111
- name: Upload msi for Windows to Build Artifact
112112
if: matrix.target.goos == 'windows'
113113
uses: actions/upload-artifact@v3
114114
with:
115115
name: koi-${{ matrix.target.rid }}-${{ github.sha }}.msi
116-
path: build/dist/koishi.msi
116+
path: build/dist/cordis.msi
117117

118118
- name: Upload zip for macOS to Build Artifact
119119
if: matrix.target.goos == 'darwin'
120120
uses: actions/upload-artifact@v3
121121
with:
122122
name: koi-${{ matrix.target.rid }}-${{ github.sha }}.zip
123-
path: build/dist/koishi.zip
123+
path: build/dist/cordis.zip
124124

125125
- name: Upload dmg for macOS to Build Artifact
126126
if: matrix.target.goos == 'darwin'
127127
uses: actions/upload-artifact@v3
128128
with:
129129
name: koi-${{ matrix.target.rid }}-${{ github.sha }}.dmg
130-
path: build/dist/koishi.dmg
130+
path: build/dist/cordis.dmg
131131

132132
- name: Upload pkg for macOS to Build Artifact
133133
if: matrix.target.goos == 'darwin'
134134
uses: actions/upload-artifact@v3
135135
with:
136136
name: koi-${{ matrix.target.rid }}-${{ github.sha }}.pkg
137-
path: build/dist/koishi.pkg
137+
path: build/dist/cordis.pkg
138138

139139
- name: Upload zip for Linux to Build Artifact
140140
if: matrix.target.goos == 'linux'
141141
uses: actions/upload-artifact@v3
142142
with:
143143
name: koi-${{ matrix.target.rid }}-${{ github.sha }}.zip
144-
path: build/dist/koishi.zip
144+
path: build/dist/cordis.zip
145145

146146
- name: Upload AppImage for Linux to Build Artifact
147147
if: matrix.target.goos == 'linux'
148148
uses: actions/upload-artifact@v3
149149
with:
150150
name: koi-${{ matrix.target.rid }}-${{ github.sha }}.AppImage
151-
path: build/dist/Koishi.AppImage
151+
path: build/dist/Cordis.AppImage
152152

153153
- name: Upload Release Files for Windows to GitHub Release
154154
if: startsWith(github.ref, 'refs/tags/') && matrix.target.goos == 'windows'
155155
env:
156156
GITHUB_TOKEN: ${{ secrets.ACTIONS_DEPLOY_MODULE_KEY }}
157157
run: |
158-
mv build/dist/koishi.zip build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip
159-
mv build/dist/koishi.msi build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.msi
158+
mv build/dist/cordis.zip build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip
159+
mv build/dist/cordis.msi build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.msi
160160
gh release upload ${{ steps.tag.outputs.version }} \
161-
build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip \
162-
build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.msi
161+
build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip \
162+
build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.msi
163163
shell: bash
164164

165165
- name: Upload Release Files for macOS to GitHub Release
166166
if: startsWith(github.ref, 'refs/tags/') && matrix.target.goos == 'darwin'
167167
env:
168168
GITHUB_TOKEN: ${{ secrets.ACTIONS_DEPLOY_MODULE_KEY }}
169169
run: |
170-
mv build/dist/koishi.zip build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip
171-
mv build/dist/koishi.dmg build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.dmg
172-
mv build/dist/koishi.pkg build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.pkg
170+
mv build/dist/cordis.zip build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip
171+
mv build/dist/cordis.dmg build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.dmg
172+
mv build/dist/cordis.pkg build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.pkg
173173
gh release upload ${{ steps.tag.outputs.version }} \
174-
build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip \
175-
build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.dmg \
176-
build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.pkg
174+
build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip \
175+
build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.dmg \
176+
build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.pkg
177177
shell: bash
178178

179179
- name: Upload Release Files for Linux to GitHub Release
180180
if: startsWith(github.ref, 'refs/tags/') && matrix.target.goos == 'linux'
181181
env:
182182
GITHUB_TOKEN: ${{ secrets.ACTIONS_DEPLOY_MODULE_KEY }}
183183
run: |
184-
mv build/dist/koishi.zip build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip
185-
mv build/dist/Koishi.AppImage build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.AppImage
184+
mv build/dist/cordis.zip build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip
185+
mv build/dist/Cordis.AppImage build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.AppImage
186186
gh release upload ${{ steps.tag.outputs.version }} \
187-
build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip \
188-
build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.AppImage
187+
build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.zip \
188+
build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.AppImage
189189
shell: bash
190190

191191
# - name: Upload Release Files for Windows to App Center
@@ -196,7 +196,7 @@ jobs:
196196
# -a koishi/Koishi-Desktop-for-Windows \
197197
# -g stable \
198198
# -b ${{ steps.tag.outputs.build_version }} \
199-
# -f build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.msi
199+
# -f build/dist/cordis-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.msi
200200
# shell: bash
201201

202202
# - name: Upload Release Files for macOS to App Center
@@ -207,5 +207,5 @@ jobs:
207207
# -a koishi/Koishi-Desktop-for-macOS \
208208
# -g stable \
209209
# -b ${{ steps.tag.outputs.build_version }} -n ${{ steps.tag.outputs.build_number }} \
210-
# -f build/dist/koishi-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.pkg
210+
# -f build/dist/codris-desktop-${{ matrix.target.rid }}-${{ steps.tag.outputs.version }}.pkg
211211
# shell: bash

‎config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// KOISHI DESKTOP BUILD CONFIG
1+
// CORDIS DESKTOP BUILD CONFIG
22
// ---------------------------------------------------
33
// Here are all config used during building. You can
44
// freely change configs like mirrors and build paths,
@@ -35,7 +35,7 @@ export const versionToolsWix = '311'
3535
//#endregion
3636

3737
//#region Defaults
38-
// These are defaults for koishi-desktop.
38+
// These are defaults for Cordis Desktop.
3939

4040
export const repoBoilerplate = 'koishijs/boilerplate'
4141
export const versionBoilerplate = 'v1.13.6'

‎packages/app/koicli/cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ func NewCli(i *do.Injector) (*cli.App, error) {
2626
do.ProvideNamed(i, serviceCommandYarn, newYarnCommand)
2727

2828
return &cli.App{
29-
Name: p.Sprintf("Koishi Desktop"),
30-
Usage: p.Sprintf("Launch Koishi from your desktop."),
29+
Name: p.Sprintf("Cordis Desktop"),
30+
Usage: p.Sprintf("Launch Cordis from your desktop."),
3131
Version: fmt.Sprintf("v%s", util.AppVersion),
3232
Authors: []*cli.Author{
3333
{

‎packages/app/koicli/import.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func newImportCommand(i *do.Injector) (*cli.Command, error) {
2727

2828
return &cli.Command{
2929
Name: "import",
30-
Usage: p.Sprintf("Import a Koishi Bundle"),
30+
Usage: p.Sprintf("Import a Cordis Bundle"),
3131
ArgsUsage: "path",
3232
Action: do.MustInvokeNamed[cli.ActionFunc](i, serviceActionImport),
3333

‎packages/app/koicli/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func newRunCommand(i *do.Injector) (*cli.Command, error) {
2727

2828
return &cli.Command{
2929
Name: "run",
30-
Usage: p.Sprintf("Run Koishi Desktop"),
30+
Usage: p.Sprintf("Run Cordis Desktop"),
3131
Action: do.MustInvokeNamed[cli.ActionFunc](i, serviceActionRun),
3232
Subcommands: []*cli.Command{
3333
{

‎packages/app/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func main() {
4646

4747
do.Provide(i, koicli.NewCli)
4848

49-
l.Info(p.Sprintf("Koishi Desktop v%s", util.AppVersion))
49+
l.Info(p.Sprintf("Cordis Desktop v%s", util.AppVersion))
5050

5151
noConsole := false
5252

‎packages/app/ui/tray/tray.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ func (tray *TrayDaemon) onReady() {
116116

117117
l.Debug(p.Sprintf("Tray ready."))
118118

119-
// systray.SetTitle("Koishi")
119+
// systray.SetTitle("Cordis")
120120
if runtime.GOOS != "windows" {
121-
systray.SetTooltip("Koishi")
121+
systray.SetTooltip("Cordis")
122122
}
123123
systray.SetTemplateIcon(icon.Koishi, icon.Koishi)
124124

@@ -516,7 +516,7 @@ func (tray *TrayDaemon) rebuild() {
516516
func (tray *TrayDaemon) addItemsBefore() {
517517
p := do.MustInvoke[*message.Printer](tray.i)
518518

519-
mTitle := systray.AddMenuItem(p.Sprintf("Koishi Desktop"), "")
519+
mTitle := systray.AddMenuItem(p.Sprintf("Cordis Desktop"), "")
520520
mTitle.Disable()
521521
mTitle.SetTemplateIcon(icon.Koishi, icon.Koishi)
522522
version := "v" + util.AppVersion
@@ -654,12 +654,12 @@ func (tray *TrayDaemon) addItemsAfter() {
654654
os.Getenv("COMSPEC"),
655655
"/C",
656656
"START",
657-
"Koishi Desktop Terminal",
657+
"Cordis Desktop Terminal",
658658
"/D",
659659
dirExe,
660660
"cmd", // Use "cmd" here
661661
"/K",
662-
"echo Koishi Desktop Terminal - You can start running koi command here.",
662+
"echo Cordis Desktop Terminal - You can start running koi command here.",
663663
)
664664
} else {
665665
cmd = exec.Command(

‎packages/build/tasks/pack/appimage.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { linuxAppImageDesktop } from '../../templates/linux'
66
import { dir } from '../../utils/path'
77
import { exec } from '../../utils/spawn'
88

9-
const appDirPath = dir('buildLinux', 'Koishi.AppDir/')
9+
const appDirPath = dir('buildLinux', 'Cordis.AppDir/')
1010
const appBinaryPath = path.join(appDirPath, 'usr/bin/')
1111
const appMetaInfoPath = path.join(appDirPath, 'usr/share/metainfo/')
1212

@@ -76,8 +76,8 @@ export const packAppImageGenerate = () =>
7676

7777
export const packAppImageCopyDist = () =>
7878
fs.copyFile(
79-
dir('buildLinux', 'Koishi-x86_64.AppImage'),
80-
dir('dist', 'Koishi.AppImage')
79+
dir('buildLinux', 'Cordis-x86_64.AppImage'),
80+
dir('dist', 'Cordis.AppImage')
8181
)
8282

8383
export const packAppImage = series(

‎packages/build/tasks/pack/mac.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,38 @@ import { koiVersion } from '../../utils/config'
66
import { dir } from '../../utils/path'
77
import { exec, tryExec } from '../../utils/spawn'
88

9-
const appPath = dir('buildMac', 'Koishi.app/')
9+
const appPath = dir('buildMac', 'Cordis.app/')
1010

1111
export const packMacApp = async () => {
12-
const appInfoPlistPath = dir('buildMac', 'Koishi.app/Contents/Info.plist')
13-
const appMacosPath = dir('buildMac', 'Koishi.app/Contents/MacOS/')
14-
const appResourcesPath = dir('buildMac', 'Koishi.app/Contents/Resources/')
12+
const appInfoPlistPath = dir('buildMac', 'Cordis.app/Contents/Info.plist')
13+
const appMacosPath = dir('buildMac', 'Cordis.app/Contents/MacOS/')
14+
const appResourcesPath = dir('buildMac', 'Cordis.app/Contents/Resources/')
1515
const appIconPath = dir(
1616
'buildMac',
17-
'Koishi.app/Contents/Resources/koishi-app.icns'
17+
'Cordis.app/Contents/Resources/koishi-app.icns'
1818
)
1919

2020
await mkdirp(appMacosPath)
2121
await mkdirp(appResourcesPath)
2222

2323
await fs.cp(dir('buildUnfoldBinary'), appMacosPath, { recursive: true })
2424
await fs.rename(
25-
dir('buildMac', 'Koishi.app/Contents/MacOS/KoiShell_KoiShell.bundle/'),
26-
dir('buildMac', 'Koishi.app/KoiShell_KoiShell.bundle/')
25+
dir('buildMac', 'Cordis.app/Contents/MacOS/KoiShell_KoiShell.bundle/'),
26+
dir('buildMac', 'Cordis.app/KoiShell_KoiShell.bundle/')
2727
)
2828
await fs.copyFile(dir('buildAssets', 'koishi-app.icns'), appIconPath)
2929
await fs.writeFile(appInfoPlistPath, macAppPlist)
3030
}
3131

3232
export const packMacDmg = async () => {
3333
await fs.writeFile(
34-
dir('buildMac', 'Koishi.app/Contents/MacOS/koi.yml'),
34+
dir('buildMac', 'Cordis.app/Contents/MacOS/koi.yml'),
3535
'redirect: USERDATA'
3636
)
3737
await tryExec('yarn', ['create-dmg', appPath, dir('buildMac'), '--overwrite'])
3838
await fs.rename(
39-
dir('buildMac', `Koishi ${koiVersion}.dmg`),
40-
dir('dist', 'koishi.dmg')
39+
dir('buildMac', `Cordis ${koiVersion}.dmg`),
40+
dir('dist', 'cordis.dmg')
4141
)
4242
}
4343

@@ -57,12 +57,12 @@ export const packMacPkg = async () => {
5757
'--identifier',
5858
'chat.koishi.desktop',
5959
'--component',
60-
'Koishi.app',
60+
'Cordis.app',
6161
'--scripts',
6262
'scripts',
6363
'--install-location',
6464
'/Applications',
65-
'koishi-app.pkg',
65+
'cordis-app.pkg',
6666
],
6767
dir('buildMac')
6868
)
@@ -74,7 +74,7 @@ export const packMacPkg = async () => {
7474
'distribution.xml',
7575
'--package-path',
7676
'.',
77-
dir('dist', 'koishi.pkg'),
77+
dir('dist', 'cordis.pkg'),
7878
],
7979
dir('buildMac')
8080
)

‎packages/build/tasks/pack/msi.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const buildPackMsi = (lang: Lang) => async () => {
155155
)
156156
}
157157

158-
const pathNeutralMsi = dir('buildMsi', 'koishi.msi')
158+
const pathNeutralMsi = dir('buildMsi', 'cordis.msi')
159159

160160
export const packMsiCopyNeutral = () =>
161161
fs.copyFile(dir('buildMsi', '1033.msi'), pathNeutralMsi)
@@ -209,7 +209,7 @@ export const packMsiListStorage = () =>
209209
exec('cscript', [getPathWiSubStg(), pathNeutralMsi], dir('buildMsi'))
210210

211211
export const packMsiCopyDist = () =>
212-
fs.copyFile(pathNeutralMsi, dir('dist', 'koishi.msi'))
212+
fs.copyFile(pathNeutralMsi, dir('dist', 'cordis.msi'))
213213

214214
export const packMsi = series(
215215
packMsiMkdir,

‎packages/build/tasks/pack/portable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import { zip } from '../../utils/compress'
22
import { dir } from '../../utils/path'
33

44
export const packPortable = () =>
5-
zip(dir('buildPortable'), dir('dist', 'koishi.zip'))
5+
zip(dir('buildPortable'), dir('dist', 'cordis.zip'))

‎packages/build/templates/linux/chat.koishi.desktop.appdata.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<metadata_license>AGPL-1.0</metadata_license>
99
<project_license>AGPL-1.0</project_license>
1010

11-
<name>Koishi</name>
12-
<summary>Cross-platform chatbot framework made with love</summary>
11+
<name>Cordis</name>
12+
<summary>Meta-Framework for Modern Applications</summary>
1313
<description>
14-
<p>Cross-platform chatbot framework made with love</p>
14+
<p>Meta-Framework for Modern Applications</p>
1515
</description>
16-
<developer_name>Koishi.js</developer_name>
16+
<developer_name>Cordis</developer_name>
1717

1818
<categories>
1919
<category>Development</category>
@@ -26,7 +26,7 @@
2626
<keyword>Chatbot</keyword>
2727
<keyword xml:lang="zh">聊天机器人</keyword>
2828

29-
<keyword translate="no">Koishi</keyword>
29+
<keyword translate="no">Cordis</keyword>
3030

3131
<keyword translate="no">Discord</keyword>
3232
<keyword translate="no">Telegram</keyword>

‎packages/build/templates/linux/chat.koishi.desktop.desktop.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[Desktop Entry]
22
Type=Application
3-
Name=Koishi
4-
Comment=Start Koishi
3+
Name=Cordis
4+
Comment=Start Cordis
55
TryExec=koi
66
Exec=koi
77
Icon=chat.koishi.desktop
88
Categories=Development;
9-
Keywords=Bot;Chatbot;Koishi;Discord;Telegram;OneBot;Framework;
10-
Keywords[zh]=Bot;机器人;聊天机器人;Koishi;Discord;Telegram;OneBot;框架;
9+
Keywords=Bot;Chatbot;Koishi;Cordis;Discord;Telegram;OneBot;Framework;
10+
Keywords[zh]=Bot;机器人;聊天机器人;Koishi;Cordis;Discord;Telegram;OneBot;框架;
1111
Actions=UI;Daemon;
12-
X-AppImage-Name=Koishi
12+
X-AppImage-Name=Cordis
1313
X-AppImage-Version={{koiVersion}}
1414
X-AppImage-Arch=x86_64
1515

0 commit comments

Comments
 (0)