Skip to content

Commit

Permalink
* r503 release sp build-20029
Browse files Browse the repository at this point in the history
  • Loading branch information
pavel-pimenov committed Oct 18, 2016
1 parent 913cd2a commit f8a789d
Show file tree
Hide file tree
Showing 41 changed files with 158 additions and 1,216 deletions.
4 changes: 2 additions & 2 deletions client/CFlylinkDBManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2349,8 +2349,8 @@ void CFlylinkDBManager::delete_torrent_resume(const libtorrent::sha1_hash& p_sha
{
m_delete_resume_torrent.init(m_flySQLiteDB,
"delete from queue_db.fly_queue_torrent where sha1=?");
m_insert_resume_torrent->bind(1, p_sha1.data(), p_sha1.size(), SQLITE_STATIC);
m_insert_resume_torrent->executenonquery();
m_delete_resume_torrent->bind(1, p_sha1.data(), p_sha1.size(), SQLITE_STATIC);
m_delete_resume_torrent->executenonquery();
}
catch (const database_error& e)
{
Expand Down
9 changes: 2 additions & 7 deletions client/DownloadManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ for (auto i: m_torrents)
int l_count = 10; // TODO
while (m_torrent_resume_count == 0 && l_count-- > 0)
{
Sleep(1000);
Sleep(1000);
}
m_torrent_session.reset();
}
Expand Down Expand Up @@ -1005,10 +1005,6 @@ for (lt::alert const * a : alerts)
if (i->info_hash() == l_delete->info_hash)
break;
}
if (i == m_torrents.end())
{
break;
}
}
if (i != m_torrents.end())
{
Expand All @@ -1017,7 +1013,6 @@ for (lt::alert const * a : alerts)
}
CFlylinkDBManager::getInstance()->delete_torrent_resume(l_delete->info_hash);
fly_fire1(DownloadManagerListener::RemoveToken(), l_delete->info_hash.to_string());

}
if (const auto l_delete = lt::alert_cast<lt::torrent_delete_failed_alert>(a))
{
Expand Down Expand Up @@ -1134,7 +1129,7 @@ for (lt::alert const * a : alerts)
continue;
}
int l_pos = 1;
for (const auto j : st->status)
for (const auto j : st->status)
{
lt::torrent_status const& s = j;
std::string l_log = "[" + Util::toString(l_pos) + "] Status: " + torrent_state(s.state) + " [ " + s.save_path + "\\" + s.name
Expand Down
2 changes: 1 addition & 1 deletion client/SSLSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SSLSocketException : public SocketException
#endif // _DEBUG
SSLSocketException(int aError) noexcept :
SocketException(aError) { }
virtual ~SSLSocketException() throw() { }
virtual ~SSLSocketException() noexcept { }
};

class SSLSocket : public Socket
Expand Down
1 change: 1 addition & 0 deletions client/TransferData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ void TransferData::init(libtorrent::torrent_status const& s)
m_num_seeds = s.num_seeds;
m_num_peers = s.num_peers;
m_is_torrent = true;
m_is_seeding = s.state == libtorrent::torrent_status::seeding;
//calc_percent();
m_percent = s.progress_ppm / 10000;
///l_td.m_status_string += _T("[Torrent] Peers:") + Util::toStringT(s.num_peers) + _T(" Seeds:") + Util::toStringT(s.num_seeds) + _T(" ");
Expand Down
3 changes: 2 additions & 1 deletion client/TransferData.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class TransferData
m_pos(0), m_start_pos(0), m_start(0),
m_second_left(0), m_percent(0),
m_type(0), m_size(0), m_token(p_token),
m_speed(0), m_num_seeds(0), m_num_peers(0), m_is_torrent(false)
m_speed(0), m_num_seeds(0), m_num_peers(0), m_is_torrent(false), m_is_seeding(false)
{
}
void init(libtorrent::torrent_status const& s);
Expand All @@ -41,6 +41,7 @@ class TransferData
int m_num_seeds;
int m_num_peers;
bool m_is_torrent;
bool m_is_seeding;
string m_torrent_file_path;
libtorrent::sha1_hash m_sha1;

