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@430 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-20 11:01:32 +00:00
parent eacda7880e
commit e493a6b146
5 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main.cpp
View File

@@ -39,17 +39,18 @@ int asize(ssize_t s, size_t pid_rsize) {
while (s_ >> t) ++t; while (s_ >> t) ++t;
return (1 << t); return (1 << t);
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
PIMutex m; // PIMutex m;
m.lock(); // m.lock();
m.unlock(); // m.unlock();
m.lock(); // m.lock();
m.unlock(); // m.unlock();
m.lock();
// m.lock(); // m.lock();
// m.lock(); // m.lock();
// m.lock(); // m.lock();
piCout << "finish" << m.isLocked(); // m.lock();
// piCout << "finish" << m.isLocked();
// PIDiagnostics d; // PIDiagnostics d;
// piCout << d.receiveBytesPerSec(); // piCout << d.receiveBytesPerSec();

4
src_main/io/pidir.cpp
View File

@@ -195,11 +195,11 @@ bool PIDir::make(bool withParents) {
tp = separator; tp = separator;
if (!is_abs) tp.push_front('.'); if (!is_abs) tp.push_front('.');
} }
piCout << tp; //piCout << tp;
if (isExists(tp)) { if (isExists(tp)) {
for (int j = i + 1; j <= l.size_s(); ++j) { for (int j = i + 1; j <= l.size_s(); ++j) {
tp = PIStringList(l).remove(j, l.size_s() - j).join(separator); tp = PIStringList(l).remove(j, l.size_s() - j).join(separator);
piCout << tp; //piCout << tp;
if (makeDir(tp)) continue; if (makeDir(tp)) continue;
else return false; else return false;
} }

2
src_main/io/pifiletransfer.cpp
View File

@@ -296,7 +296,7 @@ void PIFileTransfer::receive_finished(bool ok) {
} }
if (!ok || !user_ok) { if (!ok || !user_ok) {
pftheader.session_id--; pftheader.session_id--;
piCoutObj << "file cancel"; piCoutObj << "receive aborted";
receiveFilesFinished(false); receiveFilesFinished(false);
started_ = false; started_ = false;
} else resume(); } else resume();

7
utils/system_daemon/daemon.cpp
View File

@@ -247,7 +247,10 @@ void Daemon::TileFileProgress::tileEvent(PIScreenTile * t, TileEvent e) {
ft->resume(); ft->resume();
} }
break; break;
case 1: ft->stop(); close(); break; case 1:
ft->stop();
close();
break;
}; };
} }
} }
@@ -695,7 +698,7 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
fm.updateRemoteDir(); fm.updateRemoteDir();
return; return;
} }
piCoutObj << "file transfer with" << p_name << (ok ? "success" : "failure"); piCout << "file transfer with" << p_name << (ok ? "success" : "failure");
if (tile_file_progress->conn_name != p_name) return; if (tile_file_progress->conn_name != p_name) return;
tile_file_progress->close(ok); tile_file_progress->close(ok);
// if (ok) { // if (ok) {

1
utils/system_daemon/main.cpp
View File

@@ -352,6 +352,7 @@ int main(int argc, char * argv[]) {
if (sapp) CONNECTU(sapp, messageReceived, menu, messageFromApp) if (sapp) CONNECTU(sapp, messageReceived, menu, messageFromApp)
screen->start(); screen->start();
screen->waitForFinish(); screen->waitForFinish();
screen->stop(true);
delete menu; delete menu;
delete daemon; delete daemon;
delete screen; delete screen;