SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@526 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2017-07-15 17:52:29 +00:00
parent 69e067e0d2
commit bc65af3b9c
7 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src_main/io/pibasetransfer.cpp
View File

@@ -515,7 +515,7 @@ PIByteArray PIBaseTransfer::build_packet(int id) {
for (int i = 0; i < session[id].size_s(); i++) {
Part fi = session[id][i];
ret << fi;
//piCout << "biuld" << fi;
//piCout << "build" << fi;
ba = buildPacket(fi);
bytes_cur += ba.size();
if (ba.size() != fi.size) piCoutObj << "***error while build packet, wrong part size";

44
src_main/io/pifiletransfer.cpp
View File

@@ -70,13 +70,17 @@ bool PIFileTransfer::send(PIVector<PIFile::FileInfo> entries) {
bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
files_ = files;
PIStringList names;
// piCoutObj << "prepare to send" << files_.size() << "files";
for(int i=0; i<files_.size_s(); i++) {
// files_[i].path = dir.relative(files_[i].path);
if (names.contains(files_[i].path)) {files_.remove(i); i--;}
//piCoutObj << "prepare to send" << files_.size() << "files";
for (int i = 0; i < files_.size_s(); i++) {
//files_[i].path = dir.relative(files_[i].path);
if (names.contains(files_[i].path)) {
files_.remove(i);
--i;
}
else names << files_[i].path;
if (files_[i].isDir()) files_[i].size = 0;
// piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name();
if (files_[i].isDir())
files_[i].size = 0;
//piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name();
}
randomize();
step_mutex.lock();
@@ -97,8 +101,8 @@ bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
step_mutex.lock();
pftheader.step = pft_Data;
PIVector<Part> pts;
for (int i=0; i<files_.size_s(); i++) {
pts << Part(i+1, files_[i].size);
for (int i = 0; i < files_.size_s(); i++) {
pts << Part(i + 1, files_[i].size);
}
buildSession(pts);
step_mutex.unlock();
@@ -120,7 +124,7 @@ void PIFileTransfer::processFile(int id, ullong start, PIByteArray & data) {
if (fi.isDir()) {
//piCoutObj << "make dir" << fi.entry.path;
if (!PIDir::make(path)) {
cur_file_string = "ERROR! while create directory " + path;
cur_file_string = "Error: While create directory \"" + path + "\"";
piCoutObj << cur_file_string;
stopReceive();
return;
@@ -132,7 +136,7 @@ void PIFileTransfer::processFile(int id, ullong start, PIByteArray & data) {
work_file.close();
//piCout << "new file" << path << work_file.path() << work_file.isOpened();
if (!work_file.open(path, PIIODevice::ReadWrite)) {
cur_file_string = "ERROR! while open file " + path;
cur_file_string = "Error: While open file \"" + path + "\"";
piCoutObj << cur_file_string;
stopReceive();
return;
@@ -161,7 +165,7 @@ void PIFileTransfer::processFile(int id, ullong start, PIByteArray & data) {
work_file.seek(start);
int rs = work_file.write(data.data(), data.size());
if (rs != data.size_s()) {
cur_file_string = "ERROR! while write file " + fi.path + " (must " + PIString::fromNumber(data.size()) + ", but write " + PIString::fromNumber(rs) + ")";
cur_file_string = "Error: While write file \"" + fi.path + "\" (must " + PIString::fromNumber(data.size()) + ", but write " + PIString::fromNumber(rs) + ")";
piCoutObj << cur_file_string;
stopReceive();
return;
@@ -183,15 +187,15 @@ PIByteArray PIFileTransfer::buildPacket(Part p) {
memcpy(ba.data(), desc.data(p.start), p.size);
return ba;
case pft_Data:
// piCout << "send data" << p.id << files_.size();
//piCout << "send data" << p.id << files_.size();
PIFile::FileInfo fi = files_[p.id-1];
if (fi.isFile()) {
// piCout << "send file" << fi.name() << fi.size;
//piCout << "send file" << fi.name() << fi.size;
PIString path = fi.path;
if (work_file.path() != path || !work_file.isOpened()) {
if (!work_file.open(path, PIIODevice::ReadOnly)) {
break_ = true;
cur_file_string = "ERROR! while open file " + fi.path;
cur_file_string = "Error: While open file \"" + fi.path + "\"";
piCoutObj << cur_file_string;
stopSend();
return PIByteArray();
@@ -202,16 +206,16 @@ PIByteArray PIFileTransfer::buildPacket(Part p) {
int rs = work_file.read(ba.data(), ba.size());
if ((llong)rs != (llong)p.size) {
break_ = true;
cur_file_string = "ERROR! while read file " + fi.path + " (must " + PIString::fromNumber(p.size) + ", but read " + PIString::fromNumber(rs) + ")";
cur_file_string = "Error: While read file \"" + fi.path + "\" (must " + PIString::fromNumber(p.size) + ", but read " + PIString::fromNumber(rs) + ")";
piCoutObj << cur_file_string;
stopSend();
return PIByteArray();
}
}
// if (fi.isDir()) {
// piCout << "create dir" << fi.path;
// dir.make(fi.path);
// }
//if (fi.isDir()) {
// piCout << "create dir" << fi.path;
// dir.make(fi.path);
//}
cur_file_string = fi.path;
bytes_file_all = fi.size;
bytes_file_cur = p.start;
@@ -230,7 +234,7 @@ void PIFileTransfer::receivePart(PIBaseTransfer::Part fi, PIByteArray ba, PIByte
StepType st = (StepType)h.step;
pftheader.step = st;
if (!h.check_sig()) {
cur_file_string = "ERROR check signature: File Transfer incompatable or invalid version!";
cur_file_string = "Error: Check signature: File Transfer incompatable or invalid version!";
piCoutObj << cur_file_string;
stopReceive();
return;

11
src_main/io/pifiletransfer.h
View File

@@ -28,7 +28,7 @@
#define __PIFILETRANSFER_VERSION 2
class PIFileTransfer : public PIBaseTransfer
class PIFileTransfer: public PIBaseTransfer
{
PIOBJECT_SUBCLASS(PIFileTransfer, PIBaseTransfer)
public:
@@ -36,8 +36,9 @@ public:
~PIFileTransfer();
enum StepType {pft_None, pft_Description, pft_Data};
struct PFTFileInfo : public PIFile::FileInfo {
PFTFileInfo(const PIFile::FileInfo &fi = PIFile::FileInfo()) : PIFile::FileInfo(fi) {}
struct PFTFileInfo: public PIFile::FileInfo {
PFTFileInfo(const PIFile::FileInfo &fi = PIFile::FileInfo()): PIFile::FileInfo(fi) {}
PIString dest_path;
};
@@ -112,9 +113,9 @@ inline PIByteArray & operator <<(PIByteArray & s, const PIFileTransfer::PFTHeade
inline PIByteArray & operator >>(PIByteArray & s, PIFileTransfer::PFTHeader & v) {s >> v.raw_sig >> v.step >> v.session_id; return s;}
inline PIByteArray & operator <<(PIByteArray & s, const PIFileTransfer::PFTFileInfo & v) {s << v.dest_path << v.size << v.time_access << v.time_modification <<
(int)v.flags << v.id_user << v.id_group << v.perm_user.raw << v.perm_group.raw << v.perm_other.raw; return s;}
v.flags << v.id_user << v.id_group << v.perm_user.raw << v.perm_group.raw << v.perm_other.raw; return s;}
inline PIByteArray & operator >>(PIByteArray & s, PIFileTransfer::PFTFileInfo & v) {s >> v.dest_path >> v.size >> v.time_access >> v.time_modification >>
*(int*)(&(v.flags)) >> v.id_user >> v.id_group >> v.perm_user.raw >> v.perm_group.raw >> v.perm_other.raw; return s;}
v.flags >> v.id_user >> v.id_group >> v.perm_user.raw >> v.perm_group.raw >> v.perm_other.raw; return s;}
inline PICout operator <<(PICout s, const PIFileTransfer::PFTFileInfo & v) {
s.setControl(0, true);

2
src_main/io/piiodevice.cpp
View File

@@ -212,6 +212,8 @@ void PIIODevice::terminate() {
void PIIODevice::begin() {
//cout << " begin\n";
if (threadedReadBufferSize() == 0)
piCoutObj << "Warning: threadedReadBufferSize() == 0, read may be useless!";
thread_started_ = false;
if (!opened_) {
if (open()) {