Expand Down
4 changes: 2 additions & 2 deletions client/WildcardsReg.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ class WildcardsEss
/** work with the pattern */
tstring _filter;

inline tstring _lowercase(const tstring& str) throw()
tstring _lowercase(const tstring& str) noexcept
{
tstring res(str.length(), 0);
transform(str.begin(), str.end(), res.begin(), _totlower);
return res;
};
}
};

}
Expand Down
30 changes: 0 additions & 30 deletions compiled/Skin/Skin.xml

This file was deleted.

3 changes: 3 additions & 0 deletions compiled/readme_changelog_lite.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
\'d2\'e0\'ea\'e6\'e5 \'e0\'ed\'ee\'ed\'e8\'ec\'ed\'ee \'ec\'ee\'e6\'ed\'ee \'e2\'fb\'f1\'ea\'e0\'e7\'fb\'e2\'e0\'f2\'fc \'e7\'e0\'ec\'e5\'f7\'e0\'ed\'e8\'ff \'ee \'ef\'f0\'ee\'e3\'f0\'e0\'ec\'ec\'e5 \'ed\'e0 \'f5\'e0\'e1\'e5 \'ef\'ee\'e4\'e4\'e5\'e6\'ea\'e8\par
dchub://dc.fly-server.ru\par
\par
\lang1033\b\f1\fs20 ===\lang1049\f0 \lang1033\f1 r503\lang1049\f0 \lang1033\f1 build 20029 ===\par
\lang1049\b0\f0\fs16 * \'c8\'f1\'ef\'f0\'e0\'e2\'eb\'e5\'ed\'e0 \'ee\'f8\'e8\'e1\'ea\'e0 \'e7\'e0\'ef\'f0\'ee\'f1\'e0 \'f3\'e4\'e0\'eb\'e5\'ed\'e8\'ff \'f2\'ee\'f0\'f0\'e5\'ed\'f2\'e0 - \'ef\'ee\'f1\'eb\'e5 \'ef\'e5\'f0\'e5\'e7\'e0\'ef\'f3\'f1\'ea\'e0 \'f2\'ee\'f0\'f0\'e5\'ed\'f2 \'e2\'ee\'e7\'e2\'f0\'e0\'f9\'e0\'eb\'f1\'ff \'ed\'e0 \'f0\'e0\'e7\'e4\'e0\'f7\'f3 (\'f1\'ef\'e0\'f1\'e8\'e1\'ee Dimon83)\par
* SQLite Release 3.15.0\par
\lang1033\b\f1\fs20 ===\lang1049\f0 \lang1033\f1 r503\lang1049\f0 \lang1033\f1 build 20024 ===\par
\lang1049\b0\f0\fs16 * \'c4\'ee\'e1\'e0\'e2\'eb\'e5\'ed\'ee \'e2\'ee\'f1\'f1\'f2\'e0\'ed\'ee\'e2\'eb\'e5\'ed\'e8\'e5 \'f1\'e8\'e4\'e8\'f0\'ee\'e2\'e0\'ed\'e8\'ff \'f2\'ee\'f0\'f0\'e5\'ed\'f2\'ee\'e2 \'ef\'ee\'f1\'eb\'e5 \'ef\'e5\'f0\'e5\'e7\'e0\'ef\'f3\'f1\'ea\'e0 \'f4\'eb\'e0\'e9\'eb\'e8\'ed\'ea\'e0.\par
\'e4\'e0\'ed\'ed\'fb\'e5 \'f1\'ee\'f5\'f0\'e0\'ed\'ff\'fe\'f2\'f1\'ff \'e2 \'c1\'c4 sqlite FlylinkDC_queue.sqlite\par
Expand Down
205 changes: 0 additions & 205 deletions doc/Rules.txt

This file was deleted.

Loading

0 comments on commit f8a789d

Please sign in to comment.