From 247ad3309a57078f1632ae0bb3477991075ce7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=91=E8=B4=A8?= Date: Wed, 6 Dec 2023 17:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E4=BB=A3=E7=A0=81=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + OlivOS/__init__.py | 112 +++++++++--------- .../biliLive}/biliLiveLinkServerAPI.py | 0 OlivOS/{ => adapter/biliLive}/biliLiveSDK.py | 0 .../dingtalk}/dingtalkLinkServerAPI.py | 0 OlivOS/{ => adapter/dingtalk}/dingtalkSDK.py | 0 .../discord}/discordLinkServerAPI.py | 0 OlivOS/{ => adapter/discord}/discordSDK.py | 0 OlivOS/{ => adapter/dodo}/dodoLinkSDK.py | 0 .../{ => adapter/dodo}/dodoLinkServerAPI.py | 0 .../{ => adapter/dodo}/dodoPollServerAPI.py | 0 OlivOS/{ => adapter/dodo}/dodoSDK.py | 0 OlivOS/{ => adapter/dodo}/dodobotEASDK.py | 0 .../{ => adapter/dodo}/dodobotEAServerAPI.py | 0 OlivOS/{ => adapter/dodo}/dodobotEATXAPI.py | 0 .../fanbook}/fanbookPollServerAPI.py | 0 OlivOS/{ => adapter/fanbook}/fanbookSDK.py | 0 .../hackChat}/hackChatLinkServerAPI.py | 2 - OlivOS/{ => adapter/hackChat}/hackChatSDK.py | 0 .../kaiheila}/kaiheilaLinkServerAPI.py | 0 OlivOS/{ => adapter/kaiheila}/kaiheilaSDK.py | 0 .../mhyVila}/mhyVilaLinkServerAPI.py | 0 OlivOS/{ => adapter/mhyVila}/mhyVilaSDK.py | 0 .../{ => adapter/onebotV11}/flaskServerAPI.py | 0 OlivOS/{ => adapter/onebotV11}/onebotSDK.py | 0 .../onebotV12}/onebotV12LinkServerAPI.py | 0 .../{ => adapter/onebotV12}/onebotV12SDK.py | 0 .../qqGuild}/qqGuildLinkServerAPI.py | 0 OlivOS/{ => adapter/qqGuild}/qqGuildSDK.py | 0 .../qqGuild}/qqGuildv2LinkServerAPI.py | 0 OlivOS/{ => adapter/qqGuild}/qqGuildv2SDK.py | 0 .../{ => adapter/red}/qqRedLinkServerAPI.py | 0 OlivOS/{ => adapter/red}/qqRedSDK.py | 0 .../telegram}/telegramPollServerAPI.py | 0 OlivOS/{ => adapter/telegram}/telegramSDK.py | 0 .../virtualTerminalLinkServerAPI.py | 0 .../virtualTerminal}/virtualTerminalSDK.py | 0 OlivOS/{ => core/L10N}/L10NAPI.py | 0 OlivOS/{ => core/L10N}/L10NDataAPI.py | 0 OlivOS/{ => core/boot}/bootAPI.py | 0 OlivOS/{ => core/boot}/bootDataAPI.py | 0 OlivOS/{ => core/core}/API.py | 0 OlivOS/{ => core/core}/accountAPI.py | 0 OlivOS/{ => core/core}/contentAPI.py | 0 OlivOS/{ => core/core}/diagnoseAPI.py | 0 OlivOS/{ => core/core}/messageAPI.py | 0 OlivOS/{ => core/core}/metadataAPI.py | 0 OlivOS/{ => core/core}/pluginAPI.py | 0 OlivOS/{ => core/info}/infoAPI.py | 4 +- OlivOS/{ => core/inlineData}/data.py | 0 OlivOS/{ => core/web}/updateAPI.py | 0 OlivOS/{ => core/web}/webTool.py | 0 OlivOS/{ => libBooter}/libCWCBEXEModelAPI.py | 0 OlivOS/{ => libBooter}/libEXEModelAPI.py | 0 OlivOS/{ => libBooter}/libWQEXEModelAPI.py | 0 OlivOS/{ => nativeGUI}/multiLoginUIAPI.py | 0 OlivOS/{ => nativeGUI}/nativeWinUIAPI.py | 0 OlivOS/{ => nativeGUI}/webviewUIAPI.py | 0 58 files changed, 59 insertions(+), 60 deletions(-) create mode 100644 .gitignore rename OlivOS/{ => adapter/biliLive}/biliLiveLinkServerAPI.py (100%) rename OlivOS/{ => adapter/biliLive}/biliLiveSDK.py (100%) rename OlivOS/{ => adapter/dingtalk}/dingtalkLinkServerAPI.py (100%) rename OlivOS/{ => adapter/dingtalk}/dingtalkSDK.py (100%) rename OlivOS/{ => adapter/discord}/discordLinkServerAPI.py (100%) rename OlivOS/{ => adapter/discord}/discordSDK.py (100%) rename OlivOS/{ => adapter/dodo}/dodoLinkSDK.py (100%) rename OlivOS/{ => adapter/dodo}/dodoLinkServerAPI.py (100%) rename OlivOS/{ => adapter/dodo}/dodoPollServerAPI.py (100%) rename OlivOS/{ => adapter/dodo}/dodoSDK.py (100%) rename OlivOS/{ => adapter/dodo}/dodobotEASDK.py (100%) rename OlivOS/{ => adapter/dodo}/dodobotEAServerAPI.py (100%) rename OlivOS/{ => adapter/dodo}/dodobotEATXAPI.py (100%) rename OlivOS/{ => adapter/fanbook}/fanbookPollServerAPI.py (100%) rename OlivOS/{ => adapter/fanbook}/fanbookSDK.py (100%) rename OlivOS/{ => adapter/hackChat}/hackChatLinkServerAPI.py (98%) rename OlivOS/{ => adapter/hackChat}/hackChatSDK.py (100%) rename OlivOS/{ => adapter/kaiheila}/kaiheilaLinkServerAPI.py (100%) rename OlivOS/{ => adapter/kaiheila}/kaiheilaSDK.py (100%) rename OlivOS/{ => adapter/mhyVila}/mhyVilaLinkServerAPI.py (100%) rename OlivOS/{ => adapter/mhyVila}/mhyVilaSDK.py (100%) rename OlivOS/{ => adapter/onebotV11}/flaskServerAPI.py (100%) rename OlivOS/{ => adapter/onebotV11}/onebotSDK.py (100%) rename OlivOS/{ => adapter/onebotV12}/onebotV12LinkServerAPI.py (100%) rename OlivOS/{ => adapter/onebotV12}/onebotV12SDK.py (100%) rename OlivOS/{ => adapter/qqGuild}/qqGuildLinkServerAPI.py (100%) rename OlivOS/{ => adapter/qqGuild}/qqGuildSDK.py (100%) rename OlivOS/{ => adapter/qqGuild}/qqGuildv2LinkServerAPI.py (100%) rename OlivOS/{ => adapter/qqGuild}/qqGuildv2SDK.py (100%) rename OlivOS/{ => adapter/red}/qqRedLinkServerAPI.py (100%) rename OlivOS/{ => adapter/red}/qqRedSDK.py (100%) rename OlivOS/{ => adapter/telegram}/telegramPollServerAPI.py (100%) rename OlivOS/{ => adapter/telegram}/telegramSDK.py (100%) rename OlivOS/{ => adapter/virtualTerminal}/virtualTerminalLinkServerAPI.py (100%) rename OlivOS/{ => adapter/virtualTerminal}/virtualTerminalSDK.py (100%) rename OlivOS/{ => core/L10N}/L10NAPI.py (100%) rename OlivOS/{ => core/L10N}/L10NDataAPI.py (100%) rename OlivOS/{ => core/boot}/bootAPI.py (100%) rename OlivOS/{ => core/boot}/bootDataAPI.py (100%) rename OlivOS/{ => core/core}/API.py (100%) rename OlivOS/{ => core/core}/accountAPI.py (100%) rename OlivOS/{ => core/core}/contentAPI.py (100%) rename OlivOS/{ => core/core}/diagnoseAPI.py (100%) rename OlivOS/{ => core/core}/messageAPI.py (100%) rename OlivOS/{ => core/core}/metadataAPI.py (100%) rename OlivOS/{ => core/core}/pluginAPI.py (100%) rename OlivOS/{ => core/info}/infoAPI.py (96%) rename OlivOS/{ => core/inlineData}/data.py (100%) rename OlivOS/{ => core/web}/updateAPI.py (100%) rename OlivOS/{ => core/web}/webTool.py (100%) rename OlivOS/{ => libBooter}/libCWCBEXEModelAPI.py (100%) rename OlivOS/{ => libBooter}/libEXEModelAPI.py (100%) rename OlivOS/{ => libBooter}/libWQEXEModelAPI.py (100%) rename OlivOS/{ => nativeGUI}/multiLoginUIAPI.py (100%) rename OlivOS/{ => nativeGUI}/nativeWinUIAPI.py (100%) rename OlivOS/{ => nativeGUI}/webviewUIAPI.py (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..0041fb85 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__ diff --git a/OlivOS/__init__.py b/OlivOS/__init__.py index 86b36715..05141349 100644 --- a/OlivOS/__init__.py +++ b/OlivOS/__init__.py @@ -18,63 +18,63 @@ import platform -from . import infoAPI -from . import L10NAPI -from . import L10NDataAPI -from . import bootAPI -from . import bootDataAPI -from . import data +from .core.info import infoAPI +from .core.L10N import L10NAPI +from .core.L10N import L10NDataAPI +from .core.boot import bootAPI +from .core.boot import bootDataAPI +from .core.inlineData import data from . import hook -from . import contentAPI -from . import messageAPI -from . import metadataAPI -from . import API +from .core.core import contentAPI +from .core.core import messageAPI +from .core.core import metadataAPI +from .core.core import API from . import thirdPartyModule -from . import accountAPI -from . import diagnoseAPI -from . import flaskServerAPI -from . import onebotV12SDK -from . import onebotV12LinkServerAPI -from . import pluginAPI -from . import onebotSDK -from . import virtualTerminalSDK -from . import virtualTerminalLinkServerAPI -from . import qqGuildSDK -from . import qqGuildLinkServerAPI -from . import qqGuildv2SDK -from . import qqGuildv2LinkServerAPI -from . import qqRedSDK -from . import qqRedLinkServerAPI -from . import telegramSDK -from . import telegramPollServerAPI -from . import discordSDK -from . import discordLinkServerAPI -from . import hackChatSDK -from . import hackChatLinkServerAPI -from . import dodobotEAServerAPI -from . import dodobotEATXAPI -from . import dodobotEASDK -from . import dodoSDK -from . import dodoPollServerAPI -from . import dodoLinkSDK -from . import dodoLinkServerAPI -from . import dingtalkSDK -from . import dingtalkLinkServerAPI -from . import fanbookSDK -from . import fanbookPollServerAPI -from . import kaiheilaSDK -from . import kaiheilaLinkServerAPI -from . import mhyVilaSDK -from . import mhyVilaLinkServerAPI -from . import biliLiveSDK -from . import biliLiveLinkServerAPI -from . import updateAPI -from . import webTool +from .core.core import accountAPI +from .core.core import diagnoseAPI +from .adapter.onebotV11 import flaskServerAPI +from .adapter.onebotV12 import onebotV12SDK +from .adapter.onebotV12 import onebotV12LinkServerAPI +from .core.core import pluginAPI +from .adapter.onebotV11 import onebotSDK +from .adapter.virtualTerminal import virtualTerminalSDK +from .adapter.virtualTerminal import virtualTerminalLinkServerAPI +from .adapter.qqGuild import qqGuildSDK +from .adapter.qqGuild import qqGuildLinkServerAPI +from .adapter.qqGuild import qqGuildv2SDK +from .adapter.qqGuild import qqGuildv2LinkServerAPI +from .adapter.red import qqRedSDK +from .adapter.red import qqRedLinkServerAPI +from .adapter.telegram import telegramSDK +from .adapter.telegram import telegramPollServerAPI +from .adapter.discord import discordSDK +from .adapter.discord import discordLinkServerAPI +from .adapter.hackChat import hackChatSDK +from .adapter.hackChat import hackChatLinkServerAPI +from .adapter.dodo import dodobotEAServerAPI +from .adapter.dodo import dodobotEATXAPI +from .adapter.dodo import dodobotEASDK +from .adapter.dodo import dodoSDK +from .adapter.dodo import dodoPollServerAPI +from .adapter.dodo import dodoLinkSDK +from .adapter.dodo import dodoLinkServerAPI +from .adapter.dingtalk import dingtalkSDK +from .adapter.dingtalk import dingtalkLinkServerAPI +from .adapter.fanbook import fanbookSDK +from .adapter.fanbook import fanbookPollServerAPI +from .adapter.kaiheila import kaiheilaSDK +from .adapter.kaiheila import kaiheilaLinkServerAPI +from .adapter.mhyVila import mhyVilaSDK +from .adapter.mhyVila import mhyVilaLinkServerAPI +from .adapter.biliLive import biliLiveSDK +from .adapter.biliLive import biliLiveLinkServerAPI +from .core.web import updateAPI +from .core.web import webTool if platform.system() == 'Windows': - from . import multiLoginUIAPI - from . import libEXEModelAPI - from . import libWQEXEModelAPI - from . import libCWCBEXEModelAPI - from . import nativeWinUIAPI - from . import webviewUIAPI + from .nativeGUI import multiLoginUIAPI + from .libBooter import libEXEModelAPI + from .libBooter import libWQEXEModelAPI + from .libBooter import libCWCBEXEModelAPI + from .nativeGUI import nativeWinUIAPI + from .nativeGUI import webviewUIAPI from . import userModule diff --git a/OlivOS/biliLiveLinkServerAPI.py b/OlivOS/adapter/biliLive/biliLiveLinkServerAPI.py similarity index 100% rename from OlivOS/biliLiveLinkServerAPI.py rename to OlivOS/adapter/biliLive/biliLiveLinkServerAPI.py diff --git a/OlivOS/biliLiveSDK.py b/OlivOS/adapter/biliLive/biliLiveSDK.py similarity index 100% rename from OlivOS/biliLiveSDK.py rename to OlivOS/adapter/biliLive/biliLiveSDK.py diff --git a/OlivOS/dingtalkLinkServerAPI.py b/OlivOS/adapter/dingtalk/dingtalkLinkServerAPI.py similarity index 100% rename from OlivOS/dingtalkLinkServerAPI.py rename to OlivOS/adapter/dingtalk/dingtalkLinkServerAPI.py diff --git a/OlivOS/dingtalkSDK.py b/OlivOS/adapter/dingtalk/dingtalkSDK.py similarity index 100% rename from OlivOS/dingtalkSDK.py rename to OlivOS/adapter/dingtalk/dingtalkSDK.py diff --git a/OlivOS/discordLinkServerAPI.py b/OlivOS/adapter/discord/discordLinkServerAPI.py similarity index 100% rename from OlivOS/discordLinkServerAPI.py rename to OlivOS/adapter/discord/discordLinkServerAPI.py diff --git a/OlivOS/discordSDK.py b/OlivOS/adapter/discord/discordSDK.py similarity index 100% rename from OlivOS/discordSDK.py rename to OlivOS/adapter/discord/discordSDK.py diff --git a/OlivOS/dodoLinkSDK.py b/OlivOS/adapter/dodo/dodoLinkSDK.py similarity index 100% rename from OlivOS/dodoLinkSDK.py rename to OlivOS/adapter/dodo/dodoLinkSDK.py diff --git a/OlivOS/dodoLinkServerAPI.py b/OlivOS/adapter/dodo/dodoLinkServerAPI.py similarity index 100% rename from OlivOS/dodoLinkServerAPI.py rename to OlivOS/adapter/dodo/dodoLinkServerAPI.py diff --git a/OlivOS/dodoPollServerAPI.py b/OlivOS/adapter/dodo/dodoPollServerAPI.py similarity index 100% rename from OlivOS/dodoPollServerAPI.py rename to OlivOS/adapter/dodo/dodoPollServerAPI.py diff --git a/OlivOS/dodoSDK.py b/OlivOS/adapter/dodo/dodoSDK.py similarity index 100% rename from OlivOS/dodoSDK.py rename to OlivOS/adapter/dodo/dodoSDK.py diff --git a/OlivOS/dodobotEASDK.py b/OlivOS/adapter/dodo/dodobotEASDK.py similarity index 100% rename from OlivOS/dodobotEASDK.py rename to OlivOS/adapter/dodo/dodobotEASDK.py diff --git a/OlivOS/dodobotEAServerAPI.py b/OlivOS/adapter/dodo/dodobotEAServerAPI.py similarity index 100% rename from OlivOS/dodobotEAServerAPI.py rename to OlivOS/adapter/dodo/dodobotEAServerAPI.py diff --git a/OlivOS/dodobotEATXAPI.py b/OlivOS/adapter/dodo/dodobotEATXAPI.py similarity index 100% rename from OlivOS/dodobotEATXAPI.py rename to OlivOS/adapter/dodo/dodobotEATXAPI.py diff --git a/OlivOS/fanbookPollServerAPI.py b/OlivOS/adapter/fanbook/fanbookPollServerAPI.py similarity index 100% rename from OlivOS/fanbookPollServerAPI.py rename to OlivOS/adapter/fanbook/fanbookPollServerAPI.py diff --git a/OlivOS/fanbookSDK.py b/OlivOS/adapter/fanbook/fanbookSDK.py similarity index 100% rename from OlivOS/fanbookSDK.py rename to OlivOS/adapter/fanbook/fanbookSDK.py diff --git a/OlivOS/hackChatLinkServerAPI.py b/OlivOS/adapter/hackChat/hackChatLinkServerAPI.py similarity index 98% rename from OlivOS/hackChatLinkServerAPI.py rename to OlivOS/adapter/hackChat/hackChatLinkServerAPI.py index 945542a6..a75d1352 100644 --- a/OlivOS/hackChatLinkServerAPI.py +++ b/OlivOS/adapter/hackChat/hackChatLinkServerAPI.py @@ -21,8 +21,6 @@ import threading import OlivOS -from OlivOS import hackChatSDK -from OlivOS.qqGuildSDK import PAYLOAD modelName = 'hackChatLinkServerAPI' diff --git a/OlivOS/hackChatSDK.py b/OlivOS/adapter/hackChat/hackChatSDK.py similarity index 100% rename from OlivOS/hackChatSDK.py rename to OlivOS/adapter/hackChat/hackChatSDK.py diff --git a/OlivOS/kaiheilaLinkServerAPI.py b/OlivOS/adapter/kaiheila/kaiheilaLinkServerAPI.py similarity index 100% rename from OlivOS/kaiheilaLinkServerAPI.py rename to OlivOS/adapter/kaiheila/kaiheilaLinkServerAPI.py diff --git a/OlivOS/kaiheilaSDK.py b/OlivOS/adapter/kaiheila/kaiheilaSDK.py similarity index 100% rename from OlivOS/kaiheilaSDK.py rename to OlivOS/adapter/kaiheila/kaiheilaSDK.py diff --git a/OlivOS/mhyVilaLinkServerAPI.py b/OlivOS/adapter/mhyVila/mhyVilaLinkServerAPI.py similarity index 100% rename from OlivOS/mhyVilaLinkServerAPI.py rename to OlivOS/adapter/mhyVila/mhyVilaLinkServerAPI.py diff --git a/OlivOS/mhyVilaSDK.py b/OlivOS/adapter/mhyVila/mhyVilaSDK.py similarity index 100% rename from OlivOS/mhyVilaSDK.py rename to OlivOS/adapter/mhyVila/mhyVilaSDK.py diff --git a/OlivOS/flaskServerAPI.py b/OlivOS/adapter/onebotV11/flaskServerAPI.py similarity index 100% rename from OlivOS/flaskServerAPI.py rename to OlivOS/adapter/onebotV11/flaskServerAPI.py diff --git a/OlivOS/onebotSDK.py b/OlivOS/adapter/onebotV11/onebotSDK.py similarity index 100% rename from OlivOS/onebotSDK.py rename to OlivOS/adapter/onebotV11/onebotSDK.py diff --git a/OlivOS/onebotV12LinkServerAPI.py b/OlivOS/adapter/onebotV12/onebotV12LinkServerAPI.py similarity index 100% rename from OlivOS/onebotV12LinkServerAPI.py rename to OlivOS/adapter/onebotV12/onebotV12LinkServerAPI.py diff --git a/OlivOS/onebotV12SDK.py b/OlivOS/adapter/onebotV12/onebotV12SDK.py similarity index 100% rename from OlivOS/onebotV12SDK.py rename to OlivOS/adapter/onebotV12/onebotV12SDK.py diff --git a/OlivOS/qqGuildLinkServerAPI.py b/OlivOS/adapter/qqGuild/qqGuildLinkServerAPI.py similarity index 100% rename from OlivOS/qqGuildLinkServerAPI.py rename to OlivOS/adapter/qqGuild/qqGuildLinkServerAPI.py diff --git a/OlivOS/qqGuildSDK.py b/OlivOS/adapter/qqGuild/qqGuildSDK.py similarity index 100% rename from OlivOS/qqGuildSDK.py rename to OlivOS/adapter/qqGuild/qqGuildSDK.py diff --git a/OlivOS/qqGuildv2LinkServerAPI.py b/OlivOS/adapter/qqGuild/qqGuildv2LinkServerAPI.py similarity index 100% rename from OlivOS/qqGuildv2LinkServerAPI.py rename to OlivOS/adapter/qqGuild/qqGuildv2LinkServerAPI.py diff --git a/OlivOS/qqGuildv2SDK.py b/OlivOS/adapter/qqGuild/qqGuildv2SDK.py similarity index 100% rename from OlivOS/qqGuildv2SDK.py rename to OlivOS/adapter/qqGuild/qqGuildv2SDK.py diff --git a/OlivOS/qqRedLinkServerAPI.py b/OlivOS/adapter/red/qqRedLinkServerAPI.py similarity index 100% rename from OlivOS/qqRedLinkServerAPI.py rename to OlivOS/adapter/red/qqRedLinkServerAPI.py diff --git a/OlivOS/qqRedSDK.py b/OlivOS/adapter/red/qqRedSDK.py similarity index 100% rename from OlivOS/qqRedSDK.py rename to OlivOS/adapter/red/qqRedSDK.py diff --git a/OlivOS/telegramPollServerAPI.py b/OlivOS/adapter/telegram/telegramPollServerAPI.py similarity index 100% rename from OlivOS/telegramPollServerAPI.py rename to OlivOS/adapter/telegram/telegramPollServerAPI.py diff --git a/OlivOS/telegramSDK.py b/OlivOS/adapter/telegram/telegramSDK.py similarity index 100% rename from OlivOS/telegramSDK.py rename to OlivOS/adapter/telegram/telegramSDK.py diff --git a/OlivOS/virtualTerminalLinkServerAPI.py b/OlivOS/adapter/virtualTerminal/virtualTerminalLinkServerAPI.py similarity index 100% rename from OlivOS/virtualTerminalLinkServerAPI.py rename to OlivOS/adapter/virtualTerminal/virtualTerminalLinkServerAPI.py diff --git a/OlivOS/virtualTerminalSDK.py b/OlivOS/adapter/virtualTerminal/virtualTerminalSDK.py similarity index 100% rename from OlivOS/virtualTerminalSDK.py rename to OlivOS/adapter/virtualTerminal/virtualTerminalSDK.py diff --git a/OlivOS/L10NAPI.py b/OlivOS/core/L10N/L10NAPI.py similarity index 100% rename from OlivOS/L10NAPI.py rename to OlivOS/core/L10N/L10NAPI.py diff --git a/OlivOS/L10NDataAPI.py b/OlivOS/core/L10N/L10NDataAPI.py similarity index 100% rename from OlivOS/L10NDataAPI.py rename to OlivOS/core/L10N/L10NDataAPI.py diff --git a/OlivOS/bootAPI.py b/OlivOS/core/boot/bootAPI.py similarity index 100% rename from OlivOS/bootAPI.py rename to OlivOS/core/boot/bootAPI.py diff --git a/OlivOS/bootDataAPI.py b/OlivOS/core/boot/bootDataAPI.py similarity index 100% rename from OlivOS/bootDataAPI.py rename to OlivOS/core/boot/bootDataAPI.py diff --git a/OlivOS/API.py b/OlivOS/core/core/API.py similarity index 100% rename from OlivOS/API.py rename to OlivOS/core/core/API.py diff --git a/OlivOS/accountAPI.py b/OlivOS/core/core/accountAPI.py similarity index 100% rename from OlivOS/accountAPI.py rename to OlivOS/core/core/accountAPI.py diff --git a/OlivOS/contentAPI.py b/OlivOS/core/core/contentAPI.py similarity index 100% rename from OlivOS/contentAPI.py rename to OlivOS/core/core/contentAPI.py diff --git a/OlivOS/diagnoseAPI.py b/OlivOS/core/core/diagnoseAPI.py similarity index 100% rename from OlivOS/diagnoseAPI.py rename to OlivOS/core/core/diagnoseAPI.py diff --git a/OlivOS/messageAPI.py b/OlivOS/core/core/messageAPI.py similarity index 100% rename from OlivOS/messageAPI.py rename to OlivOS/core/core/messageAPI.py diff --git a/OlivOS/metadataAPI.py b/OlivOS/core/core/metadataAPI.py similarity index 100% rename from OlivOS/metadataAPI.py rename to OlivOS/core/core/metadataAPI.py diff --git a/OlivOS/pluginAPI.py b/OlivOS/core/core/pluginAPI.py similarity index 100% rename from OlivOS/pluginAPI.py rename to OlivOS/core/core/pluginAPI.py diff --git a/OlivOS/infoAPI.py b/OlivOS/core/info/infoAPI.py similarity index 96% rename from OlivOS/infoAPI.py rename to OlivOS/core/info/infoAPI.py index e7f4dace..3d629f86 100644 --- a/OlivOS/infoAPI.py +++ b/OlivOS/core/info/infoAPI.py @@ -17,8 +17,8 @@ import OlivOS -OlivOS_Version = '0.11.25' -OlivOS_SVN = 145 +OlivOS_Version = '0.11.26' +OlivOS_SVN = 146 # Compatible <= Plugin[compatible_svn] : Compatible # OldCompatible <= Plugin[compatible_svn] < Compatible : OldCompatible Warn diff --git a/OlivOS/data.py b/OlivOS/core/inlineData/data.py similarity index 100% rename from OlivOS/data.py rename to OlivOS/core/inlineData/data.py diff --git a/OlivOS/updateAPI.py b/OlivOS/core/web/updateAPI.py similarity index 100% rename from OlivOS/updateAPI.py rename to OlivOS/core/web/updateAPI.py diff --git a/OlivOS/webTool.py b/OlivOS/core/web/webTool.py similarity index 100% rename from OlivOS/webTool.py rename to OlivOS/core/web/webTool.py diff --git a/OlivOS/libCWCBEXEModelAPI.py b/OlivOS/libBooter/libCWCBEXEModelAPI.py similarity index 100% rename from OlivOS/libCWCBEXEModelAPI.py rename to OlivOS/libBooter/libCWCBEXEModelAPI.py diff --git a/OlivOS/libEXEModelAPI.py b/OlivOS/libBooter/libEXEModelAPI.py similarity index 100% rename from OlivOS/libEXEModelAPI.py rename to OlivOS/libBooter/libEXEModelAPI.py diff --git a/OlivOS/libWQEXEModelAPI.py b/OlivOS/libBooter/libWQEXEModelAPI.py similarity index 100% rename from OlivOS/libWQEXEModelAPI.py rename to OlivOS/libBooter/libWQEXEModelAPI.py diff --git a/OlivOS/multiLoginUIAPI.py b/OlivOS/nativeGUI/multiLoginUIAPI.py similarity index 100% rename from OlivOS/multiLoginUIAPI.py rename to OlivOS/nativeGUI/multiLoginUIAPI.py diff --git a/OlivOS/nativeWinUIAPI.py b/OlivOS/nativeGUI/nativeWinUIAPI.py similarity index 100% rename from OlivOS/nativeWinUIAPI.py rename to OlivOS/nativeGUI/nativeWinUIAPI.py diff --git a/OlivOS/webviewUIAPI.py b/OlivOS/nativeGUI/webviewUIAPI.py similarity index 100% rename from OlivOS/webviewUIAPI.py rename to OlivOS/nativeGUI/webviewUIAPI.py