tesses50/tesses-framework
1
0
Fork 0
mirror of https://onedev.site.tesses.net/tesses-framework synced 2026-03-26 04:30:21 +00:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Added portable app support

Browse Source
This commit is contained in:
Mike Nolan
2026-01-11 17:06:01 -06:00
parent 7dc4ad9b08
commit 2f5271f7c3
13 changed files with 760 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Filesystem/TempFS.cpp
View File

@@ -210,7 +210,13 @@ namespace Tesses::Framework::Filesystem {
}
TempFS::~TempFS()
{
Close();
VFSPath p;
p.relative = false;
p.path.push_back(this->tmp_str);
this->vfs = nullptr;
if(this->deleteOnDestroy && this->parent->DirectoryExists(p))
this->parent->DeleteDirectoryRecurse(p);
}
}

36
src/Platform/Environment.cpp
View File

@@ -22,15 +22,23 @@ namespace Tesses::Framework::Platform::Environment
#else
const char EnvPathSeperator=':';
#endif
PortableAppConfig portable_config;
namespace SpecialFolders
{
VFSPath GetTemp()
{
if(portable_config.temp)
return *portable_config.temp;
return std::filesystem::temp_directory_path().string();
}
VFSPath GetHomeFolder()
{
if(portable_config.user)
return *portable_config.user;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getHomeDir();
#elif defined(__EMSCRIPTEN__)
@@ -43,6 +51,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetDownloads()
{
if(portable_config.downloads)
return *portable_config.downloads;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getDownloadFolder();
#elif defined(__ANDROID__)
@@ -53,6 +64,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetMusic()
{
if(portable_config.music)
return *portable_config.music;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getMusicFolder();
#elif defined(__ANDROID__)
@@ -63,6 +77,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetPictures()
{
if(portable_config.pictures)
return *portable_config.pictures;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getPicturesFolder();
#elif defined(__ANDROID__)
@@ -73,6 +90,8 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetVideos()
{
if(portable_config.videos)
return *portable_config.videos;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getVideoFolder();
#elif defined(__ANDROID__)
@@ -83,6 +102,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetDocuments()
{
if(portable_config.documents)
return *portable_config.documents;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getDocumentsFolder();
#elif defined(__ANDROID__)
@@ -93,6 +115,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetConfig()
{
if(portable_config.config)
return *portable_config.config;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getConfigHome();
#else
@@ -101,6 +126,8 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetDesktop()
{
if(portable_config.desktop)
return *portable_config.desktop;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getDesktopFolder();
#else
@@ -109,6 +136,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetState()
{
if(portable_config.state)
return *portable_config.state;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getStateDir();
#else
@@ -117,6 +147,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetCache()
{
if(portable_config.cache)
return *portable_config.cache;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getCacheDir();
#else
@@ -125,6 +158,9 @@ namespace Tesses::Framework::Platform::Environment
}
VFSPath GetData()
{
if(portable_config.data)
return *portable_config.data;
#if defined(TESSESFRAMEWORK_ENABLE_PLATFORMFOLDERS) && !defined(SAGO_DISABLE)
return sago::getDataHome();
#else

7
src/Streams/FileStream.cpp
View File

@@ -104,7 +104,12 @@ namespace Tesses::Framework::Streams
}
FileStream::~FileStream()
{
Close();
if(!f) return;
if(this->owns)
{
fclose(this->f);
f=NULL;
}
}
void FileStream::Close()
{

12
src/Streams/NetworkStream.cpp
View File

@@ -538,7 +538,10 @@ namespace Tesses::Framework::Streams {
TcpServer::~TcpServer()
{
if(this->valid && this->owns)
Close();
{
NETWORK_CLOSE(this->sock);
}
this->valid=false;
}
void TcpServer::Close()
{
@@ -818,7 +821,9 @@ namespace Tesses::Framework::Streams {
}
NetworkStream::~NetworkStream()
{
Close();
if(this->owns && this->success)
NETWORK_CLOSE(this->sock);
this->success=0;
}
void NetworkStream::SetNoDelay(bool noDelay)
{
@@ -945,5 +950,8 @@ uint16_t TcpServer::GetPort()
{
return 0;
}
bool NetworkStream::DataAvailable(int to){
return false;
}
}
#endif

8
src/Streams/PtyStream.cpp
View File

@@ -126,7 +126,13 @@ namespace Tesses::Framework::Streams {
}
PtyStream::~PtyStream()
{
Close();
if(this->eos) return;
this->eos=true;
#if !defined(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS)
close(this->socket);
kill((pid_t)this->pid,SIGHUP);
#endif
}
void PtyStream::Close()
{

383
src/TF_Init.cpp
View File

@@ -2,6 +2,9 @@
#include "TessesFramework/Streams/NetworkStream.hpp"
#include "TessesFramework/Lazy.hpp"
#include "TessesFramework/Filesystem/LocalFS.hpp"
#include "TessesFramework/Platform/Environment.hpp"
#include "TessesFramework/Filesystem/FSHelpers.hpp"
#include "TessesFramework/Serialization/Json.hpp"
#include <atomic>
#include <csignal>
#include <iostream>
@@ -329,10 +332,390 @@ if (iResult != 0) {
}
std::optional<std::string> _argv0=std::nullopt;
void TF_AllowPortable(std::string argv0)
{
using namespace Tesses::Framework::Serialization::Json;
using namespace Tesses::Framework::Platform::Environment;
using namespace Tesses::Framework::Filesystem;
_argv0 = argv0;
VFSPath path(argv0);
auto realPath=path.MakeAbsolute();
auto dir = realPath.GetParent();
auto portable=dir / "portable.json";
if(LocalFS->FileExists(portable))
{
std::string portable_str;
Helpers::ReadAllText(LocalFS,portable, portable_str);
auto jsonObj=Json::Decode(portable_str);
JObject dict;
JObject dict2;
if(TryGetJToken(jsonObj,dict) && dict.TryGetValueAsType("portable_data",dict2))
{
if(dict.TryGetValueAsType("portable_type", portable_str))
{
if(portable_str == "PortableApps.com")
{
//do the special stuffs for PortableApps.com based apps
auto paf_documents = GetVariable("PortableApps.comDocuments");
auto paf_music = GetVariable("PortableApps.comMusic");
auto paf_pictures = GetVariable("PortableApps.comPictures");
auto paf_videos = GetVariable("PortableApps.comVideos");
auto paf_data = GetVariable("PAL:DataDir");
bool bV=false;
if(!dict2.TryGetValueAsType("system_documents",bV) || !bV)
{
if(paf_documents)
{
portable_config.documents = LocalFS->SystemToVFSPath(*paf_documents);
}
}
if(!dict2.TryGetValueAsType("system_pictures",bV) || !bV)
{
if(paf_pictures)
{
portable_config.pictures = LocalFS->SystemToVFSPath(*paf_pictures);
}
}
if(!dict2.TryGetValueAsType("system_videos",bV) || !bV)
{
if(paf_videos)
{
portable_config.videos = LocalFS->SystemToVFSPath(*paf_videos);
}
}
if(!dict2.TryGetValueAsType("system_music",bV) || !bV)
{
if(paf_music)
{
portable_config.music = LocalFS->SystemToVFSPath(*paf_music);
}
}
if(dict2.TryGetValueAsType("user",portable_str))
{
if(portable_str == "app")
{
if(paf_data)
portable_config.user = LocalFS->SystemToVFSPath(*paf_data) / "TF_User";
}
else if(portable_str == "documents")
{
if(paf_documents)
portable_config.user = LocalFS->SystemToVFSPath(*paf_documents) / "TF_User";
}
}
if(dict2.TryGetValueAsType("desktop",portable_str))
{
if(portable_str == "tf_user")
{
if(portable_config.user)
portable_config.desktop = *(portable_config.user) / "Desktop";
}
else if(portable_str == "documents")
{
if(paf_documents)
portable_config.desktop = LocalFS->SystemToVFSPath(*paf_documents) / "Desktop";
}
}
if(dict2.TryGetValueAsType("downloads",portable_str))
{
if(portable_str == "tf_user")
{
if(portable_config.user)
portable_config.downloads = *(portable_config.user) / "Downloads";
}
else if(portable_str == "documents")
{
if(paf_documents)
portable_config.downloads = LocalFS->SystemToVFSPath(*paf_documents) / "Downloads";
}
}
if(!dict2.TryGetValueAsType("system_config",bV) || !bV)
{
if(portable_config.user)
portable_config.config = *(portable_config.user) / "Config";
}
if(!dict2.TryGetValueAsType("system_cache",bV) || !bV)
{
if(portable_config.user)
portable_config.cache = *(portable_config.user) / "Cache";
}
if(!dict2.TryGetValueAsType("system_data",bV) || !bV)
{
if(portable_config.user)
portable_config.data = *(portable_config.user) / "Data";
}
if(!dict2.TryGetValueAsType("system_state",bV) || !bV)
{
if(portable_config.user)
portable_config.state = *(portable_config.user) / "State";
}
if(!dict2.TryGetValueAsType("system_temp",bV) || !bV)
{
if(portable_config.user)
portable_config.temp = *(portable_config.user) / "Temp";
}
}
else if(portable_str == "relative")
{
if(dict2.TryGetValueAsType("user",portable_str))
{
if(portable_str != "system")
{
auto userDir = dir / portable_str;
portable_config.user = userDir.CollapseRelativeParents();
}
}
if(dict2.TryGetValueAsType("documents", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.documents = *(portable_config.user) / "Documents";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.documents = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("downloads", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.downloads = *(portable_config.user) / "Downloads";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.downloads = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("desktop", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.desktop = *(portable_config.user) / "Desktop";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.desktop = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("pictures", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.pictures = *(portable_config.user) / "Pictures";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.pictures = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("videos", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.videos = *(portable_config.user) / "Videos";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.videos = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("music", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.music = *(portable_config.user) / "Music";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.music = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("config", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.config = *(portable_config.user) / "Config";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.config = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("cache", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.cache = *(portable_config.user) / "Cache";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.cache = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("data", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.data = *(portable_config.user) / "Data";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.data = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("state", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.state = *(portable_config.user) / "State";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.state = userDir.CollapseRelativeParents();
}
}
}
if(dict2.TryGetValueAsType("temp", portable_str))
{
if(portable_str != "system")
{
if(portable_str == "default")
{
if(portable_config.user)
{
portable_config.temp = *(portable_config.user) / "Temp";
}
}
else
{
auto userDir = dir / portable_str;
portable_config.temp = userDir.CollapseRelativeParents();
}
}
}
}
}
}
}
}
std::optional<std::string> TF_GetCommandName()