Skip to content

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

delete local files

parent 045e05c1
Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 199 deletions
.idea/workspace.xml
View file @ 6ed6079d
...@@ -2,16 +2,13 @@ ...@@ -2,16 +2,13 @@
<project version="4"> <project version="4">
<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="DELETED" beforePath="$PROJECT_DIR$/src/dot.ts" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <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$/config.ts" afterPath="$PROJECT_DIR$/config.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" /> <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$/src/models/App.ts" afterPath="$PROJECT_DIR$/src/models/App.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/app.ts" afterPath="$PROJECT_DIR$/src/routes/app.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/package.ts" afterPath="$PROJECT_DIR$/src/routes/package.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/utils.ts" afterPath="$PROJECT_DIR$/src/utils.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.ts" afterPath="$PROJECT_DIR$/test.ts" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.ts" afterPath="$PROJECT_DIR$/test.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/yarn.lock" afterPath="$PROJECT_DIR$/yarn.lock" />
</list> </list>
<ignored path="mycard-console-backend.iws" /> <ignored path="mycard-console-backend.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -37,8 +34,8 @@ ...@@ -37,8 +34,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="210"> <state relative-caret-position="309">
<caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" /> <caret line="57" column="1" lean-forward="true" selection-start-line="57" selection-start-column="1" selection-end-line="57" selection-end-column="1" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
...@@ -49,55 +46,43 @@ ...@@ -49,55 +46,43 @@
<file leaf-file-name="test.ts" pinned="false" current-in-tab="false"> <file leaf-file-name="test.ts" pinned="false" current-in-tab="false">
<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="479"> <state relative-caret-position="-459">
<caret line="46" column="46" lean-forward="false" selection-start-line="46" selection-start-column="46" selection-end-line="46" selection-end-column="46" /> <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
<element signature="e#44#86#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="package.ts" pinned="false" current-in-tab="false"> <file leaf-file-name="utils.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/package.ts"> <entry file="file://$PROJECT_DIR$/package/utils.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3386"> <state relative-caret-position="936">
<caret line="215" column="22" lean-forward="false" selection-start-line="215" selection-start-column="22" selection-end-line="215" selection-end-column="22" /> <caret line="55" column="18" lean-forward="true" selection-start-line="55" selection-start-column="18" selection-end-line="55" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="App.ts" pinned="false" current-in-tab="false"> <file leaf-file-name="config.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/App.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="584"> <state relative-caret-position="144">
<caret line="123" column="0" lean-forward="false" selection-start-line="123" selection-start-column="0" selection-end-line="124" selection-end-column="0" /> <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="app.ts" pinned="false" current-in-tab="true"> <file leaf-file-name="upload.ts" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/routes/app.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="180"> <state relative-caret-position="249">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> <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> <folding>
<element signature="e#39#81#0" expanded="true" /> <element signature="e#0#28#0" expanded="true" />
</folding> <element signature="e#355#397#0" expanded="true" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="utils.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
<folding>
<element signature="e#0#24#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -116,13 +101,6 @@ ...@@ -116,13 +101,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>hashes</find>
<find>console.log</find>
<find>0</find>
<find>upload</find>
<find>ondown</find>
<find>onDownloadStart</find>
<find>object</find>
<find>update</find> <find>update</find>
<find>!</find> <find>!</find>
<find>dep</find> <find>dep</find>
...@@ -138,7 +116,6 @@ ...@@ -138,7 +116,6 @@
<find>full</find> <find>full</find>
<find>Can not change AppID</find> <find>Can not change AppID</find>
<find>release</find> <find>release</find>
<find>author</find>
<find>joi.ob</find> <find>joi.ob</find>
<find>http://114.215.243.95:8001</find> <find>http://114.215.243.95:8001</find>
<find>joi</find> <find>joi</find>
...@@ -146,6 +123,14 @@ ...@@ -146,6 +123,14 @@
<find>admin</find> <find>admin</find>
<find>patch</find> <find>patch</find>
<find>files</find> <find>files</find>
<find>author</find>
<find>paent</find>
<find>parent</find>
<find>tags</find>
<find>tag</find>
<find>old</find>
<find>metalink</find>
<find>old_meta</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -176,21 +161,21 @@ ...@@ -176,21 +161,21 @@
<option value="$PROJECT_DIR$/.travis.yml" /> <option value="$PROJECT_DIR$/.travis.yml" />
<option value="$PROJECT_DIR$/docker-compose.yml" /> <option value="$PROJECT_DIR$/docker-compose.yml" />
<option value="$PROJECT_DIR$/src/routes/upload.js" /> <option value="$PROJECT_DIR$/src/routes/upload.js" />
<option value="$PROJECT_DIR$/src/routes/upload.ts" />
<option value="$PROJECT_DIR$/Dockerfile" /> <option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/entrypoint.sh" /> <option value="$PROJECT_DIR$/entrypoint.sh" />
<option value="$PROJECT_DIR$/server.ts" /> <option value="$PROJECT_DIR$/server.ts" />
<option value="$PROJECT_DIR$/views/update.hbs" /> <option value="$PROJECT_DIR$/views/update.hbs" />
<option value="$PROJECT_DIR$/package/main.ts" />
<option value="$PROJECT_DIR$/package.json" /> <option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/test.ts" />
<option value="$PROJECT_DIR$/config.ts" />
<option value="$PROJECT_DIR$/src/routes/package.ts" /> <option value="$PROJECT_DIR$/src/routes/package.ts" />
<option value="$PROJECT_DIR$/src/models/App.ts" />
<option value="$PROJECT_DIR$/migrate.ts" />
<option value="$PROJECT_DIR$/src/dot.ts" /> <option value="$PROJECT_DIR$/src/dot.ts" />
<option value="$PROJECT_DIR$/src/utils.ts" /> <option value="$PROJECT_DIR$/src/utils.ts" />
<option value="$PROJECT_DIR$/test.ts" />
<option value="$PROJECT_DIR$/src/routes/app.ts" /> <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$/src/routes/upload.ts" />
</list> </list>
</option> </option>
</component> </component>
...@@ -210,8 +195,8 @@ ...@@ -210,8 +195,8 @@
<handled-path value="$PROJECT_DIR$/node_modules" /> <handled-path value="$PROJECT_DIR$/node_modules" />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="230" /> <option name="x" value="406" />
<option name="y" value="1138" /> <option name="y" value="1136" />
<option name="width" value="1232" /> <option name="width" value="1232" />
<option name="height" value="777" /> <option name="height" value="777" />
</component> </component>
...@@ -289,11 +274,7 @@ ...@@ -289,11 +274,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="src" /> <option name="myItemId" value="package" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="models" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -469,12 +450,12 @@ ...@@ -469,12 +450,12 @@
<workItem from="1493107593448" duration="867000" /> <workItem from="1493107593448" duration="867000" />
<workItem from="1493174892830" duration="25000" /> <workItem from="1493174892830" duration="25000" />
<workItem from="1493174934848" duration="6205000" /> <workItem from="1493174934848" duration="6205000" />
<workItem from="1493198225466" duration="31925000" /> <workItem from="1493198225466" duration="42024000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="183151000" /> <option name="totallyTimeSpent" value="193250000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -486,7 +467,7 @@ ...@@ -486,7 +467,7 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="230" y="1138" width="1232" height="777" extended-state="0" /> <frame x="406" y="1136" width="1232" height="777" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <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" /> <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" />
...@@ -559,7 +540,6 @@ ...@@ -559,7 +540,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/models/mongodb.ts" />
<entry file="file://$PROJECT_DIR$/node_modules/@types/koa/index.d.ts"> <entry file="file://$PROJECT_DIR$/node_modules/@types/koa/index.d.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5396"> <state relative-caret-position="-5396">
...@@ -648,20 +628,6 @@ ...@@ -648,20 +628,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/inversify.config.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/types.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tslint.json"> <entry file="file://$PROJECT_DIR$/tslint.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216"> <state relative-caret-position="216">
...@@ -721,14 +687,6 @@ ...@@ -721,14 +687,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/package/utils.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1134">
<caret line="66" column="76" lean-forward="true" selection-start-line="66" selection-start-column="76" selection-end-line="66" selection-end-column="92" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="90">
...@@ -737,14 +695,6 @@ ...@@ -737,14 +695,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/Iridium.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/entrypoint.sh"> <entry file="file://$PROJECT_DIR$/entrypoint.sh">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="108">
...@@ -753,14 +703,6 @@ ...@@ -753,14 +703,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/Package.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-779">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="304">
...@@ -769,23 +711,12 @@ ...@@ -769,23 +711,12 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="138" column="0" lean-forward="true" selection-start-line="138" selection-start-column="0" selection-end-line="138" 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>
<entry file="file://$PROJECT_DIR$/package.json"> <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="342"> <state relative-caret-position="342">
<caret line="20" column="29" lean-forward="false" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" /> <caret line="20" column="29" lean-forward="false" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" />
<folding> <folding>
<marker date="1493354750000" expanded="true" signature="245:835" ph="{&quot;@types/joi&quot;: &quot;^10.3.0&quot;...}" /> <marker date="1493357270000" expanded="true" signature="245:835" ph="{&quot;@types/joi&quot;: &quot;^10.3.0&quot;...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -806,109 +737,171 @@ ...@@ -806,109 +737,171 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/package/main.ts"> <entry file="file://$PROJECT_DIR$/node_modules/axios/index.d.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1170"> <state relative-caret-position="36">
<caret line="65" column="54" lean-forward="false" selection-start-line="65" selection-start-column="54" selection-end-line="65" selection-end-column="54" /> <caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
<folding> <folding />
<element signature="e#0#29#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/node_modules/axios/index.d.ts"> <entry file="file://$PROJECT_DIR$/migrate.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36"> <state relative-caret-position="109">
<caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" /> <caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config.ts"> <entry file="file://$PROJECT_DIR$/src/dot.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162"> <state relative-caret-position="0">
<caret line="9" column="9" lean-forward="false" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/migrate.js"> <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es6.d.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109"> <state relative-caret-position="186">
<caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" /> <caret line="885" column="30" lean-forward="true" selection-start-line="885" selection-start-column="30" selection-end-line="885" selection-end-column="30" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test.ts"> <entry file="file://$PROJECT_DIR$/src/routes/app.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="479"> <state relative-caret-position="240">
<caret line="46" column="46" lean-forward="false" selection-start-line="46" selection-start-column="46" selection-end-line="46" selection-end-column="46" /> <caret line="81" column="17" lean-forward="true" selection-start-line="81" selection-start-column="17" selection-end-line="81" selection-end-column="17" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="e#39#81#0" expanded="true" />
<element signature="e#44#86#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/migrate.ts"> <entry file="file://$PROJECT_DIR$/src/utils.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="234">
<caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" /> <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#24#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/package.ts"> <entry file="file://$PROJECT_DIR$/src/inversify.config.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/Iridium.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3386"> <state relative-caret-position="162">
<caret line="215" column="22" lean-forward="false" selection-start-line="215" selection-start-column="22" selection-end-line="215" selection-end-column="22" /> <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/types.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/App.ts"> <entry file="file://$PROJECT_DIR$/src/models/App.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="584"> <state relative-caret-position="-2072">
<caret line="123" column="0" lean-forward="false" selection-start-line="123" selection-start-column="0" selection-end-line="124" selection-end-column="0" /> <caret line="17" column="4" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="4" />
<folding>
<element signature="e#0#62#0" expanded="true" />
<marker date="1493363791000" expanded="true" signature="219:347" ph="..." />
<marker date="1493363791000" expanded="true" signature="369:432" ph="..." />
</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="-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" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/dot.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="0"> <state relative-caret-position="594">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="33" column="20" lean-forward="true" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/utils.ts"> <entry file="file://$PROJECT_DIR$/node_modules/@types/xmldoc/index.d.ts">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54"> <state relative-caret-position="36">
<caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" /> <caret line="5" column="16" lean-forward="false" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<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" />
<folding> <folding>
<element signature="e#0#24#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es6.d.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="186"> <state relative-caret-position="-459">
<caret line="885" column="30" lean-forward="true" selection-start-line="885" selection-start-column="30" selection-end-line="885" selection-end-column="30" /> <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding>
<element signature="n#!!doc" 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="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" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/routes/app.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="180"> <state relative-caret-position="142">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> <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> <folding>
<element signature="e#39#81#0" expanded="true" /> <element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config.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" />
<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> </folding>
</state> </state>
</provider> </provider>
......
config.ts
View file @ 6ed6079d
import * as path from 'path'; import * as path from 'path';
let baseUrl = 'http://127.0.01:8001' let baseUrl = 'http://127.0.01:8001'
let testUrl = 'http://114.215.243.95:8001'
export default { export default {
upload_path: path.join(__dirname, './test/upload'), upload_path: path.join(__dirname, './test/upload'),
download_path: path.join(__dirname, './test/release/downloads'), download_path: path.join(__dirname, './test/release/downloads'),
new_apps_json: `${baseUrl}/v2/apps`, new_apps_json: `${baseUrl}/v2/apps`,
upload_url: `${testUrl}/v1/upload/packageUrl`,
old_apps_json: 'https://api.moecube.com/apps.json', old_apps_json: 'https://api.moecube.com/apps.json',
new_package: `${baseUrl}/v1/package/`,
new_app: (appId) => `${baseUrl}/v1/app/${appId}`, new_app: (appId) => `${baseUrl}/v1/app/${appId}`,
old_metalinks: (package_id) => `https://cdn01.moecube.com/release/metalinks/${package_id}.meta4llf`, old_metalinks: (package_id) => `https://cdn01.moecube.com/release/metalinks/${package_id}.meta4`,
new_metalinks: (package_id) => `${baseUrl}/${package_id}/meta`, new_metalinks: (package_id) => `${baseUrl}/${package_id}/meta`,
old_checksums: (package_id) => `https://cdn01.moecube.com/release/checksums/${package_id}`, old_checksums: (package_id) => `https://cdn01.moecube.com/release/checksums/${package_id}`,
new_checksums: (package_id) => `${baseUrl}/${package_id}/checksum`, new_checksums: (package_id) => `${baseUrl}/${package_id}/checksum`,
......
migrate.ts
View file @ 6ed6079d
import axios from 'axios'; import axios from 'axios';
import config from './config'; import config from './config';
import * as uuid from 'uuid';
import * as _ from 'lodash';
import {XmlDocument} from 'xmldoc';
let apps = {};
const locales = ['zh-CN', 'zh-TW', 'en-US', 'ja-JP'];
const languagePack = ['zh-CN', 'en-US'];
const platforms = ['win32', 'darwin'];
const lang = {
'en-US': {
'en-US': 'English',
'zh-CN': 'Simplified Chinese',
'zh-TW': 'Traditional Chinese',
'language_pack': 'Language Pack'
},
'zh-CN': {
'en-US': '英文',
'zh-CN': '简体中文',
'zh-TW': '繁体中文',
'language_pack': '语言包'
}
};
async function createPackage(app) {
return await axios.post(config.new_package, {
id: uuid.v1(),
appId: app.id,
locales: locales,
platforms: platforms,
version: '0.0.1',
});
}
async function updatePackage(app, pack) {
let {data} = await axios.get(config.old_metalinks(app.id));
const xml = new XmlDocument(data);
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
});
}
}
async function createApp(app) { async function createApp(app) {
return await axios.post(config.new_app(app.id), { return await axios.post(config.new_app(app.id), {
...@@ -11,30 +57,46 @@ async function createApp(app) { ...@@ -11,30 +57,46 @@ async function createApp(app) {
}); });
} }
function handleName(app) {
return Object.assign({}, ...languagePack.map(language => ({
/* tslint:disable */
[language]: `${apps[app.parent]['name'][language]} ${lang[language]['language_pack']} (${app.locales.map(locale => lang[language][locale])})`
/* tslint:enable */
})));
}
async function updateApp(app) { async function updateApp(app) {
const {id, name, description, developers, publishers, released_at, category, tags, dependencies, references, homepage, actions, version, conference, icon, cover, background, news, ...other} = app; const {
return await axios.patch(config.new_app(app.id), { id, name, description, developers, publishers, released_at, category, tags, dependencies, references,
id, homepage, actions, version, conference, icon, cover, background, locales, author, news, ...other
name, } = app;
description, await
developers, axios.patch(config.new_app(app.id), {
publishers, id,
released_at, name: name || handleName(app),
category, description,
tags, developers,
dependencies, publishers,
references, released_at,
homepage, category,
homepage, tags,
actions, dependencies,
version, references,
conference, homepage,
icon, actions,
cover, version,
background, conference,
news: {} icon,
...other, cover,
}); background,
locales: locales || [],
news: {},
...other,
});
let {data} = await createPackage(app);
await updatePackage(app, data);
} }
...@@ -44,9 +106,13 @@ async function main() { ...@@ -44,9 +106,13 @@ async function main() {
let {data} = await axios.get(config.old_apps_json); let {data} = await axios.get(config.old_apps_json);
try { try {
for (let app of data) { for (let app of _.sampleSize(data, 5)) {
await createApp(app).catch(error => {}); if (!['ygopro', 'desmume', 'test'].includes(app.id)) {
await updateApp(app); apps[app.id] = app;
await createApp(app).catch(error => {
});
await updateApp(app);
}
} }
} catch (e) { } catch (e) {
console.trace(e); console.trace(e);
......
package/main.ts
View file @ 6ed6079d
...@@ -79,6 +79,9 @@ export async function bundle(...args) { ...@@ -79,6 +79,9 @@ export async function bundle(...args) {
let fullPath = path.join(path.dirname(filePath), `${fullHash}.tar.gz`); let fullPath = path.join(path.dirname(filePath), `${fullHash}.tar.gz`);
await fs.renameAsync(filePath, fullPath); await fs.renameAsync(filePath, fullPath);
await fs.removeAsync(uploadFile_path)
await fs.removeAsync(package_path)
return { return {
distPath: dist_path, distPath: dist_path,
files: Array.from(files.values()), files: Array.from(files.values()),
......
src/models/App.ts
View file @ 6ed6079d
...@@ -9,21 +9,32 @@ interface Platform<T> { ...@@ -9,21 +9,32 @@ interface Platform<T> {
[platform: string]: T; [platform: string]: T;
} }
interface Package { // interface Package {
id: string; // id: string;
name: string; // name: string;
platforms: Platform<string[]>; // platforms: Platform<string[]>;
locales: I18n<string[]>; // locales: I18n<string[]>;
files: File[]; // files: File[];
} // }
//
// interface File {
// path: string;
// size: number;
// hash: string;
// }
interface File { interface Trailer {
path: string; type: string;
size: number; url: string;
hash: string; poster: string;
} }
interface Achievement {
name: string;
description: string;
image: string;
progress_max: number;
}
export interface App { export interface App {
...@@ -37,7 +48,7 @@ export interface App { ...@@ -37,7 +48,7 @@ export interface App {
released_at?: string; released_at?: string;
category?: string; category?: string;
parent?: string; parent?: string;
tag?: string[]; tags?: string[];
dependencies?: Platform<string[]>; dependencies?: Platform<string[]>;
references?: Platform<string[]>; references?: Platform<string[]>;
homepage?: string; homepage?: string;
...@@ -52,6 +63,8 @@ export interface App { ...@@ -52,6 +63,8 @@ export interface App {
cover?: string; cover?: string;
background?: string; background?: string;
created_at?: Date; created_at?: Date;
trailer?: Trailer[];
achievements?: Achievement[];
} }
@Collection('apps') @Collection('apps')
...@@ -78,7 +91,7 @@ export class AppSchema extends Instance<App, AppSchema> implements App { ...@@ -78,7 +91,7 @@ export class AppSchema extends Instance<App, AppSchema> implements App {
@Property(String, false) @Property(String, false)
parent?: string; parent?: string;
@Property(Array, false) @Property(Array, false)
tag?: string[]; tags?: string[];
@Property(Object, false) @Property(Object, false)
dependencies?: Platform<string[]>; dependencies?: Platform<string[]>;
@Property(Object, false) @Property(Object, false)
...@@ -90,7 +103,7 @@ export class AppSchema extends Instance<App, AppSchema> implements App { ...@@ -90,7 +103,7 @@ export class AppSchema extends Instance<App, AppSchema> implements App {
@Property(Object, false) @Property(Object, false)
actions?: Platform<{ [key: string]: { execuate: string, args: string[], env: { [key: string]: string } } }>; actions?: Platform<{ [key: string]: { execuate: string, args: string[], env: { [key: string]: string } } }>;
@Property(Object, false) @Property(Object, false)
files?: { [key: string]: { sync: boolean, ignore: boolean} }; files?: { [key: string]: { sync: boolean, ignore: boolean } };
@Property(Object, false) @Property(Object, false)
version?: Platform<string>; version?: Platform<string>;
@Property(Object, false) @Property(Object, false)
...@@ -105,10 +118,13 @@ export class AppSchema extends Instance<App, AppSchema> implements App { ...@@ -105,10 +118,13 @@ export class AppSchema extends Instance<App, AppSchema> implements App {
cover?: string; cover?: string;
@Property(String, false) @Property(String, false)
background?: string; background?: string;
// @Property(Array, false)
// packages?: Package[];
@Property(Date, false) @Property(Date, false)
created_at: Date; created_at?: Date;
@Property(Array, false)
trailer?: Trailer[];
@Property(Array, false)
achievements?: Achievement[];
static onCreating(app: App) { static onCreating(app: App) {
app.created_at = new Date(); app.created_at = new Date();
......
src/routes/upload.ts
View file @ 6ed6079d
...@@ -108,6 +108,9 @@ export const UploadPackage = async (ctx: Context) => { ...@@ -108,6 +108,9 @@ export const UploadPackage = async (ctx: Context) => {
await mongodb.Packages.update({id: pack!.id}, {$set: {status: 'deprecated'}}, {multi: true}); await mongodb.Packages.update({id: pack!.id}, {$set: {status: 'deprecated'}}, {multi: true});
await pack!.save(); await pack!.save();
// 上传完，干掉本地目录
await fs.removeAsync(bundled.distPath)
} catch (e) { } catch (e) {
pack!.status = 'failed'; pack!.status = 'failed';
...@@ -170,6 +173,9 @@ const uploadPackageUrl = async (ctx: Context) => { ...@@ -170,6 +173,9 @@ const uploadPackageUrl = async (ctx: Context) => {
await mongodb.Packages.update({id: pack!.id}, {$set: {status: 'deprecated'}}, {multi: true}); await mongodb.Packages.update({id: pack!.id}, {$set: {status: 'deprecated'}}, {multi: true});
await pack!.save(); await pack!.save();
// 上传完，干掉本地目录
await fs.removeAsync(bundled.distPath)
} catch (e) { } catch (e) {
pack!.status = 'failed'; pack!.status = 'failed';
await pack!.save(); await pack!.save();
......
test.ts
View file @ 6ed6079d
...@@ -28,9 +28,13 @@ async function test_download() { ...@@ -28,9 +28,13 @@ async function test_download() {
const app: any = _.sample(apps); const app: any = _.sample(apps);
console.log(`正在测试 ${app.id} 的 下载`); console.log(`正在测试 ${app.id} 的 下载`);
const metalink = await (await fetch(config.new_metalinks(app.id))).text(); const metalink = await (await fetch(config.new_metalinks(app.id))).text();
const xml = new XmlDocument(metalink); const xml = new XmlDocument(metalink);
const url = xml.valueWithPath('file.url'); const url = xml.valueWithPath('file.url');
const response = await fetch(url, {method: 'HEAD'}); const response = await fetch(url, {method: 'HEAD'});
if (!response.ok) { if (!response.ok) {
throw `${app.id} 的 下载地址 ${url} 返回 ${response.statusText}`; throw `${app.id} 的 下载地址 ${url} 返回 ${response.statusText}`;
......
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