Compare commits
No commits in common. "c321076f9656dd0b263e9a3fce7f394015726d8d" and "5936bf96f00e2e4941620d348c53903a81d62ea2" have entirely different histories.
c321076f96
...
5936bf96f0
18
.clang-tidy
18
.clang-tidy
@ -37,7 +37,7 @@ CheckOptions:
|
||||
- key: readability-identifier-naming.ClassConstantCase
|
||||
value: CamelCase
|
||||
- key: readability-identifier-naming.ClassConstantPrefix
|
||||
value: 'k'
|
||||
value: 'k_'
|
||||
- key: readability-identifier-naming.ClassConstantSuffix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.ClassMemberCase
|
||||
@ -55,7 +55,7 @@ CheckOptions:
|
||||
- key: readability-identifier-naming.ConstantCase
|
||||
value: CamelCase
|
||||
- key: readability-identifier-naming.ConstantPrefix
|
||||
value: 'k'
|
||||
value: 'k_'
|
||||
- key: readability-identifier-naming.ConstantSuffix
|
||||
value: POST
|
||||
- key: readability-identifier-naming.ConstantMemberCase
|
||||
@ -91,7 +91,7 @@ CheckOptions:
|
||||
- key: readability-identifier-naming.ConstexprVariableCase
|
||||
value: CamelCase
|
||||
- key: readability-identifier-naming.ConstexprVariablePrefix
|
||||
value: 'k'
|
||||
value: 'k_'
|
||||
- key: readability-identifier-naming.ConstexprVariableSuffix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.EnumCase
|
||||
@ -119,7 +119,7 @@ CheckOptions:
|
||||
- key: readability-identifier-naming.GlobalConstantSuffix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.GlobalConstantPointerCase
|
||||
value: CamelCase
|
||||
value: lower_case
|
||||
- key: readability-identifier-naming.GlobalConstantPointerPrefix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.GlobalConstantPointerSuffix
|
||||
@ -142,8 +142,6 @@ CheckOptions:
|
||||
value: ''
|
||||
- key: readability-identifier-naming.GlobalVariableSuffix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.IgnoreMainLikeFunctions
|
||||
value: 1
|
||||
- key: readability-identifier-naming.InlineNamespaceCase
|
||||
value: lower_case
|
||||
- key: readability-identifier-naming.InlineNamespacePrefix
|
||||
@ -247,15 +245,15 @@ CheckOptions:
|
||||
- key: readability-identifier-naming.PublicMethodSuffix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.StaticConstantCase
|
||||
value: CamelCase
|
||||
value: camelBack
|
||||
- key: readability-identifier-naming.StaticConstantPrefix
|
||||
value: 'k'
|
||||
value: 'k_'
|
||||
- key: readability-identifier-naming.StaticConstantSuffix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.StaticVariableCase
|
||||
value: CamelCase
|
||||
value: camelBack
|
||||
- key: readability-identifier-naming.StaticVariablePrefix
|
||||
value: 's'
|
||||
value: ''
|
||||
- key: readability-identifier-naming.StaticVariableSuffix
|
||||
value: ''
|
||||
- key: readability-identifier-naming.StructCase
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 9df188963e5980d305dd50d721978ccdd997a8c3
|
||||
Subproject commit 2ea38c32c8d6aa7ccdbdf84cff1d0b0d50cc2fb3
|
@ -4,8 +4,10 @@ set(AUTHOR_NAME "Андрей Астафьев")
|
||||
set(DOXYGEN_PROJECT_TITLE "MyXLib")
|
||||
set(DOXYGEN_GENERATE_LATEX YES)
|
||||
set(DOXYGEN_GENERATE_HTML YES)
|
||||
set(DOXYGEN_GENERATE_SQLITE YES)
|
||||
|
||||
set(CPACK_COMPONENTS_ALL examples)
|
||||
set(CPACK_GENERATOR "TXZ;DEB")
|
||||
set(CPACK_PACKAGE_CONTACT "Andrei Astafev <dev@246060.ru>")
|
||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions")
|
||||
|
||||
|
@ -15,6 +15,8 @@ namespace myx {
|
||||
|
||||
namespace redis {
|
||||
|
||||
static const QByteArray Separator { "\r\n" }; //!< Строковый разделитель слов во фразе
|
||||
|
||||
/*!
|
||||
* \brief Создает объект класса
|
||||
* \param host Имя хоста сервера
|
||||
@ -47,12 +49,6 @@ inline Base::Base( QObject* parent ) :
|
||||
}
|
||||
|
||||
|
||||
inline int Base::rwTimeout() const
|
||||
{
|
||||
return( kRWTimeout );
|
||||
}
|
||||
|
||||
|
||||
inline QString Base::host() const
|
||||
{
|
||||
return( m_host );
|
||||
@ -103,6 +99,37 @@ inline bool Base::isConnected() const
|
||||
}
|
||||
|
||||
|
||||
/// *!
|
||||
// * \brief Извлекает длину токена из буфера данных
|
||||
// * \param pos Позиция в буфере
|
||||
// * \param buffer Буфер данных
|
||||
// */
|
||||
// inline int Base::fetchLength( QByteArray& buffer, int& pos )
|
||||
// {
|
||||
// if ( ( buffer[pos] != '$' ) && ( buffer[pos] != '*' ) && ( buffer[pos] != ':' ) )
|
||||
// {
|
||||
// buffer.clear();
|
||||
// pos = 0;
|
||||
// return( -1 );
|
||||
// }
|
||||
// pos++;
|
||||
// QByteArray text;
|
||||
// while ( pos < buffer.length() )
|
||||
// {
|
||||
// if ( QChar( buffer[pos] ).isNumber() )
|
||||
// {
|
||||
// text += buffer[pos++];
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// pos += Separator.length();
|
||||
// return( text.toInt() );
|
||||
// }
|
||||
// }
|
||||
// return( -1 );
|
||||
// } // Base::fetchLength
|
||||
|
||||
|
||||
/*!
|
||||
* \brief Добавляет к состоянию флаг Read
|
||||
*/
|
||||
|
@ -47,7 +47,7 @@ public:
|
||||
bool isConnected() const;
|
||||
|
||||
private:
|
||||
static constexpr int kRWTimeout { 200 }; //!< Таймаут на операции чтения и записи
|
||||
static constexpr int k_RwTimeout { 200 }; //!< Таймаут на операции чтения и записи
|
||||
int m_connectionFlags { kDisconnected }; //!< Флаги состояния соединения
|
||||
quint16 m_port { 6379 }; //!< Номер порта подключения к БД
|
||||
QString m_host { QStringLiteral( "127.0.0.1" ) }; //!< Имя хоста подключения к БД
|
||||
@ -56,6 +56,7 @@ private:
|
||||
|
||||
protected:
|
||||
|
||||
int connectionTimeout() const;
|
||||
int rwTimeout() const;
|
||||
|
||||
QString host() const;
|
||||
@ -67,6 +68,7 @@ protected:
|
||||
int connectionFlags() const;
|
||||
void setConnectionFlags( int connectionFlags );
|
||||
|
||||
// int fetchLength( QByteArray& buffer, int& pos );
|
||||
Q_SLOT void onReadyRead();
|
||||
Q_SLOT void onBytesWritten();
|
||||
Q_SLOT void onSocketError();
|
||||
|
@ -14,14 +14,6 @@ namespace myx {
|
||||
|
||||
namespace redis {
|
||||
|
||||
namespace constants {
|
||||
|
||||
static const QByteArray Separator { "\r\n" }; //!< Строковый разделитель слов во фразе
|
||||
|
||||
} // namespace constants
|
||||
|
||||
namespace C = constants;
|
||||
|
||||
/*!
|
||||
* \brief Создает часть команды
|
||||
* \param value Значение для создани части команды
|
||||
@ -30,7 +22,7 @@ namespace C = constants;
|
||||
inline QByteArray part( const QVariant& value )
|
||||
{
|
||||
auto bytes = value.toByteArray();
|
||||
return( "$" + QByteArray::number( bytes.length() ) + C::Separator + bytes );
|
||||
return( "$" + QByteArray::number( bytes.length() ) + Separator + bytes );
|
||||
}
|
||||
|
||||
|
||||
@ -45,7 +37,7 @@ inline QByteArray array( const QVariantList& parts )
|
||||
std::transform( parts.cbegin(), parts.cend(), std::back_inserter( data ),
|
||||
[]( const QVariant& iter ) { return( part( iter ) ); } );
|
||||
data.prepend( "*" + QByteArray::number( data.size() ) );
|
||||
return( data.join( C::Separator ) + C::Separator );
|
||||
return( data.join( Separator ) + Separator );
|
||||
}
|
||||
|
||||
|
||||
@ -84,7 +76,7 @@ inline QByteArrayList split( const QByteArray& buffer, int* splitLength )
|
||||
{
|
||||
*splitLength = 0;
|
||||
}
|
||||
if ( !buffer.endsWith( C::Separator ) )
|
||||
if ( !buffer.endsWith( Separator ) )
|
||||
{
|
||||
return {};
|
||||
}
|
||||
@ -104,7 +96,7 @@ inline QByteArrayList split( const QByteArray& buffer, int* splitLength )
|
||||
return {};
|
||||
}
|
||||
size = text.toInt();
|
||||
pos += C::Separator.length();
|
||||
pos += Separator.length();
|
||||
}
|
||||
QByteArrayList parts;
|
||||
Token token { kUndefined };
|
||||
@ -139,7 +131,7 @@ inline QByteArrayList split( const QByteArray& buffer, int* splitLength )
|
||||
{
|
||||
parts.push_back( partLength );
|
||||
token = kUndefined;
|
||||
pos += C::Separator.length();
|
||||
pos += Separator.length();
|
||||
}
|
||||
break;
|
||||
case kFetchPart:
|
||||
@ -155,17 +147,17 @@ inline QByteArrayList split( const QByteArray& buffer, int* splitLength )
|
||||
if ( length < 0 )
|
||||
{
|
||||
parts.push_back( "" );
|
||||
pos += C::Separator.length();
|
||||
pos += Separator.length();
|
||||
}
|
||||
else
|
||||
{
|
||||
pos += C::Separator.length();
|
||||
pos += Separator.length();
|
||||
if ( pos + length > buffer.length() )
|
||||
{
|
||||
return {};
|
||||
}
|
||||
parts.push_back( buffer.mid( pos, length ) );
|
||||
pos += length + C::Separator.length();
|
||||
pos += length + Separator.length();
|
||||
}
|
||||
token = kUndefined;
|
||||
}
|
||||
|
@ -12,6 +12,8 @@ namespace myx {
|
||||
|
||||
namespace redis {
|
||||
|
||||
static const QByteArray Separator { "\r\n" }; //!< Строковый разделитель слов во фразе
|
||||
|
||||
QByteArray array( const QVariantList& parts );
|
||||
QByteArrayList split( const QByteArray& buffer, int* splitLength = nullptr );
|
||||
// QByteArray part( const QVariant& value );
|
||||
|
@ -19,7 +19,7 @@ namespace myx {
|
||||
|
||||
namespace redis {
|
||||
|
||||
const QString PubSub::kKeySpacePrefix { QStringLiteral( "__key%1__:" ) };
|
||||
const QString PubSub::k_KeySpacePrefix { QStringLiteral( "__key%1__:" ) };
|
||||
|
||||
/*!
|
||||
* \brief Конструктор класса
|
||||
@ -49,12 +49,6 @@ inline PubSub::PubSub( QObject* parent ) :
|
||||
}
|
||||
|
||||
|
||||
inline int PubSub::connectionTimeout() const
|
||||
{
|
||||
return( kConnectionTimeout );
|
||||
}
|
||||
|
||||
|
||||
/*!
|
||||
* \brief Инициирует работу с БД
|
||||
*/
|
||||
@ -100,7 +94,7 @@ inline void PubSub::subscribe( const QString& channel, QObject* subscriber, cons
|
||||
{
|
||||
if ( m_socket->state() == QAbstractSocket::ConnectedState )
|
||||
{
|
||||
m_socket->write( array( { "SUBSCRIBE", channel } ) );
|
||||
m_socket->write( array( { "SUBSCIBE", channel } ) );
|
||||
}
|
||||
m_subscribers[channel].emplace_back( subscriber, method );
|
||||
}
|
||||
@ -114,8 +108,6 @@ inline void PubSub::subscribe( const QString& channel, QObject* subscriber, cons
|
||||
if ( it == iter.value().end() )
|
||||
{
|
||||
iter.value().emplace_back( subscriber, method );
|
||||
connect( subscriber, &QObject::destroyed, this, &PubSub::onSubscriberDestroyed,
|
||||
Qt::UniqueConnection );
|
||||
}
|
||||
}
|
||||
} // PubSub::subscribe
|
||||
@ -138,7 +130,7 @@ inline void PubSub::subscribe( QString channel, QObject* subscriber, const char*
|
||||
auto iter = m_subscribers.find( channel );
|
||||
if ( iter == m_subscribers.end() )
|
||||
{
|
||||
channel.prepend( kKeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
channel.prepend( k_KeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
if ( m_socket->state() == QAbstractSocket::ConnectedState )
|
||||
{
|
||||
m_socket->write( array( { "SUBSCRIBE", channel } ) );
|
||||
@ -155,8 +147,6 @@ inline void PubSub::subscribe( QString channel, QObject* subscriber, const char*
|
||||
if ( it == iter.value().end() )
|
||||
{
|
||||
iter.value().emplace_back( subscriber, method );
|
||||
connect( subscriber, &QObject::destroyed, this, &PubSub::onSubscriberDestroyed,
|
||||
Qt::UniqueConnection );
|
||||
}
|
||||
}
|
||||
} // PubSub::subscribe
|
||||
@ -194,8 +184,6 @@ inline void PubSub::psubscribe( const QString& channel, QObject* subscriber, con
|
||||
if ( it == iter.value().end() )
|
||||
{
|
||||
iter.value().emplace_back( subscriber, method );
|
||||
connect( subscriber, &QObject::destroyed, this, &PubSub::onSubscriberDestroyed,
|
||||
Qt::UniqueConnection );
|
||||
}
|
||||
}
|
||||
} // PubSub::psubscribe
|
||||
@ -220,11 +208,11 @@ inline void PubSub::psubscribe( QString channel, QObject* subscriber, const char
|
||||
{
|
||||
if ( database == -1 )
|
||||
{
|
||||
channel.prepend( kKeySpacePrefix.arg( QStringLiteral( "*" ) ).toLocal8Bit() );
|
||||
channel.prepend( k_KeySpacePrefix.arg( QStringLiteral( "*" ) ).toLocal8Bit() );
|
||||
}
|
||||
else
|
||||
{
|
||||
channel.prepend( kKeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
channel.prepend( k_KeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
}
|
||||
if ( m_socket->state() == QAbstractSocket::ConnectedState )
|
||||
{
|
||||
@ -242,8 +230,6 @@ inline void PubSub::psubscribe( QString channel, QObject* subscriber, const char
|
||||
if ( it == iter.value().end() )
|
||||
{
|
||||
iter.value().emplace_back( subscriber, method );
|
||||
connect( subscriber, &QObject::destroyed, this, &PubSub::onSubscriberDestroyed,
|
||||
Qt::UniqueConnection );
|
||||
}
|
||||
}
|
||||
} // PubSub::psubscribe
|
||||
@ -302,11 +288,11 @@ inline void PubSub::unsubscribe( QString channel, QObject* subscriber, const cha
|
||||
}
|
||||
if ( database == -1 )
|
||||
{
|
||||
channel.prepend( kKeySpacePrefix.arg( QStringLiteral( "*" ) ).toLocal8Bit() );
|
||||
channel.prepend( k_KeySpacePrefix.arg( QStringLiteral( "*" ) ).toLocal8Bit() );
|
||||
}
|
||||
else
|
||||
{
|
||||
channel.prepend( kKeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
channel.prepend( k_KeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
}
|
||||
auto iter = m_subscribers.find( channel );
|
||||
if ( iter != m_subscribers.end() )
|
||||
@ -386,11 +372,11 @@ inline void PubSub::punsubscribe( QString channel, QObject* subscriber,
|
||||
}
|
||||
if ( database == -1 )
|
||||
{
|
||||
channel.prepend( kKeySpacePrefix.arg( QStringLiteral( "*" ) ).toLocal8Bit() );
|
||||
channel.prepend( k_KeySpacePrefix.arg( QStringLiteral( "*" ) ).toLocal8Bit() );
|
||||
}
|
||||
else
|
||||
{
|
||||
channel.prepend( kKeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
channel.prepend( k_KeySpacePrefix.arg( "space@" + QString::number( database ) ).toLocal8Bit() );
|
||||
}
|
||||
auto iter = m_psubscribers.find( channel );
|
||||
if ( iter != m_psubscribers.end() )
|
||||
@ -503,68 +489,6 @@ inline void PubSub::onSocketStateChanged()
|
||||
} // PubSub::onSocketStateChanged
|
||||
|
||||
|
||||
/*!
|
||||
* \brief При удалении подписчика уничтожает все его подписки
|
||||
* \param subscriber Удаленный подписчик
|
||||
*/
|
||||
inline void PubSub::onSubscriberDestroyed( QObject* subscriber )
|
||||
{
|
||||
for ( auto i = m_subscribers.begin(); i != m_subscribers.end(); )
|
||||
{
|
||||
for ( auto j = i.value().begin(); j != i.value().end(); )
|
||||
{
|
||||
if ( j->first == subscriber )
|
||||
{
|
||||
j = i.value().erase( j );
|
||||
}
|
||||
else
|
||||
{
|
||||
j++;
|
||||
}
|
||||
}
|
||||
if ( i.value().empty() )
|
||||
{
|
||||
if ( m_socket->state() == QAbstractSocket::ConnectedState )
|
||||
{
|
||||
m_socket->write( array( { "UNSUBSCRIBE", i.key() } ) );
|
||||
}
|
||||
i = m_subscribers.erase( i );
|
||||
}
|
||||
else
|
||||
{
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
for ( auto i = m_psubscribers.begin(); i != m_psubscribers.end(); )
|
||||
{
|
||||
for ( auto j = i.value().begin(); j != i.value().end(); )
|
||||
{
|
||||
if ( j->first == subscriber )
|
||||
{
|
||||
j = i.value().erase( j );
|
||||
}
|
||||
else
|
||||
{
|
||||
j++;
|
||||
}
|
||||
}
|
||||
if ( i.value().empty() )
|
||||
{
|
||||
if ( m_socket->state() == QAbstractSocket::ConnectedState )
|
||||
{
|
||||
m_socket->write( array( { "PUNSUBSCRIBE", i.key() } ) );
|
||||
}
|
||||
i = m_psubscribers.erase( i );
|
||||
}
|
||||
else
|
||||
{
|
||||
i++;
|
||||
}
|
||||
}
|
||||
} // PubSub::onSubscriberDestroyed
|
||||
|
||||
|
||||
/*!
|
||||
* \brief Возвращает сокет
|
||||
* \return Сокет
|
||||
|
@ -14,7 +14,7 @@ namespace myx {
|
||||
namespace redis {
|
||||
|
||||
/*!
|
||||
* \brief Управляет подпиской и публикацией сообщений
|
||||
* \brief УПравляет подпиской и публикацией сообщений
|
||||
*/
|
||||
|
||||
class PubSub : public Base
|
||||
@ -24,8 +24,6 @@ class PubSub : public Base
|
||||
public:
|
||||
explicit PubSub( QObject* parent = nullptr );
|
||||
QTcpSocket* socket() const;
|
||||
int connectionTimeout() const;
|
||||
|
||||
Q_SLOT void start();
|
||||
Q_SLOT void stop();
|
||||
Q_INVOKABLE void subscribe( const QString& channel, QObject* subscriber, const char* method );
|
||||
@ -52,11 +50,10 @@ public:
|
||||
private:
|
||||
using Sub = QHash< QString, std::vector< std::pair< QObject*, const char* > > >;
|
||||
|
||||
static const QString kKeySpacePrefix; //!< Приставка для наблюдения за данными
|
||||
static constexpr int kConnectionTimeout { 2000 }; //!< Таймаут на сетевые операции
|
||||
static const QString k_KeySpacePrefix; //!< Приставка для наблюдения за данными
|
||||
QTcpSocket* m_socket;
|
||||
QTimer* m_connectionTimer; //!< Таймер установления сетевого соединения
|
||||
|
||||
static constexpr int k_ConnectionTimeout { 2000 }; //!< Таймаут на сетевые операции
|
||||
/*!
|
||||
* \brief Таблица подписчиков
|
||||
*/
|
||||
@ -66,7 +63,6 @@ private:
|
||||
|
||||
Q_SLOT void read();
|
||||
Q_SLOT void onSocketStateChanged();
|
||||
Q_SLOT void onSubscriberDestroyed( QObject* subscriber );
|
||||
}; // class PubSub
|
||||
|
||||
} // namespace redis
|
||||
|
Loading…
Reference in New Issue
Block a user