Skip to content

C
console
Commit c6a497f9 authored by nano's avatar nano
Browse files
Options

close arira2 socket when download complete

parent 8e966782
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 70 deletions
.idea/workspace.xml
View file @ c6a497f9
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f0cbce64-0ebc-4f60-8c2d-2fe9e214a8c0" name="Default" comment=""> <list default="true" id="f0cbce64-0ebc-4f60-8c2d-2fe9e214a8c0" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/migrate.ts" afterPath="$PROJECT_DIR$/migrate.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/upload.ts" afterPath="$PROJECT_DIR$/src/routes/upload.ts" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/upload.ts" afterPath="$PROJECT_DIR$/src/routes/upload.ts" />
</list> </list>
<ignored path="mycard-console-backend.iws" /> <ignored path="mycard-console-backend.iws" />
...@@ -31,8 +32,8 @@ ...@@ -31,8 +32,8 @@
<file leaf-file-name="migrate.ts" pinned="false" current-in-tab="false"> <file leaf-file-name="migrate.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/migrate.ts"> <entry file="file://$PROJECT_DIR$/migrate.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341"> <state relative-caret-position="192">
<caret line="134" column="3" lean-forward="true" selection-start-line="134" selection-start-column="3" selection-end-line="134" selection-end-column="3" /> <caret line="128" column="22" lean-forward="true" selection-start-line="128" selection-start-column="22" selection-end-line="128" selection-end-column="22" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
...@@ -43,52 +44,32 @@ ...@@ -43,52 +44,32 @@
<file leaf-file-name="server.ts" pinned="false" current-in-tab="false"> <file leaf-file-name="server.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server.ts"> <entry file="file://$PROJECT_DIR$/server.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="471"> <state relative-caret-position="-320">
<caret line="39" column="0" lean-forward="false" selection-start-line="39" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> <caret line="31" column="7" lean-forward="true" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="upload.ts" pinned="false" current-in-tab="true"> <file leaf-file-name="main.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/upload.ts"> <entry file="file://$PROJECT_DIR$/package/main.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380"> <state relative-caret-position="124">
<caret line="172" column="61" lean-forward="true" selection-start-line="172" selection-start-column="61" selection-end-line="172" selection-end-column="61" /> <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#29#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="false"> <file leaf-file-name="upload.ts" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/package.json"> <entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="20" column="23" lean-forward="true" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="10" column="53" lean-forward="true" selection-start-line="10" selection-start-column="53" selection-end-line="10" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package/main.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="-213">
<caret line="26" column="25" lean-forward="true" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> <caret line="192" column="28" lean-forward="false" selection-start-line="192" selection-start-column="28" selection-end-line="192" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#29#0" expanded="true" /> <element signature="e#0#28#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -135,7 +116,6 @@ ...@@ -135,7 +116,6 @@
<find>。gz</find> <find>。gz</find>
<find>.gz</find> <find>.gz</find>
<find>unlink</find> <find>unlink</find>
<find>console.log</find>
<find>fs.remove</find> <find>fs.remove</find>
<find>remove</find> <find>remove</find>
<find>bundle</find> <find>bundle</find>
...@@ -144,9 +124,10 @@ ...@@ -144,9 +124,10 @@
<find>stats</find> <find>stats</find>
<find>fs</find> <find>fs</find>
<find>rename</find> <find>rename</find>
<find>fs.rename</find>
<find>fs.stat</find>
<find>uploadFile_</find> <find>uploadFile_</find>
<find>fs.stat</find>
<find>fs.rename</find>
<find>console.log</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -470,12 +451,12 @@ ...@@ -470,12 +451,12 @@
<workItem from="1493198225466" duration="47067000" /> <workItem from="1493198225466" duration="47067000" />
<workItem from="1493371982129" duration="6000" /> <workItem from="1493371982129" duration="6000" />
<workItem from="1493372010655" duration="3472000" /> <workItem from="1493372010655" duration="3472000" />
<workItem from="1493692283332" duration="9321000" /> <workItem from="1493692283332" duration="11014000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="211092000" /> <option name="totallyTimeSpent" value="212785000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -772,13 +753,6 @@ ...@@ -772,13 +753,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/package.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-294">
<caret line="159" column="30" lean-forward="true" selection-start-line="159" selection-start-column="30" selection-end-line="159" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/Package.ts"> <entry file="file://$PROJECT_DIR$/src/models/Package.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594"> <state relative-caret-position="594">
...@@ -837,14 +811,6 @@ ...@@ -837,14 +811,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="20" column="23" lean-forward="true" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test.ts"> <entry file="file://$PROJECT_DIR$/test.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1023"> <state relative-caret-position="-1023">
...@@ -864,26 +830,42 @@ ...@@ -864,26 +830,42 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/server.ts"> <entry file="file://$PROJECT_DIR$/config.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="471"> <state relative-caret-position="108">
<caret line="39" column="0" lean-forward="false" selection-start-line="39" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> <caret line="6" column="2" lean-forward="false" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config.ts"> <entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="342">
<caret line="10" column="53" lean-forward="true" selection-start-line="10" selection-start-column="53" selection-end-line="10" selection-end-column="53" /> <caret line="20" column="23" lean-forward="true" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/package.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="195" column="15" lean-forward="false" selection-start-line="195" selection-start-column="4" selection-end-line="195" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/server.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-320">
<caret line="31" column="7" lean-forward="true" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/migrate.ts"> <entry file="file://$PROJECT_DIR$/migrate.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341"> <state relative-caret-position="192">
<caret line="134" column="3" lean-forward="true" selection-start-line="134" selection-start-column="3" selection-end-line="134" selection-end-column="3" /> <caret line="128" column="22" lean-forward="true" selection-start-line="128" selection-start-column="22" selection-end-line="128" selection-end-column="22" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
...@@ -892,8 +874,8 @@ ...@@ -892,8 +874,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/package/main.ts"> <entry file="file://$PROJECT_DIR$/package/main.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="124">
<caret line="26" column="25" lean-forward="true" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<folding> <folding>
<element signature="e#0#29#0" expanded="true" /> <element signature="e#0#29#0" expanded="true" />
</folding> </folding>
...@@ -902,8 +884,8 @@ ...@@ -902,8 +884,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/upload.ts"> <entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380"> <state relative-caret-position="-213">
<caret line="172" column="61" lean-forward="true" selection-start-line="172" selection-start-column="61" selection-end-line="172" selection-end-column="61" /> <caret line="192" column="28" lean-forward="false" selection-start-line="192" selection-start-column="28" selection-end-line="192" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#28#0" expanded="true" />
</folding> </folding>
......
migrate.ts
View file @ c6a497f9
...@@ -9,6 +9,8 @@ const locales = ['zh-CN', 'zh-TW', 'en-US', 'ja-JP']; ...@@ -9,6 +9,8 @@ const locales = ['zh-CN', 'zh-TW', 'en-US', 'ja-JP'];
const languagePack = ['zh-CN', 'en-US']; const languagePack = ['zh-CN', 'en-US'];
const platforms = ['win32', 'darwin']; const platforms = ['win32', 'darwin'];
let wait = ms => new Promise(resolve => setTimeout(resolve, ms));
const lang = { const lang = {
'en-US': { 'en-US': {
'en-US': 'English', 'en-US': 'English',
...@@ -124,10 +126,9 @@ async function main() { ...@@ -124,10 +126,9 @@ async function main() {
for (let i = 0, t = 0; i <= data.length; i++, t += 60000) { for (let i = 0, t = 0; i <= data.length; i++, t += 60000) {
let app = data[i]; let app = data[i];
if (!['ygopro', 'desmume', 'test'].includes(app['id'])) { if (!['ygopro', 'desmume', 'test'].includes(app['id'])) {
setTimeout(async () => { await wait(t);
console.log(`正在处理${app['id']}`); console.log(`正在处理${app['id']}`);
await updateApp(app); await updateApp(app);
}, t);
} }
} }
} catch (e) { } catch (e) {
......
src/routes/upload.ts
View file @ c6a497f9
...@@ -190,12 +190,14 @@ const uploadPackageUrl = async (ctx: Context) => { ...@@ -190,12 +190,14 @@ const uploadPackageUrl = async (ctx: Context) => {
pack!.status = 'failed'; pack!.status = 'failed';
await pack!.save(); await pack!.save();
} }
await downloader.close()
}; };
downloader.onDownloadError = async (err) => { downloader.onDownloadError = async (err) => {
// console.log(await downloader.send('tellStatus', err.gid)) // console.log(await downloader.send('tellStatus', err.gid))
pack!.status = 'failed'; pack!.status = 'failed';
await pack!.save(); await pack!.save();
await downloader.close()
console.log(err); console.log(err);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment