CodeFactor review

This commit is contained in:
emeric
2022-01-30 14:57:04 +01:00
parent 3eb3cf3446
commit 3049babd41
14 changed files with 18 additions and 41 deletions
@@ -35,6 +35,9 @@ namespace Image::GraphicsMagick
std::unique_ptr<IRawImage> decodeImage(const std::filesystem::path& path) std::unique_ptr<IRawImage> decodeImage(const std::filesystem::path& path)
{ {
return std::make_unique<RawImage>(path)
}
}
void void
init(const std::filesystem::path& path) init(const std::filesystem::path& path)
+14 -17
View File
@@ -28,27 +28,24 @@
#include "utils/NetAddress.hpp" #include "utils/NetAddress.hpp"
#include "utils/Exception.hpp" #include "utils/Exception.hpp"
namespace Auth { namespace Auth
class LoginThrottler
{ {
public: class LoginThrottler
LoginThrottler(std::size_t maxEntries) : _maxEntries {maxEntries} {} {
public:
LoginThrottler(std::size_t maxEntries) : _maxEntries {maxEntries} {}
// user must lock these calls to avoid races // user must lock these calls to avoid races
bool isClientThrottled(const boost::asio::ip::address& address) const; bool isClientThrottled(const boost::asio::ip::address& address) const;
void onBadClientAttempt(const boost::asio::ip::address& address); void onBadClientAttempt(const boost::asio::ip::address& address);
void onGoodClientAttempt(const boost::asio::ip::address& address); void onGoodClientAttempt(const boost::asio::ip::address& address);
private: private:
void removeOutdatedEntries();
void removeOutdatedEntries();
const std::size_t _maxEntries;
std::unordered_map<boost::asio::ip::address, Wt::WDateTime> _attemptsInfo;
};
const std::size_t _maxEntries;
std::unordered_map<boost::asio::ip::address, Wt::WDateTime> _attemptsInfo;
};
} // Auth } // Auth
@@ -33,7 +33,6 @@ namespace Database
, _expiry {expiry} , _expiry {expiry}
, _user {getDboPtr(user)} , _user {getDboPtr(user)}
{ {
} }
AuthToken::pointer AuthToken::pointer
+1 -11
View File
@@ -26,7 +26,6 @@
class WhereClause class WhereClause
{ {
public: public:
WhereClause() {} WhereClause() {}
WhereClause(const std::string& clause) { _clause = clause; } WhereClause(const std::string& clause) { _clause = clause; }
@@ -40,7 +39,6 @@ class WhereClause
const std::list<std::string>& getBindArgs(void) const {return _bindArgs;} const std::list<std::string>& getBindArgs(void) const {return _bindArgs;}
private: private:
std::string _clause; // WHERE clause std::string _clause; // WHERE clause
std::list<std::string> _bindArgs; std::list<std::string> _bindArgs;
@@ -49,7 +47,6 @@ class WhereClause
class InnerJoinClause class InnerJoinClause
{ {
public: public:
InnerJoinClause() {} InnerJoinClause() {}
InnerJoinClause(const std::string& clause); InnerJoinClause(const std::string& clause);
@@ -57,7 +54,6 @@ class InnerJoinClause
std::string get() const { return _clause;} std::string get() const { return _clause;}
private: private:
std::string _clause; std::string _clause;
}; };
@@ -87,14 +83,12 @@ class SelectStatement
std::string get() const; std::string get() const;
private: private:
std::list<std::string> _statement; std::list<std::string> _statement;
}; };
class FromClause class FromClause
{ {
public: public:
FromClause() {} FromClause() {}
FromClause(const std::string& clause); FromClause(const std::string& clause);
@@ -103,15 +97,12 @@ class FromClause
std::string get() const; std::string get() const;
private: private:
std::list<std::string> _clause; std::list<std::string> _clause;
}; };
class SqlQuery class SqlQuery
{ {
public: public:
SelectStatement& select(void) { return _selectStatement;} SelectStatement& select(void) { return _selectStatement;}
SelectStatement& select(const std::string& statement) { _selectStatement = SelectStatement(statement); return _selectStatement; } SelectStatement& select(const std::string& statement) { _selectStatement = SelectStatement(statement); return _selectStatement; }
FromClause& from(void) { return _fromClause; } FromClause& from(void) { return _fromClause; }
@@ -122,10 +113,9 @@ class SqlQuery
GroupByStatement& groupBy(void) { return _groupByStatement; } GroupByStatement& groupBy(void) { return _groupByStatement; }
const GroupByStatement& groupBy(void) const { return _groupByStatement; } const GroupByStatement& groupBy(void) const { return _groupByStatement; }
std::string get(void) const; std::string get() const;
private: private:
SelectStatement _selectStatement; // SELECT statement SelectStatement _selectStatement; // SELECT statement
InnerJoinClause _innerJoinClause; // INNER JOIN InnerJoinClause _innerJoinClause; // INNER JOIN
FromClause _fromClause; // FROM tables FromClause _fromClause; // FROM tables
@@ -41,7 +41,6 @@ TrackList::TrackList(std::string_view name, Type type, bool isPublic, ObjectPtr<
_isPublic {isPublic}, _isPublic {isPublic},
_user {getDboPtr(user)} _user {getDboPtr(user)}
{ {
} }
TrackList::pointer TrackList::pointer
@@ -122,7 +122,6 @@ class Artist : public Object<Artist, ArtistId>
} }
private: private:
static const std::size_t _maxNameLength = 128; static const std::size_t _maxNameLength = 128;
std::string _name; std::string _name;
@@ -57,7 +57,6 @@ namespace Database
} }
private: private:
std::string _value; std::string _value;
Wt::WDateTime _expiry; Wt::WDateTime _expiry;
Wt::Dbo::ptr<User> _user; Wt::Dbo::ptr<User> _user;
@@ -112,7 +112,6 @@ class ClusterType : public Object<ClusterType, ClusterTypeId>
} }
private: private:
static const std::size_t _maxNameLength = 128; static const std::size_t _maxNameLength = 128;
std::string _name; std::string _name;
@@ -31,7 +31,6 @@ class Session;
class Db class Db
{ {
public: public:
Db(const std::filesystem::path& dbPath, std::size_t connectionCount = 10); Db(const std::filesystem::path& dbPath, std::size_t connectionCount = 10);
~Db(); ~Db();
@@ -68,7 +67,6 @@ class Db
std::unique_ptr<Wt::Dbo::SqlConnection> _connection; std::unique_ptr<Wt::Dbo::SqlConnection> _connection;
}; };
RecursiveSharedMutex _sharedMutex; RecursiveSharedMutex _sharedMutex;
std::unique_ptr<Wt::Dbo::SqlConnectionPool> _connectionPool; std::unique_ptr<Wt::Dbo::SqlConnectionPool> _connectionPool;
@@ -89,7 +89,6 @@ class ScanSettings : public Object<ScanSettings, ScanSettingsId>
} }
private: private:
int _scanVersion {}; int _scanVersion {};
std::string _mediaDirectory; std::string _mediaDirectory;
Wt::WTime _startTime = Wt::WTime {0,0,0}; Wt::WTime _startTime = Wt::WTime {0,0,0};
@@ -71,7 +71,6 @@ class TrackBookmark : public Object<TrackBookmark, TrackBookmarkId>
Wt::Dbo::belongsTo(a, _user, "user", Wt::Dbo::OnDeleteCascade); Wt::Dbo::belongsTo(a, _user, "user", Wt::Dbo::OnDeleteCascade);
} }
private: private:
static const std::size_t _maxCommentLength = 128; static const std::size_t _maxCommentLength = 128;
std::chrono::duration<int, std::milli> _offset; std::chrono::duration<int, std::milli> _offset;
@@ -121,7 +121,6 @@ class TrackList : public Object<TrackList, TrackListId>
} }
private: private:
std::string _name; std::string _name;
Type _type {Type::Playlist}; Type _type {Type::Playlist};
bool _isPublic {false}; bool _isPublic {false};
@@ -158,7 +157,6 @@ class TrackListEntry : public Object<TrackListEntry, TrackListEntryId>
} }
private: private:
Wt::WDateTime _dateTime; // optional date time Wt::WDateTime _dateTime; // optional date time
Wt::Dbo::ptr<Track> _track; Wt::Dbo::ptr<Track> _track;
Wt::Dbo::ptr<TrackList> _tracklist; Wt::Dbo::ptr<TrackList> _tracklist;
@@ -130,7 +130,6 @@ TEST_F(DatabaseFixture, SingleTrackListMultipleTrackRecentlyPlayed)
TrackArtistLink::create(session, track2.get(), artist2.get(), TrackArtistLinkType::Artist); TrackArtistLink::create(session, track2.get(), artist2.get(), TrackArtistLinkType::Artist);
} }
{ {
auto transaction {session.createSharedTransaction()}; auto transaction {session.createSharedTransaction()};
bool moreResults {}; bool moreResults {};
-1
View File
@@ -46,7 +46,6 @@ namespace Http
void sendRequest(std::unique_ptr<ClientRequest> request); void sendRequest(std::unique_ptr<ClientRequest> request);
private: private:
void sendNextQueuedRequest(); void sendNextQueuedRequest();
bool sendRequest(const ClientRequest& request); bool sendRequest(const ClientRequest& request);
void onClientDone(Wt::AsioWrapper::error_code ec, const Wt::Http::Message& msg); void onClientDone(Wt::AsioWrapper::error_code ec, const Wt::Http::Message& msg);