TeaSpeak/TeaSpeak-Client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some FT stuff

Browse Source
This commit is contained in:
WolverinDEV 2019-10-26 01:42:51 +02:00
parent 55f3f7656a
commit 53d3814f92
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/renderer/connection/FileTransfer.ts
View File

@ -113,7 +113,7 @@ namespace _transfer {
if(data.size != this.transfer_key.total_size) if(data.size != this.transfer_key.total_size)
throw "invalid size"; throw "invalid size";
throw "files arent yet supported"; buffer = native.ft.upload_transfer_object_from_file(data.path, data.name);
} else if(typeof(data) === "string") { } else if(typeof(data) === "string") {
if(data.length != this.transfer_key.total_size) if(data.length != this.transfer_key.total_size)
throw "invalid size"; throw "invalid size";

11
native/serverconnection/src/connection/ft/FileTransferObject.cpp
View File

@ -178,7 +178,16 @@ void TransferObjectWrap::do_wrap(v8::Local<v8::Object> object) {
} }
#endif #endif
TransferFileSource::TransferFileSource(std::string path, std::string name) : _path{std::move(path)}, _name{std::move(name)} { } TransferFileSource::TransferFileSource(std::string path, std::string name) : _path{std::move(path)}, _name{std::move(name)} {
if(!this->_path.empty()) {
if(this->_path.back() == '/')
this->_path.pop_back();
#ifdef WIN32
if(this->_path.back() == '\\')
this->_path.pop_back();
#endif
}
}
#ifdef WIN32 #ifdef WIN32
#define u8path path #define u8path path