projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ca8f178
)
shorten and comment CoreUserInputHandler::handleJoin
author
Daniel Albers
<daniel@lbers.com>
Thu, 3 Dec 2009 22:01:02 +0000
(23:01 +0100)
committer
Daniel Albers
<daniel@lbers.com>
Thu, 3 Dec 2009 22:28:51 +0000
(23:28 +0100)
src/core/coreuserinputhandler.cpp
patch
|
blob
|
history
diff --git
a/src/core/coreuserinputhandler.cpp
b/src/core/coreuserinputhandler.cpp
index
a2feda9
..
a5a3d87
100644
(file)
--- a/
src/core/coreuserinputhandler.cpp
+++ b/
src/core/coreuserinputhandler.cpp
@@
-169,16
+169,23
@@
void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStrin
QString sane_msg = msg;
sane_msg.replace(QRegExp(", +"), ",");
QStringList params = sane_msg.trimmed().split(" ");
QString sane_msg = msg;
sane_msg.replace(QRegExp(", +"), ",");
QStringList params = sane_msg.trimmed().split(" ");
+
QStringList chans = params[0].split(",", QString::SkipEmptyParts);
QStringList keys;
QStringList chans = params[0].split(",", QString::SkipEmptyParts);
QStringList keys;
+ if(params.count() > 1)
+ keys = params[1].split(",");
+
int i;
for(i = 0; i < chans.count(); i++) {
if(!network()->isChannelName(chans[i]))
chans[i].prepend('#');
int i;
for(i = 0; i < chans.count(); i++) {
if(!network()->isChannelName(chans[i]))
chans[i].prepend('#');
- }
- if(params.count() > 1)
- keys = params[1].split(",");
+ if(i < keys.count()) {
+ network()->addChannelKey(chans[i], keys[i]);
+ } else {
+ network()->removeChannelKey(chans[i]);
+ }
+ }
static const char *cmd = "JOIN";
i = 0;
static const char *cmd = "JOIN";
i = 0;
@@
-186,18
+193,24
@@
void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStrin
int slicesize = chans.count();
QList<QByteArray> encodedParams;
int slicesize = chans.count();
QList<QByteArray> encodedParams;
+ // go through all to-be-joined channels and (re)build the join list
while(i < chans.count()) {
joinChans.append(chans.at(i));
if(i < keys.count())
joinKeys.append(keys.at(i));
while(i < chans.count()) {
joinChans.append(chans.at(i));
if(i < keys.count())
joinKeys.append(keys.at(i));
+ // if the channel list we built so far either contains all requested channels or exceeds
+ // the desired amount of channels in this slice, try to send what we have so far
if(++i == chans.count() || joinChans.count() >= slicesize) {
if(++i == chans.count() || joinChans.count() >= slicesize) {
- params[0] = joinChans.join(",");
- params[1] = joinKeys.join(",");
+ params.clear();
+ params.append(joinChans.join(","));
+ params.append(joinKeys.join(","));
encodedParams = serverEncode(params);
encodedParams = serverEncode(params);
+ // check if it fits in one command
if(lastParamOverrun(cmd, encodedParams) == 0) {
emit putCmd(cmd, encodedParams);
} else if(slicesize > 1) {
if(lastParamOverrun(cmd, encodedParams) == 0) {
emit putCmd(cmd, encodedParams);
} else if(slicesize > 1) {
+ // back to start of slice, try again with half the amount of channels
i -= slicesize;
slicesize /= 2;
}
i -= slicesize;
slicesize /= 2;
}
@@
-205,16
+218,6
@@
void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStrin
joinKeys.clear();
}
}
joinKeys.clear();
}
}
-
- i = 0;
- for(; i < keys.count(); i++) {
- if(i >= chans.count())
- break;
- network()->addChannelKey(chans[i], keys[i]);
- }
- for(; i < chans.count(); i++) {
- network()->removeChannelKey(chans[i]);
- }
}
void CoreUserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) {
}
void CoreUserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) {