Skip to content

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

fix check file

parent 6ed6079d
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 131 deletions
.idea/workspace.xml
View file @ 4292629a
......@@ -3,12 +3,10 @@
<component name="ChangeListManager">
<list default="true" id="f0cbce64-0ebc-4f60-8c2d-2fe9e214a8c0" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config.ts" afterPath="$PROJECT_DIR$/config.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/aria2.conf" afterPath="$PROJECT_DIR$/aria2.conf" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/migrate.ts" afterPath="$PROJECT_DIR$/migrate.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package/main.ts" afterPath="$PROJECT_DIR$/package/main.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/App.ts" afterPath="$PROJECT_DIR$/src/models/App.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package/utils.ts" afterPath="$PROJECT_DIR$/package/utils.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/upload.ts" afterPath="$PROJECT_DIR$/src/routes/upload.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.ts" afterPath="$PROJECT_DIR$/test.ts" />
</list>
<ignored path="mycard-console-backend.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -34,8 +32,8 @@
<file leaf-file-name="migrate.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/migrate.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="57" column="1" lean-forward="true" selection-start-line="57" selection-start-column="1" selection-end-line="57" selection-end-column="1" />
<state relative-caret-position="150">
<caret line="74" column="10" lean-forward="false" selection-start-line="74" selection-start-column="10" selection-end-line="74" selection-end-column="10" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
......@@ -43,51 +41,49 @@
</provider>
</entry>
</file>
<file leaf-file-name="entrypoint.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/entrypoint.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-459">
<caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<state relative-caret-position="102">
<caret line="25" column="72" lean-forward="true" selection-start-line="25" selection-start-column="72" selection-end-line="25" selection-end-column="72" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#44#86#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="utils.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package/utils.ts">
<file leaf-file-name="upload.ts" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="936">
<caret line="55" column="18" lean-forward="true" selection-start-line="55" selection-start-column="18" selection-end-line="55" selection-end-column="18" />
<state relative-caret-position="216">
<caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config.ts">
<file leaf-file-name="index.d.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/node_modules/@types/mime/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
<caret line="11" column="52" lean-forward="true" selection-start-line="11" selection-start-column="52" selection-end-line="11" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="upload.ts" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="174" column="0" lean-forward="true" selection-start-line="174" selection-start-column="0" selection-end-line="174" selection-end-column="0" />
<folding>
<element signature="e#0#28#0" expanded="true" />
<element signature="e#355#397#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -101,15 +97,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>update</find>
<find>!</find>
<find>dep</find>
<find>fullPath</find>
<find>onFile</find>
<find>up</find>
<find>Iridium</find>
<find>iridium</find>
<find>yargs</find>
<find>bus</find>
<find>_original</find>
<find>original</find>
......@@ -131,6 +118,15 @@
<find>old</find>
<find>metalink</find>
<find>old_meta</find>
<find>console.log</find>
<find>language</find>
<find>languagepa</find>
<find>dow</find>
<find>handleName</find>
<find>name</find>
<find>ext</find>
<find>。gz</find>
<find>.gz</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -151,7 +147,6 @@
<option value="$PROJECT_DIR$/src/routes/config.ts" />
<option value="$PROJECT_DIR$/src/routes/package.json" />
<option value="$PROJECT_DIR$/.tslint" />
<option value="$PROJECT_DIR$/package/utils.ts" />
<option value="$PROJECT_DIR$/.editorconfig" />
<option value="$PROJECT_DIR$/tslint.json" />
<option value="$PROJECT_DIR$/src/models/Iridium.ts" />
......@@ -173,8 +168,10 @@
<option value="$PROJECT_DIR$/src/routes/app.ts" />
<option value="$PROJECT_DIR$/src/models/App.ts" />
<option value="$PROJECT_DIR$/config.ts" />
<option value="$PROJECT_DIR$/migrate.ts" />
<option value="$PROJECT_DIR$/package/main.ts" />
<option value="$PROJECT_DIR$/package/utils.ts" />
<option value="$PROJECT_DIR$/aria2.conf" />
<option value="$PROJECT_DIR$/migrate.ts" />
<option value="$PROJECT_DIR$/src/routes/upload.ts" />
</list>
</option>
......@@ -195,8 +192,8 @@
<handled-path value="$PROJECT_DIR$/node_modules" />
</component>
<component name="ProjectFrameBounds">
<option name="x" value="406" />
<option name="y" value="1136" />
<option name="x" value="197" />
<option name="y" value="1120" />
<option name="width" value="1232" />
<option name="height" value="777" />
</component>
......@@ -450,12 +447,12 @@
<workItem from="1493107593448" duration="867000" />
<workItem from="1493174892830" duration="25000" />
<workItem from="1493174934848" duration="6205000" />
<workItem from="1493198225466" duration="42024000" />
<workItem from="1493198225466" duration="46500000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="193250000" />
<option name="totallyTimeSpent" value="197726000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -467,7 +464,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="406" y="1136" width="1232" height="777" extended-state="0" />
<frame x="197" y="1120" width="1232" height="777" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="TypeScript" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32846716" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
......@@ -521,6 +518,36 @@
<option value="$PROJECT_DIR$/test.js.map" />
<option value="$PROJECT_DIR$/migrate.js.map" />
<option value="$PROJECT_DIR$/migrate.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/config.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/config.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/utils.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/utils.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/package/utils.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/package/utils.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/models/Iridium.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/models/Iridium.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/models/App.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/models/App.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/models/Package.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/models/Package.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/server.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/server.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/inversify.config.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/types.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/inversify.config.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/types.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/package/main.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/package/main.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/routes/upload.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/routes/upload.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/routes/app.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/routes/app.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/routes/package.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/src/routes/package.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/test.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/migrate.js" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/migrate.js.map" />
<option value="$USER_HOME$/Library/Group Containers/G69SCX94XU.duck/Library/Application Support/duck/Volumes/wudizhanche.mycard.moe – SFTP/test/moecube-console/test.js.map" />
</list>
</option>
</component>
......@@ -561,13 +588,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/@types/fs-extra-promise/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172">
<caret line="56" column="31" lean-forward="false" selection-start-line="56" selection-start-column="31" selection-end-line="56" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/iridium/dist/test/Utilities.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
......@@ -605,21 +625,7 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/package.json" />
<entry file="file://$PROJECT_DIR$/node_modules/@types/mime/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/desmume-darwin.meta4" />
<entry file="file://$PROJECT_DIR$/node_modules/@types/node/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="107">
<caret line="1831" column="15" lean-forward="false" selection-start-line="1831" selection-start-column="15" selection-end-line="1831" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/checksum.ts" />
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor">
......@@ -658,13 +664,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/aria2.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tsconfig.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
......@@ -695,14 +694,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entrypoint.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
......@@ -849,60 +840,100 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/migrate.ts">
<entry file="file://$PROJECT_DIR$/package/main.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="57" column="1" lean-forward="true" selection-start-line="57" selection-start-column="1" selection-end-line="57" selection-end-column="1" />
<state relative-caret-position="142">
<caret line="82" column="36" lean-forward="true" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
<folding>
<element signature="e#0#26#0" expanded="true" />
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package/utils.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="12" column="15" lean-forward="true" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/aria2.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entrypoint.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-459">
<caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<state relative-caret-position="102">
<caret line="25" column="72" lean-forward="true" selection-start-line="25" selection-start-column="72" selection-end-line="25" selection-end-column="72" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#44#86#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package/utils.ts">
<entry file="file://$PROJECT_DIR$/node_modules/@types/fs-extra-promise/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="936">
<caret line="55" column="18" lean-forward="true" selection-start-line="55" selection-start-column="18" selection-end-line="55" selection-end-column="18" />
<state relative-caret-position="132">
<caret line="56" column="59" lean-forward="true" selection-start-line="56" selection-start-column="59" selection-end-line="56" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package/main.ts">
<entry file="file://$PROJECT_DIR$/migrate.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
<caret line="82" column="36" lean-forward="true" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
<state relative-caret-position="150">
<caret line="74" column="10" lean-forward="false" selection-start-line="74" selection-start-column="10" selection-end-line="74" selection-end-column="10" />
<folding>
<element signature="e#0#29#0" expanded="true" />
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config.ts">
<entry file="file://$PROJECT_DIR$/node_modules/@types/mime/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
<caret line="11" column="52" lean-forward="true" selection-start-line="11" selection-start-column="52" selection-end-line="11" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/@types/node/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="2705" column="20" lean-forward="false" selection-start-line="2705" selection-start-column="20" selection-end-line="2705" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="174" column="0" lean-forward="true" selection-start-line="174" selection-start-column="0" selection-end-line="174" selection-end-column="0" />
<folding>
<element signature="e#0#28#0" expanded="true" />
<element signature="e#355#397#0" expanded="true" />
</folding>
<state relative-caret-position="216">
<caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
......
aria2.conf
View file @ 4292629a
......@@ -23,6 +23,3 @@ max-download-limit=0
max-overall-upload-limit=0
#单文件速度限制
max-upload-limit=0
#文件保存路径, 默认为当前启动位置
dir=/Users/vai/Downloads
migrate.ts
View file @ 4292629a
......@@ -41,12 +41,11 @@ async function updatePackage(app, pack) {
const rawUrl = xml.valueWithPath('file.url');
const url = rawUrl.replace('https://r.my-card.in/dist/', 'https://r.my-card.in/release/dist/');
if (app.name == 'th1') {
return await axios.post(config.upload_url, {
_id: pack._id,
url
});
}
console.log(pack._id, url);
return await axios.post(config.upload_url, {
_id: pack._id,
url
});
}
async function createApp(app) {
......@@ -106,9 +105,9 @@ async function main() {
let {data} = await axios.get(config.old_apps_json);
try {
for (let app of _.sampleSize(data, 5)) {
if (!['ygopro', 'desmume', 'test'].includes(app.id)) {
apps[app.id] = app;
for (let app of _.sampleSize(data, 2)) {
if (!['ygopro', 'desmume', 'test'].includes(app['id'])) {
apps[app['id']] = app;
await createApp(app).catch(error => {
});
await updateApp(app);
......
package/utils.ts
View file @ 4292629a
......@@ -3,13 +3,12 @@ import * as _fs from 'fs';
import * as crypto from 'crypto';
import * as child_process from 'child_process';
interface crawOptions {
interface CrawOptions {
onDir: (files: string | string[], _path: string, depth: number) => Promise<void>;
onFile: (file: string) => Promise<void>;
}
export async function crawlPath(_path, options: crawOptions, depth = 0) {
export async function crawlPath(_path, options: CrawOptions, depth = 0) {
if (await isDir(_path)) {
depth += 1;
const files = await fs.readdirAsync(_path);
......@@ -50,7 +49,7 @@ export function archiveSingle(archive: string, files: string[], directory: strin
// .pipe(dir)
// return tar.pack(file).pipe(_fs.createWriteStream(archive))
return new Promise<void>((resolve, reject) => {
let child = child_process.spawn("tar", ["-czf", archive, '-P', '-C', directory].concat(files), {stdio: 'inherit'});
let child = child_process.spawn('tar', ['-czf', archive, '-P', '-C', directory].concat(files), {stdio: 'inherit'});
child.on('exit', (code) => {
if (code == 0) {
resolve();
......@@ -66,7 +65,7 @@ export function archiveSingle(archive: string, files: string[], directory: strin
export function archive(archive: string, files: string[], directory: string): Promise<void> {
return new Promise<void>((resolve, reject) => {
let child = child_process.spawn("tar", ["-vczf", archive, '-C', directory].concat(files), {stdio: 'inherit'});
let child = child_process.spawn('tar', ['-vczf', archive, '-C', directory].concat(files), {stdio: 'inherit'});
child.on('exit', (code) => {
if (code == 0) {
resolve();
......@@ -82,7 +81,7 @@ export function archive(archive: string, files: string[], directory: string): Pr
export function untar(archive: string, directory: string): Promise<void> {
return new Promise<void>((resolve, reject) => {
let child = child_process.spawn("tar", ["-xvf", archive, '-C', directory], {stdio: 'inherit'});
let child = child_process.spawn('tar', ['-xvf', archive, '-C', directory], {stdio: 'inherit'});
child.on('exit', (code) => {
if (code == 0) {
resolve();
......@@ -99,19 +98,19 @@ export function untar(archive: string, directory: string): Promise<void> {
export function caculateSHA256(file: string): Promise<string> {
return new Promise((resolve, reject) => {
let input = _fs.createReadStream(file);
const hash = crypto.createHash("sha256");
hash.on("error", (error: Error) => {
const hash = crypto.createHash('sha256');
hash.on('error', (error: Error) => {
reject(error);
});
input.on("error", (error: Error) => {
input.on('error', (error: Error) => {
reject(error);
});
hash.on('readable', () => {
let data = hash.read();
if (data) {
resolve((<Buffer>data).toString("hex"));
resolve((<Buffer>data).toString('hex'));
}
});
input.pipe(hash);
});
}
\ No newline at end of file
}
src/routes/upload.ts
View file @ 4292629a
......@@ -7,12 +7,19 @@ import * as Client from 'aliyun-oss-upload-stream';
import * as fs from 'fs-extra-promise';
import * as path from 'path';
import * as Aria2 from 'aria2';
import Router = require('koa-router');
import {bundle} from '../../package/main';
import {mongodb} from '../models/Iridium';
import {toObjectID} from 'iridium';
import config from '../../config';
import {UploadOSS} from '../utils'
import {UploadOSS} from '../utils';
import Router = require('koa-router');
const checkFilePath = async (file) => {
if (['gz', 'rar', 'zip', '7z', 'x-gzip'].indexOf(mime.lookup(file.path)) === -1) {
console.log(file);
throw new Error(`Unsupported file type: ${mime.lookup(file.path)}`);
}
};
const checkPackage = async (file) => {
if (['application/zip', 'application/gz', 'application/rar', 'application/7z', 'application/x-gzip'].indexOf(file.mime) === -1) {
......@@ -100,7 +107,7 @@ export const UploadPackage = async (ctx: Context) => {
const bundled = await bundle(filename);
// 打包完，上传阿里云
await UploadOSS(bundled.distPath)
await UploadOSS(bundled.distPath);
Object.assign(pack, bundled);
pack!.status = 'uploaded';
......@@ -109,7 +116,7 @@ export const UploadPackage = async (ctx: Context) => {
await pack!.save();
// 上传完，干掉本地目录
await fs.removeAsync(bundled.distPath)
await fs.removeAsync(bundled.distPath);
} catch (e) {
......@@ -159,13 +166,13 @@ const uploadPackageUrl = async (ctx: Context) => {
const [file] = files;
try {
await checkPackage(file);
await checkFilePath(file);
// 打包
const bundled = await bundle(path.basename(file.path));
// 打包完， 上传阿里云
await UploadOSS(bundled.distPath)
await UploadOSS(bundled.distPath);
Object.assign(pack, bundled);
pack!.status = 'uploaded';
......@@ -174,9 +181,10 @@ const uploadPackageUrl = async (ctx: Context) => {
await pack!.save();
// 上传完，干掉本地目录
await fs.removeAsync(bundled.distPath)
await fs.removeAsync(bundled.distPath);
} catch (e) {
console.log(e);
pack!.status = 'failed';
await pack!.save();
}
......
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