BIG deep clean

This commit is contained in:
2020-06-10 13:14:16 +03:00
parent f579718e0b
commit c59579d5d5
222 changed files with 2392 additions and 11600 deletions

View File

@@ -3,7 +3,6 @@ file(GLOB CPPS "*.cpp")
file(GLOB HDRS "*.h")
add_executable(picloud ${CPPS} ${HDRS})
target_link_libraries(picloud pip pip_cloud)
# apple_rpath_patch(picloud)
if (DEFINED LIB)
install(TARGETS picloud DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
else()

View File

@@ -1,6 +1,26 @@
/*
PIP - Platform Independent Primitives
PICloud dispatcher
Andrey Bychkov work.a.b@yandex.ru, Ivan Pelipenko peri4ko@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "pip.h"
#include "picrypt.h"
using namespace PICoutManipulators;
PIString ip = "0.0.0.0";

View File

@@ -8,7 +8,6 @@ set_deploy_property(pip_cmg
make_rc(pip_cmg _RC)
add_executable(pip_cmg "main.cpp" ${_RC})
target_link_libraries(pip_cmg pip)
# apple_rpath_patch(pip_cmg)
if (DEFINED LIB)
install(TARGETS pip_cmg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
else()

View File

@@ -365,52 +365,6 @@ void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool met
f << "#include \"" << out << ".h\"\n";
if (inc_cpp) f << inc_string;
f << "\nusing namespace PICodeInfo;\n\n";
/*
PIString entry, argtype, rettype, args;
piForeachC (PICodeParser::Entity * e, parser.entities) {
if (e->name.find("::") >= 0 || e->name.startsWith("_PI")) continue;
entry.clear();
entry << "\nPIVariant execFunction(" << e->name << " * object, const char * function, const PIVariant & arg0, const PIVariant & arg1, const PIVariant & arg2, const PIVariant & arg3) {\n";
const PIVector<PICodeParser::Member> & fl(e->functions);
bool efunc = true;
piForeachC (PICodeParser::Member & m, fl) {
if (m.name.startsWith("__stat") || m.attributes[PICodeParser::Static]) continue;
//piCout << e->name << m.name << m.visibility;
args.clear();
rettype = m.type;
if (rettype.startsWith("const") && rettype.endsWith("&"))
rettype.cutLeft(5).cutRight(1).trim();
if (rettype.endsWith("&")) continue;
bool aok = true, ret = (m.type != "void");
if (m.arguments_full.size() > 4 || m.visibility != PICodeParser::Public) continue;
for (int i = 0; i < m.arguments_full.size_s(); ++i) {
if (i > 0) args << ", ";
argtype = m.arguments_type[i];
if (argtype.startsWith("const") && argtype.endsWith("&"))
argtype.cutLeft(5).cutRight(1).trim();
if (argtype.endsWith("&")) {
aok = false;
continue;
}
//entry << "(" << m.arguments_type[i] << ")";
//if (parser.isEnum(m.arguments_type[i])) entry << "(int)";
args << "arg" << i << ".toValue<" << argtype << " >()";
}
if (!aok) continue;
efunc = false;
entry << "\tif (strcmp(function, \"" << m.name << "\") == 0) {";
if (ret) entry << "return PIVariant::fromValue<" << rettype << " >(";
entry << "object->" << m.name << "(" << args << ")";
if (ret) entry << ");";
else entry << "; return PIVariant();";
entry << "}\n";
}
if (efunc) continue;
f << entry << "\tPICout(PICoutManipulators::AddNewLine) << \"Can`t find function \\\"\" << function << \"\\\" in "
<< e->type << " \\\"" << e->name << "\\\"!\";\n\treturn PIVariant();\n}\n";
ventities << e;
}
*/
if (meta || enums || getters) {
if (getters) {
@@ -476,16 +430,6 @@ void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool met
f << "#ifndef " << defname << "\n#define " << defname << "\n\n";
f << "#include \"pivariant.h\"\n#include \"picodeinfo.h\"";
if (inc_h) f << inc_string;
/*
f << "\n\n";
piForeachC (PICodeParser::Entity * e, ventities)
f << e->type << " " << e->name << ";\n";
f << "\n";
piForeachC (PICodeParser::Entity * e, ventities) {
f << "\nPIVariant execFunction(" << e->name << " * object, const char * function, const PIVariant & arg0 = PIVariant(), \
const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());";
}
*/
if (streams) {
f << "\n\n// Stream operators\n";
piForeachC (PICodeParser::Entity * e, parser.entities) {

View File

@@ -1,48 +0,0 @@
/*
PIP - Platform Independent Primitives
Code model generator
Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "pitimer.h"
#include "test.h"
void event(void * , int d) {
piCout << "tick" << d;
}
PITimer tm;
int main(int argc, char * argv[]) {
//tm.setSlot(event);
//tm.start(200);
/*execFunction(&tm, "setSlot", PIVariant::fromValue<TimerEvent>(event));
execFunction(&tm, "start", 200);
piMSleep(1000);
execFunction(&tm, "addDelimiter", 2);
piMSleep(1000);
execFunction(&tm, "stop");
execFunction(&tm, "stop_");
piMSleep(1000);*/
typedef PIMap<PIString, PICodeInfo::ClassInfo* >::value_type mpair;
piForeachC (mpair & i, *(PICodeInfo::classesInfo))
piCout << *i.second;
piCout << "\n\n";
typedef PIMap<PIString, PICodeInfo::EnumInfo * >::value_type epair;
piForeachC (epair & i, *(PICodeInfo::enumsInfo))
piCout << *i.second;
return 0;
};

File diff suppressed because it is too large Load Diff

View File

@@ -1,100 +0,0 @@
// Generated by "PIP Code model generator" 29.04.2014 18:03:05
#ifndef TEST_H
#define TEST_H
#include "pivariant.h"
#include "picodeinfo.h"
class PIMutex;
class PIBitArray;
class PIHuffman;
class PIByteArray;
class PIChar;
class PIString;
class PIStringList;
class PISystemTime;
struct PITime;
struct PIDate;
struct PIDateTime;
class Solver;
class PIFFT;
class PIVariant;
class PIObject;
class PIThread;
class PITimer;
class PIKbdListener;
class PIIODevice;
class PISerial;
class PIFile;
class PIProcess;
class PIEthernet;
class PIPacketExtractor;
class PIConfig;
class PIMultiProtocolBase;
class PIProtocol;
class PIDiagnostics;
class PISystemMonitor;
class PIConsole;
class PICLI;
class PIEvaluatorContent;
class PIEvaluator;
class PIMultiProtocol;
class PIRepeater;
class PICodec;
class PIPeer;
class PIBinaryLog;
class PIUSB;
PIVariant execFunction(PIMutex * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIBitArray * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIHuffman * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIByteArray * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIChar * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIString * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIStringList * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PISystemTime * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PITime * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIDate * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIDateTime * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(Solver * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIFFT * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIVariant * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIObject * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIThread * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PITimer * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIKbdListener * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIIODevice * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PISerial * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIFile * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIProcess * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIEthernet * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIPacketExtractor * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIConfig * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIMultiProtocolBase * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIProtocol * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIDiagnostics * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PISystemMonitor * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIConsole * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PICLI * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIEvaluatorContent * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIEvaluator * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIMultiProtocol * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIRepeater * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PICodec * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIPeer * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIBinaryLog * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
PIVariant execFunction(PIUSB * object, const char * function, const PIVariant & arg0 = PIVariant(), const PIVariant & arg1 = PIVariant(), const PIVariant & arg2 = PIVariant(), const PIVariant & arg3 = PIVariant());
class __ClassInfo_TEST_H_Initializer__ {
public:
__ClassInfo_TEST_H_Initializer__();
static bool _inited_;
};
static __ClassInfo_TEST_H_Initializer__ __classinfo_test_h_initializer__;
#endif // TEST_H

View File

@@ -1,7 +1,6 @@
message(STATUS "Building picrypt")
add_executable(picrypt "main.cpp")
target_link_libraries(picrypt pip pip_crypt)
# apple_rpath_patch(picrypt)
if (DEFINED LIB)
install(TARGETS picrypt DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
else()

View File

@@ -1,3 +1,22 @@
/*
PIP - Platform Independent Primitives
Crypth / decrypth files utility
Andrey Bychkov work.a.b@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "pip.h"
#include "picrypt.h"
#include <stdio.h>

View File

@@ -1,3 +1,22 @@
/*
PIP - Platform Independent Primitives
Deploy tool
Ivan Pelipenko peri4ko@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <picli.h>
#include <pidir.h>
#include <piprocess.h>
@@ -66,11 +85,9 @@ void usage() {
piCout << "--dpkg-workdir <d> " << Green << "- dpkg \"admindir\" path, default \"\"";
piCout << "--name-tool <path> " << Green << "- \"install_name_tool\" path, default \"install_name_tool\"";
piCout << "-d <depth> " << Green << "- maximum dependepcies depth, default 8";
//piCout << "-Q, --Qt-force " << Green << "- force add Qt root dir, default takes from \"qmake -v\"";
piCout << "";
piCout << Bold << "Qt control";
piCout << "-q <qtdir> " << Green << "- path where Qt root dir, default takes from \"qmake -v\"";
//piCout << "-C, --Conf " << Green << "- make \"qt.conf\"";
piCout << "-S <styles> " << Green << "- set Qt styles (e.g. \"oxygen,breeze\"), default \"*\"";
piCout << "-P <platforms> " << Green << "- set Qt platforms (e.g. \"win,mini\"), default by host system";
piCout << "--qt-plugins <d> " << Green << "- set Qt plugins description";
@@ -341,9 +358,6 @@ void procQt() {
#endif
piForeachC (PIString & plugin, pdirs) {
PIStringList filters = qt_filters[plugin];
/*if (plugin == "platforms") filters = platforms;
if (plugin == "styles") filters = styles;
if (plugin == "sqldrivers") filters = sqldrivers;*/
piForeachC (PIString & f, filters) {
if (f.isEmpty()) continue;
copyWildcard(qdir + plugin + "/" + f, out_plugins_dir + plugin);

View File

@@ -1,20 +1,20 @@
/*
PIP - Platform Independent Primitives
Remote console viewer
PIP - Platform Independent Primitives
Remote console viewer
Ivan Pelipenko peri4ko@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "pip.h"
@@ -50,7 +50,6 @@ int main(int argc, char * argv[]) {
}
}
if (!selected) return 0;
//console.clearScreen();
piCout << "Connecting to" << console.selectedServer() << "...";
while (!PIKbdListener::exiting) {
msleep(20);

View File

@@ -10,7 +10,6 @@ file(GLOB SRC "*.cpp" "*.h")
add_executable(pip_rc ${SRC} ${_RC})
set (PIRC_LIBS pip)
target_link_libraries(pip_rc ${PIRC_LIBS})
# apple_rpath_patch(pip_rc)
if (DEFINED LIB)
install(TARGETS pip_rc DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
else()

View File

@@ -1,3 +1,22 @@
/*
PIP - Platform Independent Primitives
Resources compiller
Ivan Pelipenko peri4ko@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "parser.h"
#include "generator.h"
#include "picli.h"
@@ -36,8 +55,6 @@ int main (int argc, char * argv[]) {
return 0;
}
//piCout << "args:" << cli.rawArguments();
PIVector<ParserSection> files = parse(cli.argumentValue("input"));
if (files.isEmpty()) {
piCout << "Error: resources description file is empty";
@@ -65,7 +82,6 @@ int main (int argc, char * argv[]) {
piForeachC (PIString & _a, cli.rawArguments())
outf << "// \"" << _a << "\"\n";
outf << "\n";
//outf << "#include \"pivariant.h\"\n#include \"picodeinfo.h\"";
if (!generate(init_name, outf, files)) {
piCout << "Error: generate fail";
return 1;

View File

@@ -8,7 +8,6 @@ PIVector<ParserSection> parse(const PIString & path) {
if (!f.open(path, PIIODevice::ReadOnly))
return ret;
PIString ext = f.fileInfo().extension().toLowerCase();
//PIString fc = PIString::fromUTF8(f.readAll());
PIString dir = PIDir(f.fileInfo().dir()).absolutePath() + "/";
//piCout << dir;
if (ext == "conf") return parseConf(f, dir);
@@ -19,7 +18,6 @@ PIVector<ParserSection> parse(const PIString & path) {
ParserEntry makeEntry(PIString filename, const PIString & dir) {
ParserEntry ret;
//ret.alias = PIFile::fileInfo(filename).name();
ret.path = filename;
if (!PIDir(PIFile::fileInfo(filename).dir()).isAbsolute()) {
//piCout << "rel, add dir";

View File

@@ -3,7 +3,6 @@ file(GLOB CPPS "*.cpp")
file(GLOB HDRS "*.h")
add_executable(pisd ${CPPS} ${HDRS})
target_link_libraries(pisd pip pip_crypt)
# apple_rpath_patch(pisd)
if (DEFINED LIB)
install(TARGETS pisd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
else()

View File

@@ -6,7 +6,6 @@
const char self_name[] = "__self__";
extern PIScreen * screen;
extern PISystemMonitor sys_mon;
//bool Daemon::inited__ = false;
Daemon::Remote::Remote(const PIString & n): PIThread() {
setName(n);
@@ -279,10 +278,6 @@ Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_"
dtimer.addDelimiter(5);
dtimer.start(200);
//CONNECTU(&console, keyPressed, this, keyEvent)
//dir.setDir("/home/peri4/Documents");
//TileSimple * tl;
tile_root = new PIScreenTile();
tile_root->direction = Vertical;
@@ -406,13 +401,6 @@ void Daemon::showTile(PIScreenTile * t, const PIString & header) {
lock();
if (!conn_name.isEmpty())
tile_header->content[0].first.insert(0, PIString("Daemon \"") + connectedDaemon() + "\": ");
/*PIString s;
if (!conn_name.isEmpty())
s = "Daemon \"" + connectedDaemon() + "\": ";
s += header;
tile_header->content.resize(1);
tile_header->content[0].first = s;
tile_header->content[0].second.flags = Bold;*/
unlock();
}
@@ -481,7 +469,6 @@ void Daemon::keyEvent(PIKbdListener::KeyEvent key) {
void Daemon::fmKeyEvent(PIKbdListener::KeyEvent key) {
PIMutexLocker ml(remote_mutex);
//Remote * r = remotes.value(conn_name);
// piCoutObj << key.key << key.modifiers;
switch (key.key) {
case PIKbdListener::Return:
@@ -619,17 +606,11 @@ PIString Daemon::connectedDaemon() const {
void Daemon::peerConnected(const PIString & p_name) {
while (!inited__) piMSleep(PIP_MIN_MSLEEP*5);
// PIMutexLocker ml(peers_mutex);
/*piCout << "connected" << name;
mode = 2;
conn_name = name;*/
if (!p_name.startsWith(pisd_prefix)) return;
Remote * r = new Remote(p_name);
piCoutObj << "peer connected" << p_name;
// piCout << r->methodsEH() << this->methodsEH();
CONNECTU(r, sendRequest, this, sendRequest)
CONNECTU(r, receiveFinished, this, filesReceived)
//CONNECTU(r, receiveFinished, this, closeFileDialog)
CONNECTU(r, sendFinished, this, filesSended)
CONNECTU(r, changeDirFinished, this, dirChanged)
PIMutexLocker ml2(remote_mutex);
@@ -661,9 +642,6 @@ void Daemon::filesReceived(const PIString & p_name, bool ok) {
} else {
piCout << "warning, files not received fromsended" << p_name;
}
// piCout << "try lock in filesReceived, now mutex is" << remote_mutex.isLocked();
// PIMutexLocker ml(remote_mutex);
// piCout << "lock reached";
closeFileDialog(p_name, ok);
Remote * r = remotes.value(p_name, 0);
if (!r) return;
@@ -710,22 +688,19 @@ void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
//piCout << "file transfer with" << p_name << (ok ? "success" : "failure");
if (tile_file_progress->conn_name != p_name) return;
tile_file_progress->close(ok);
// if (ok) {
if (tile_file_progress->rec) {
fm.remoteTile()->setFocus();
fm.clearSelectionRemote();
fm.updateLocalDir();
} else {
fm.localTile()->setFocus();
fm.clearSelectionLocal();
requestChDir(".");
}
// }
if (tile_file_progress->rec) {
fm.remoteTile()->setFocus();
fm.clearSelectionRemote();
fm.updateLocalDir();
} else {
fm.localTile()->setFocus();
fm.clearSelectionLocal();
requestChDir(".");
}
}
void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
//if (conn_name != from) return;
// piCout << "rec" << data.size();
if (data.size() < 4) return;
PIMutexLocker ml(remote_mutex);
@@ -748,7 +723,6 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
//piCout << "store to" << r->dir_my.absolutePath();
piCoutObj << "cd to" << r->dir_my.absolutePath();
r->updateDir();
// sendDirToRemote(r);
break;
case ReplyHostInfo:
ba >> info_other;
@@ -760,7 +734,6 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
{
PIVector<PIFile::FileInfo> fil;
ba >> dir >> fil;
// r->dir_remote.setDir(dir);
fm.setRemoteDir(dir);
fm.setRemoteContent(fil);
fm.remoteRestoreDir();
@@ -784,7 +757,6 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
ba >> files;
//piCout << "send" << files << "from" << r->dir_my.absolutePath();
r->removeFiles(files);
//answer_dirs = true;
}
break;
case MkDir:
@@ -910,6 +882,4 @@ void Daemon::requestChDir(const PIString & d) {
PIByteArray ba;
ba << int(RequestChangeDir) << d;
send(conn_name, ba);
// bool ok = send(conn_name, ba);
// piCout << "request chdir" << d << conn_name << r << ok;
}

View File

@@ -1,8 +1,6 @@
#include "file_manager.h"
#include "shared.h"
//extern PIScreen * screen;
FileManager::TileDir::TileDir(): TileList() {
label_path = 0;
@@ -155,7 +153,6 @@ void FileManager::TileDir::setContent(const PIVector<PIFile::FileInfo> & l) {
void FileManager::TileDir::updateDir() {
//if (!enabled) return;
lock();
int pc = cur, po = offset;
showReading();
@@ -172,7 +169,6 @@ void FileManager::TileDir::updateDir() {
void FileManager::TileDir::buildNames() {
//if (!enabled) return;
lock();
PIMutexLocker ml(e_mutex);
content.clear();
@@ -227,8 +223,6 @@ void FileManager::TileDir::resizeEvent(int w, int h) {
FileManager::FileManager() {
setName("FileManager");
//CONNECTU(screen, keyPressed, this, keyEvent)
//dir.setDir("/home/peri4/Documents");
TileSimple * tl;
tile_root = new PIScreenTile();

View File

@@ -1,20 +1,20 @@
/*
PIP - Platform Independent Primitives
PIp System Daemon
Ivan Pelipenko peri4ko@yandex.ru
PIP - Platform Independent Primitives
PIP System Daemon
Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "pisingleapplication.h"
@@ -35,7 +35,6 @@ _Init _pisd_init;
PISystemMonitor sys_mon;
PIScreen * screen = 0;
//FileManager file_manager;
class MainMenu: public PITimer {
@@ -63,10 +62,6 @@ public:
mt->hide(); mt->name() = "local info";
center->addTile(mt); mtiles << mt;
//mt = tfm = daemon_.fm.tile();
mt->hide(); mt->name() = "file manager";
center->addTile(mt); mtiles << mt;
mt = tdaemon = daemon_.tile();
mt->hide(); mt->name() = "daemon";
center->addTile(mt); mtiles << mt;
@@ -129,7 +124,6 @@ public:
ret->addTile(diag);
diag->addTile(peerdiagdata_tl);
diag->addTile(peerdiagservice_tl);
// updatePeerInfo();
return ret;
}
PIScreenTile * peerTile() {
@@ -148,7 +142,6 @@ public:
ret->addTile(peerinfo_tl);
ret->addTile(addrs_tl);
ret->addTile(peermap_tl);
// updatePeerInfo();
return ret;
}
@@ -379,8 +372,6 @@ int main(int argc, char * argv[]) {
args << "-a" << sip;
if (!name.isEmpty())
args << "-n" << name;
//PIProcess p;
//p.exec("/bin/readlink", PIStringList() << "/proc/self/exe");
PIString exe;
#ifdef WINDOWS
exe = PISystemInfo::instance()->execCommand;
@@ -391,12 +382,10 @@ int main(int argc, char * argv[]) {
PIProcess::execIndependent(exe, args);
return 0;
}
//cli.addArgument("");
screen = new PIScreen(false);
screen->setMouseEnabled(true);
Daemon * daemon = new Daemon();
if (!sip.isEmpty()) daemon->setTcpServerIP(sip);
//sys_mon.startOnProcess(12404);
screen->enableExitCapture(PIKbdListener::F10);
if (!name.isEmpty())
daemon->changeName(pisd_prefix + name);

View File

@@ -11,7 +11,6 @@ TileTerminal::TileTerminal(const PIString & n): PIScreenTile(n) {
void TileTerminal::drawEvent(PIScreenDrawer * d) {
//piCout << "draw" << visible;
//PIVector<PIVector<PIScreenTypes::Cell> > c = term->content();
d->fillRect(x_, y_, x_ + width_, y_ + height_, cells);
}
@@ -25,20 +24,11 @@ bool TileTerminal::keyEvent(PIKbdListener::KeyEvent key) {
return true;
}
//piCout << "key";
/*if (!term) return false;
if (PITerminal::isSpecialKey(key.key)) term->write((PIKbdListener::SpecialKey)key.key, key.modifiers);
else {
PIByteArray ba;
ba << PIChar(key.key).toConcole1Byte();
term->write(ba);
}*/
keyPressed(key);
return true;
}
void TileTerminal::resizeEvent(int w, int h) {
/*if (!term) return;
term->resize(w, h);*/
resizeRequest();
}

View File

@@ -1,7 +1,6 @@
message(STATUS "Building pip_system_test")
add_executable(pip_system_test "main.cpp")
target_link_libraries(pip_system_test pip)
# apple_rpath_patch(pip_system_test)
if (DEFINED LIB)
install(TARGETS pip_system_test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
endif ()

View File

@@ -1,20 +1,20 @@
/*
PIP - Platform Independent Primitives
System tests program
PIP - Platform Independent Primitives
System tests program
Ivan Pelipenko peri4ko@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "pip.h"
@@ -101,8 +101,6 @@ int main(int argc, char * argv[]) {
sts /= stc;
conf.setValue("usleep_offset_us", long(sts));
piCout << "ok," << sts << "us, average in" << stc << "series (" << (stc * times.size_s()) << "executes)";
//WAIT_FOR_EXIT
return 0;
#endif
};

View File

@@ -1,7 +1,6 @@
message(STATUS "Building pift")
add_executable(pift "main.cpp")
target_link_libraries(pift pip)
# apple_rpath_patch(pift)
if (DEFINED LIB)
install(TARGETS pift DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
else()

View File

@@ -1,3 +1,22 @@
/*
PIP - Platform Independent Primitives
UDP file transfer (send /receive files) utility
Andrey Bychkov work.a.b@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "pip.h"
#include "pifiletransfer.h"
#include "pidatatransfer.h"
@@ -20,9 +39,7 @@ public:
eth.setSendAddress(dst_ip_port);
if (test_) {
testt.setCRCEnabled(false);
//testt.setPacketSize(1280);
testt.setName("TEST");
//testt.setTimeout(0.1);
CONNECTU(&testt, sendRequest, this, ftsend);
} else {
ft.setPacketSize(65000);
@@ -66,7 +83,6 @@ private:
ft.stopSend();
ft.stopReceive();
}
// piCout << (int)ft.diagnostic().quality();
}
if (testt.isSending() || testt.isReceiving()) {
ftevent();
@@ -129,7 +145,6 @@ private:
ft.received(ba);
}
void updatePMT() {
PIString pm;
if (test_) pm = testt.packetMap();
@@ -210,8 +225,6 @@ int main (int argc, char * argv[]) {
src += ":"+PIString::fromNumber(port);
dst += ":"+PIString::fromNumber(port);
}
// PIKbdListener kbd;
// kbd.enableExitCapture();
PIScreen screen(false);
screen.enableExitCapture();
screen.rootTile()->addTile(new TilePICout());