From f5ae325ecd0f3ff02306ca060aa060294d2fa84e Mon Sep 17 00:00:00 2001 From: tengge <930372551@qq.com> Date: Mon, 4 May 2020 08:33:12 +0800 Subject: [PATCH] move assets handler to assets package. --- server/cmd/serve.go | 23 +++++------------- .../animation/handle_animation.go | 0 .../animation/handle_animation_test.go | 0 server/server/{ => assets}/animation/model.go | 0 server/server/{ => assets}/animation/type.go | 0 server/server/assets/assets.go | 24 +++++++++++++++++++ .../server/{ => assets}/audio/handle_audio.go | 0 .../{ => assets}/audio/handle_audio_test.go | 0 server/server/{ => assets}/audio/model.go | 0 server/server/{ => assets}/audio/type.go | 0 .../character/handle_character.go | 0 .../character/handle_character_test.go | 0 server/server/{ => assets}/character/model.go | 0 server/server/{ => assets}/character/type.go | 0 .../{ => assets}/material/handle_material.go | 0 .../material/handle_material_test.go | 0 server/server/{ => assets}/material/model.go | 0 server/server/{ => assets}/material/type.go | 0 .../server/{ => assets}/mesh/handle_mesh.go | 0 .../{ => assets}/mesh/handle_mesh_test.go | 0 server/server/{ => assets}/mesh/model.go | 0 server/server/{ => assets}/mesh/type.go | 0 .../{ => assets}/particle/handle_particle.go | 0 .../particle/handle_particle_test.go | 0 server/server/{ => assets}/particle/model.go | 0 server/server/{ => assets}/particle/type.go | 0 .../{ => assets}/prefab/handle_prefab.go | 0 .../{ => assets}/prefab/handle_prefab_test.go | 0 server/server/{ => assets}/prefab/model.go | 0 server/server/{ => assets}/prefab/type.go | 0 .../{ => assets}/scene/export_list_model.go | 0 .../server/{ => assets}/scene/handle_scene.go | 0 .../{ => assets}/scene/handle_scene_test.go | 0 .../{ => assets}/scene/history_model.go | 0 server/server/{ => assets}/scene/model.go | 0 .../screenshot/handle_screenshot.go | 0 .../screenshot/handle_screenshot_test.go | 0 .../server/{ => assets}/screenshot/model.go | 0 .../assets/{ => summary}/handle_assets.go | 2 +- .../{ => summary}/handle_assets_test.go | 2 +- .../{ => assets}/texture/handle_texture.go | 0 .../texture/handle_texture_test.go | 0 server/server/{ => assets}/texture/model.go | 0 server/server/{ => assets}/texture/type.go | 0 .../server/{ => assets}/video/handle_video.go | 0 .../{ => assets}/video/handle_video_test.go | 0 server/server/{ => assets}/video/model.go | 0 47 files changed, 32 insertions(+), 19 deletions(-) rename server/server/{ => assets}/animation/handle_animation.go (100%) rename server/server/{ => assets}/animation/handle_animation_test.go (100%) rename server/server/{ => assets}/animation/model.go (100%) rename server/server/{ => assets}/animation/type.go (100%) create mode 100644 server/server/assets/assets.go rename server/server/{ => assets}/audio/handle_audio.go (100%) rename server/server/{ => assets}/audio/handle_audio_test.go (100%) rename server/server/{ => assets}/audio/model.go (100%) rename server/server/{ => assets}/audio/type.go (100%) rename server/server/{ => assets}/character/handle_character.go (100%) rename server/server/{ => assets}/character/handle_character_test.go (100%) rename server/server/{ => assets}/character/model.go (100%) rename server/server/{ => assets}/character/type.go (100%) rename server/server/{ => assets}/material/handle_material.go (100%) rename server/server/{ => assets}/material/handle_material_test.go (100%) rename server/server/{ => assets}/material/model.go (100%) rename server/server/{ => assets}/material/type.go (100%) rename server/server/{ => assets}/mesh/handle_mesh.go (100%) rename server/server/{ => assets}/mesh/handle_mesh_test.go (100%) rename server/server/{ => assets}/mesh/model.go (100%) rename server/server/{ => assets}/mesh/type.go (100%) rename server/server/{ => assets}/particle/handle_particle.go (100%) rename server/server/{ => assets}/particle/handle_particle_test.go (100%) rename server/server/{ => assets}/particle/model.go (100%) rename server/server/{ => assets}/particle/type.go (100%) rename server/server/{ => assets}/prefab/handle_prefab.go (100%) rename server/server/{ => assets}/prefab/handle_prefab_test.go (100%) rename server/server/{ => assets}/prefab/model.go (100%) rename server/server/{ => assets}/prefab/type.go (100%) rename server/server/{ => assets}/scene/export_list_model.go (100%) rename server/server/{ => assets}/scene/handle_scene.go (100%) rename server/server/{ => assets}/scene/handle_scene_test.go (100%) rename server/server/{ => assets}/scene/history_model.go (100%) rename server/server/{ => assets}/scene/model.go (100%) rename server/server/{ => assets}/screenshot/handle_screenshot.go (100%) rename server/server/{ => assets}/screenshot/handle_screenshot_test.go (100%) rename server/server/{ => assets}/screenshot/model.go (100%) rename server/server/assets/{ => summary}/handle_assets.go (99%) rename server/server/assets/{ => summary}/handle_assets_test.go (98%) rename server/server/{ => assets}/texture/handle_texture.go (100%) rename server/server/{ => assets}/texture/handle_texture_test.go (100%) rename server/server/{ => assets}/texture/model.go (100%) rename server/server/{ => assets}/texture/type.go (100%) rename server/server/{ => assets}/video/handle_video.go (100%) rename server/server/{ => assets}/video/handle_video_test.go (100%) rename server/server/{ => assets}/video/model.go (100%) diff --git a/server/cmd/serve.go b/server/cmd/serve.go index f30d07dd..07893eff 100644 --- a/server/cmd/serve.go +++ b/server/cmd/serve.go @@ -16,23 +16,12 @@ import ( "github.com/tengge1/shadoweditor/server" // TODO: Is it better to move the imports to `../main.go`? - _ "github.com/tengge1/shadoweditor/server/animation" // animation api - _ "github.com/tengge1/shadoweditor/server/assets" // assets api - _ "github.com/tengge1/shadoweditor/server/audio" // audio api - _ "github.com/tengge1/shadoweditor/server/category" // category api - _ "github.com/tengge1/shadoweditor/server/character" // character api - _ "github.com/tengge1/shadoweditor/server/export" // export api - _ "github.com/tengge1/shadoweditor/server/material" // material api - _ "github.com/tengge1/shadoweditor/server/mesh" // mesh api - _ "github.com/tengge1/shadoweditor/server/particle" // particle api - _ "github.com/tengge1/shadoweditor/server/prefab" // prefab api - _ "github.com/tengge1/shadoweditor/server/scene" // scene api - _ "github.com/tengge1/shadoweditor/server/screenshot" // screenshot api - _ "github.com/tengge1/shadoweditor/server/system" // system api - _ "github.com/tengge1/shadoweditor/server/texture" // texture api - _ "github.com/tengge1/shadoweditor/server/tools" // tools api - _ "github.com/tengge1/shadoweditor/server/upload" // upload api - _ "github.com/tengge1/shadoweditor/server/video" // video api + _ "github.com/tengge1/shadoweditor/server/assets" // assets api + _ "github.com/tengge1/shadoweditor/server/category" // category api + _ "github.com/tengge1/shadoweditor/server/export" // export api + _ "github.com/tengge1/shadoweditor/server/system" // system api + _ "github.com/tengge1/shadoweditor/server/tools" // tools api + _ "github.com/tengge1/shadoweditor/server/upload" // upload api ) // serveCmd run the shadow editor server. diff --git a/server/server/animation/handle_animation.go b/server/server/assets/animation/handle_animation.go similarity index 100% rename from server/server/animation/handle_animation.go rename to server/server/assets/animation/handle_animation.go diff --git a/server/server/animation/handle_animation_test.go b/server/server/assets/animation/handle_animation_test.go similarity index 100% rename from server/server/animation/handle_animation_test.go rename to server/server/assets/animation/handle_animation_test.go diff --git a/server/server/animation/model.go b/server/server/assets/animation/model.go similarity index 100% rename from server/server/animation/model.go rename to server/server/assets/animation/model.go diff --git a/server/server/animation/type.go b/server/server/assets/animation/type.go similarity index 100% rename from server/server/animation/type.go rename to server/server/assets/animation/type.go diff --git a/server/server/assets/assets.go b/server/server/assets/assets.go new file mode 100644 index 00000000..e130c5b6 --- /dev/null +++ b/server/server/assets/assets.go @@ -0,0 +1,24 @@ +// Copyright 2017-2020 The ShadowEditor Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. +// +// For more information, please visit: https://github.com/tengge1/ShadowEditor +// You can also visit: https://gitee.com/tengge1/ShadowEditor + +package system + +// Register handlers in `github.com/tengge1/shadoweditor/server/assets` here. +import ( + _ "github.com/tengge1/shadoweditor/server/assets/animation" // animation api + _ "github.com/tengge1/shadoweditor/server/assets/audio" // audio api + _ "github.com/tengge1/shadoweditor/server/assets/character" // character api + _ "github.com/tengge1/shadoweditor/server/assets/material" // material api + _ "github.com/tengge1/shadoweditor/server/assets/mesh" // mesh api + _ "github.com/tengge1/shadoweditor/server/assets/particle" // particle api + _ "github.com/tengge1/shadoweditor/server/assets/prefab" // prefab api + _ "github.com/tengge1/shadoweditor/server/assets/scene" // scene api + _ "github.com/tengge1/shadoweditor/server/assets/screenshot" // screenshot api + _ "github.com/tengge1/shadoweditor/server/assets/summary" // summary api + _ "github.com/tengge1/shadoweditor/server/assets/texture" // texture api + _ "github.com/tengge1/shadoweditor/server/assets/video" // video api +) diff --git a/server/server/audio/handle_audio.go b/server/server/assets/audio/handle_audio.go similarity index 100% rename from server/server/audio/handle_audio.go rename to server/server/assets/audio/handle_audio.go diff --git a/server/server/audio/handle_audio_test.go b/server/server/assets/audio/handle_audio_test.go similarity index 100% rename from server/server/audio/handle_audio_test.go rename to server/server/assets/audio/handle_audio_test.go diff --git a/server/server/audio/model.go b/server/server/assets/audio/model.go similarity index 100% rename from server/server/audio/model.go rename to server/server/assets/audio/model.go diff --git a/server/server/audio/type.go b/server/server/assets/audio/type.go similarity index 100% rename from server/server/audio/type.go rename to server/server/assets/audio/type.go diff --git a/server/server/character/handle_character.go b/server/server/assets/character/handle_character.go similarity index 100% rename from server/server/character/handle_character.go rename to server/server/assets/character/handle_character.go diff --git a/server/server/character/handle_character_test.go b/server/server/assets/character/handle_character_test.go similarity index 100% rename from server/server/character/handle_character_test.go rename to server/server/assets/character/handle_character_test.go diff --git a/server/server/character/model.go b/server/server/assets/character/model.go similarity index 100% rename from server/server/character/model.go rename to server/server/assets/character/model.go diff --git a/server/server/character/type.go b/server/server/assets/character/type.go similarity index 100% rename from server/server/character/type.go rename to server/server/assets/character/type.go diff --git a/server/server/material/handle_material.go b/server/server/assets/material/handle_material.go similarity index 100% rename from server/server/material/handle_material.go rename to server/server/assets/material/handle_material.go diff --git a/server/server/material/handle_material_test.go b/server/server/assets/material/handle_material_test.go similarity index 100% rename from server/server/material/handle_material_test.go rename to server/server/assets/material/handle_material_test.go diff --git a/server/server/material/model.go b/server/server/assets/material/model.go similarity index 100% rename from server/server/material/model.go rename to server/server/assets/material/model.go diff --git a/server/server/material/type.go b/server/server/assets/material/type.go similarity index 100% rename from server/server/material/type.go rename to server/server/assets/material/type.go diff --git a/server/server/mesh/handle_mesh.go b/server/server/assets/mesh/handle_mesh.go similarity index 100% rename from server/server/mesh/handle_mesh.go rename to server/server/assets/mesh/handle_mesh.go diff --git a/server/server/mesh/handle_mesh_test.go b/server/server/assets/mesh/handle_mesh_test.go similarity index 100% rename from server/server/mesh/handle_mesh_test.go rename to server/server/assets/mesh/handle_mesh_test.go diff --git a/server/server/mesh/model.go b/server/server/assets/mesh/model.go similarity index 100% rename from server/server/mesh/model.go rename to server/server/assets/mesh/model.go diff --git a/server/server/mesh/type.go b/server/server/assets/mesh/type.go similarity index 100% rename from server/server/mesh/type.go rename to server/server/assets/mesh/type.go diff --git a/server/server/particle/handle_particle.go b/server/server/assets/particle/handle_particle.go similarity index 100% rename from server/server/particle/handle_particle.go rename to server/server/assets/particle/handle_particle.go diff --git a/server/server/particle/handle_particle_test.go b/server/server/assets/particle/handle_particle_test.go similarity index 100% rename from server/server/particle/handle_particle_test.go rename to server/server/assets/particle/handle_particle_test.go diff --git a/server/server/particle/model.go b/server/server/assets/particle/model.go similarity index 100% rename from server/server/particle/model.go rename to server/server/assets/particle/model.go diff --git a/server/server/particle/type.go b/server/server/assets/particle/type.go similarity index 100% rename from server/server/particle/type.go rename to server/server/assets/particle/type.go diff --git a/server/server/prefab/handle_prefab.go b/server/server/assets/prefab/handle_prefab.go similarity index 100% rename from server/server/prefab/handle_prefab.go rename to server/server/assets/prefab/handle_prefab.go diff --git a/server/server/prefab/handle_prefab_test.go b/server/server/assets/prefab/handle_prefab_test.go similarity index 100% rename from server/server/prefab/handle_prefab_test.go rename to server/server/assets/prefab/handle_prefab_test.go diff --git a/server/server/prefab/model.go b/server/server/assets/prefab/model.go similarity index 100% rename from server/server/prefab/model.go rename to server/server/assets/prefab/model.go diff --git a/server/server/prefab/type.go b/server/server/assets/prefab/type.go similarity index 100% rename from server/server/prefab/type.go rename to server/server/assets/prefab/type.go diff --git a/server/server/scene/export_list_model.go b/server/server/assets/scene/export_list_model.go similarity index 100% rename from server/server/scene/export_list_model.go rename to server/server/assets/scene/export_list_model.go diff --git a/server/server/scene/handle_scene.go b/server/server/assets/scene/handle_scene.go similarity index 100% rename from server/server/scene/handle_scene.go rename to server/server/assets/scene/handle_scene.go diff --git a/server/server/scene/handle_scene_test.go b/server/server/assets/scene/handle_scene_test.go similarity index 100% rename from server/server/scene/handle_scene_test.go rename to server/server/assets/scene/handle_scene_test.go diff --git a/server/server/scene/history_model.go b/server/server/assets/scene/history_model.go similarity index 100% rename from server/server/scene/history_model.go rename to server/server/assets/scene/history_model.go diff --git a/server/server/scene/model.go b/server/server/assets/scene/model.go similarity index 100% rename from server/server/scene/model.go rename to server/server/assets/scene/model.go diff --git a/server/server/screenshot/handle_screenshot.go b/server/server/assets/screenshot/handle_screenshot.go similarity index 100% rename from server/server/screenshot/handle_screenshot.go rename to server/server/assets/screenshot/handle_screenshot.go diff --git a/server/server/screenshot/handle_screenshot_test.go b/server/server/assets/screenshot/handle_screenshot_test.go similarity index 100% rename from server/server/screenshot/handle_screenshot_test.go rename to server/server/assets/screenshot/handle_screenshot_test.go diff --git a/server/server/screenshot/model.go b/server/server/assets/screenshot/model.go similarity index 100% rename from server/server/screenshot/model.go rename to server/server/assets/screenshot/model.go diff --git a/server/server/assets/handle_assets.go b/server/server/assets/summary/handle_assets.go similarity index 99% rename from server/server/assets/handle_assets.go rename to server/server/assets/summary/handle_assets.go index 3d6b66fb..d8605271 100644 --- a/server/server/assets/handle_assets.go +++ b/server/server/assets/summary/handle_assets.go @@ -5,7 +5,7 @@ // For more information, please visit: https://github.com/tengge1/ShadowEditor // You can also visit: https://gitee.com/tengge1/ShadowEditor -package assets +package summary import ( "net/http" diff --git a/server/server/assets/handle_assets_test.go b/server/server/assets/summary/handle_assets_test.go similarity index 98% rename from server/server/assets/handle_assets_test.go rename to server/server/assets/summary/handle_assets_test.go index 77a562d8..85856ad2 100644 --- a/server/server/assets/handle_assets_test.go +++ b/server/server/assets/summary/handle_assets_test.go @@ -5,7 +5,7 @@ // For more information, please visit: https://github.com/tengge1/ShadowEditor // You can also visit: https://gitee.com/tengge1/ShadowEditor -package assets +package summary import ( "io/ioutil" diff --git a/server/server/texture/handle_texture.go b/server/server/assets/texture/handle_texture.go similarity index 100% rename from server/server/texture/handle_texture.go rename to server/server/assets/texture/handle_texture.go diff --git a/server/server/texture/handle_texture_test.go b/server/server/assets/texture/handle_texture_test.go similarity index 100% rename from server/server/texture/handle_texture_test.go rename to server/server/assets/texture/handle_texture_test.go diff --git a/server/server/texture/model.go b/server/server/assets/texture/model.go similarity index 100% rename from server/server/texture/model.go rename to server/server/assets/texture/model.go diff --git a/server/server/texture/type.go b/server/server/assets/texture/type.go similarity index 100% rename from server/server/texture/type.go rename to server/server/assets/texture/type.go diff --git a/server/server/video/handle_video.go b/server/server/assets/video/handle_video.go similarity index 100% rename from server/server/video/handle_video.go rename to server/server/assets/video/handle_video.go diff --git a/server/server/video/handle_video_test.go b/server/server/assets/video/handle_video_test.go similarity index 100% rename from server/server/video/handle_video_test.go rename to server/server/assets/video/handle_video_test.go diff --git a/server/server/video/model.go b/server/server/assets/video/model.go similarity index 100% rename from server/server/video/model.go rename to server/server/assets/video/model.go