Merge 73a20c6cdd
into 6c1cee5f79
This commit is contained in:
commit
8a5d0d914b
|
@ -1357,6 +1357,10 @@ void Application::Impl::on_prefs_changed(tr_quark const key)
|
|||
tr_sessionSetDeleteSource(tr, gtr_pref_flag_get(key));
|
||||
break;
|
||||
|
||||
case TR_KEY_torrent_complete_verify_enabled:
|
||||
tr_sessionSetCompleteVerifyEnabled(tr, gtr_pref_flag_get(key));
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -382,6 +382,7 @@ auto constexpr MyStatic = std::array<std::string_view, TR_N_KEYS>{
|
|||
"torrent-complete-notification-enabled"sv,
|
||||
"torrent-complete-sound-command"sv,
|
||||
"torrent-complete-sound-enabled"sv,
|
||||
"torrent-complete-verify-enabled"sv,
|
||||
"torrent-duplicate"sv,
|
||||
"torrent-get"sv,
|
||||
"torrent-set"sv,
|
||||
|
|
|
@ -383,6 +383,7 @@ enum
|
|||
TR_KEY_torrent_complete_notification_enabled,
|
||||
TR_KEY_torrent_complete_sound_command,
|
||||
TR_KEY_torrent_complete_sound_enabled,
|
||||
TR_KEY_torrent_complete_verify_enabled,
|
||||
TR_KEY_torrent_duplicate,
|
||||
TR_KEY_torrent_get,
|
||||
TR_KEY_torrent_set,
|
||||
|
|
|
@ -1618,6 +1618,15 @@ size_t tr_sessionGetCacheLimit_MB(tr_session const* session)
|
|||
|
||||
// ---
|
||||
|
||||
void tr_sessionSetCompleteVerifyEnabled(tr_session* session, bool enabled)
|
||||
{
|
||||
TR_ASSERT(session != nullptr);
|
||||
|
||||
session->settings_.torrent_complete_verify_enabled = enabled;
|
||||
}
|
||||
|
||||
// ---
|
||||
|
||||
void tr_session::setDefaultTrackers(std::string_view trackers)
|
||||
{
|
||||
auto const oldval = default_trackers_;
|
||||
|
|
|
@ -391,6 +391,7 @@ public:
|
|||
bool speed_limit_down_enabled = false;
|
||||
bool speed_limit_up_enabled = false;
|
||||
bool tcp_enabled = true;
|
||||
bool torrent_complete_verify_enabled = false;
|
||||
bool utp_enabled = true;
|
||||
double ratio_limit = 2.0;
|
||||
size_t cache_size_mbytes = 4U;
|
||||
|
@ -483,6 +484,7 @@ public:
|
|||
{ TR_KEY_start_added_torrents, &should_start_added_torrents },
|
||||
{ TR_KEY_tcp_enabled, &tcp_enabled },
|
||||
{ TR_KEY_torrent_added_verify_mode, &torrent_added_verify_mode },
|
||||
{ TR_KEY_torrent_complete_verify_enabled, &torrent_complete_verify_enabled },
|
||||
{ TR_KEY_trash_original_torrent_files, &should_delete_source_torrents },
|
||||
{ TR_KEY_umask, &umask },
|
||||
{ TR_KEY_upload_slots_per_torrent, &upload_slots_per_torrent },
|
||||
|
@ -902,6 +904,11 @@ public:
|
|||
return settings().torrent_added_verify_mode == TR_VERIFY_ADDED_FULL;
|
||||
}
|
||||
|
||||
[[nodiscard]] constexpr auto shouldFullyVerifyCompleteTorrents() const noexcept
|
||||
{
|
||||
return settings().torrent_complete_verify_enabled;
|
||||
}
|
||||
|
||||
[[nodiscard]] constexpr auto shouldDeleteSource() const noexcept
|
||||
{
|
||||
return settings().should_delete_source_torrents;
|
||||
|
@ -1145,6 +1152,7 @@ private:
|
|||
friend void tr_sessionSetAntiBruteForceEnabled(tr_session* session, bool is_enabled);
|
||||
friend void tr_sessionSetAntiBruteForceThreshold(tr_session* session, int max_bad_requests);
|
||||
friend void tr_sessionSetCacheLimit_MB(tr_session* session, size_t mbytes);
|
||||
friend void tr_sessionSetCompleteVerifyEnabled(tr_session* session, bool enabled);
|
||||
friend void tr_sessionSetDHTEnabled(tr_session* session, bool enabled);
|
||||
friend void tr_sessionSetDeleteSource(tr_session* session, bool delete_source);
|
||||
friend void tr_sessionSetEncryption(tr_session* session, tr_encryption_mode mode);
|
||||
|
|
|
@ -1767,6 +1767,12 @@ void tr_torrent::recheck_completeness()
|
|||
bool const recent_change = bytes_downloaded_.during_this_session() != 0U;
|
||||
bool const was_running = is_running();
|
||||
|
||||
if (new_completeness != TR_LEECH && was_running && session->shouldFullyVerifyCompleteTorrents())
|
||||
{
|
||||
tr_torrentVerify(this);
|
||||
return;
|
||||
}
|
||||
|
||||
if (recent_change)
|
||||
{
|
||||
tr_logAddTraceTor(
|
||||
|
@ -1778,10 +1784,11 @@ void tr_torrent::recheck_completeness()
|
|||
}
|
||||
|
||||
completeness_ = new_completeness;
|
||||
session->close_torrent_files(id());
|
||||
|
||||
if (is_done())
|
||||
{
|
||||
session->close_torrent_files(id());
|
||||
|
||||
if (recent_change)
|
||||
{
|
||||
tr_announcerTorrentCompleted(this);
|
||||
|
|
|
@ -632,7 +632,7 @@ size_t tr_sessionGetQueueStalledMinutes(tr_session const* session);
|
|||
Stalled torrents are left running but are not counted by `tr_sessionGetQueueSize()`. */
|
||||
void tr_sessionSetQueueStalledMinutes(tr_session* session, int minutes);
|
||||
|
||||
/** @return true if we're torrents idle for over N minutes will be flagged as 'stalled' */
|
||||
/** @return true if torrents idle for over N minutes will be flagged as 'stalled' */
|
||||
bool tr_sessionGetQueueStalledEnabled(tr_session const* session);
|
||||
|
||||
/** @brief Set whether or not to count torrents idle for over N minutes as 'stalled' */
|
||||
|
@ -643,10 +643,14 @@ void tr_sessionSetQueueStartCallback(tr_session* session, void (*callback)(tr_se
|
|||
|
||||
// ---
|
||||
|
||||
/** @brief Set whether or not to verify data when torrent download is complete */
|
||||
void tr_sessionSetCompleteVerifyEnabled(tr_session* session, bool enabled);
|
||||
|
||||
// ---
|
||||
|
||||
/**
|
||||
* Load all the torrents in the session's torrent folder.
|
||||
* This can be used at startup to kickstart all the torrents
|
||||
* from the previous session.
|
||||
* This can be used at startup to kickstart all the torrents from the previous session.
|
||||
*
|
||||
* @return the number of torrents in the session
|
||||
*/
|
||||
|
|
|
@ -1076,6 +1076,17 @@
|
|||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
</textField>
|
||||
<button verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Evu-rf-BPM">
|
||||
<rect key="frame" x="76" y="99" width="257" height="18"/>
|
||||
<buttonCell key="cell" type="check" title="Verify data when download completes" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="wM8-cD-WAB">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="setVerifyDataOnCompletion:" target="-2" id="bST-Mi-KsG"/>
|
||||
<binding destination="365" name="value" keyPath="values.VerifyDataOnCompletion" id="zRv-3f-byJ"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="265" firstAttribute="centerY" secondItem="267" secondAttribute="centerY" id="1ye-ZZ-IHj"/>
|
||||
|
@ -1084,9 +1095,9 @@
|
|||
<constraint firstItem="264" firstAttribute="leading" secondItem="267" secondAttribute="trailing" constant="8" symbolic="YES" id="4kz-Pg-Gs1"/>
|
||||
<constraint firstItem="607" firstAttribute="leading" secondItem="264" secondAttribute="leading" id="5Ok-rt-vHk"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="606" secondAttribute="trailing" constant="20" symbolic="YES" id="5eC-JW-9sl"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Evu-rf-BPM" secondAttribute="trailing" constant="20" symbolic="YES" id="5fw-Hm-Ccy"/>
|
||||
<constraint firstItem="1959" firstAttribute="centerY" secondItem="1958" secondAttribute="centerY" id="68T-YZ-SBC"/>
|
||||
<constraint firstItem="263" firstAttribute="leading" secondItem="257" secondAttribute="trailing" constant="4" id="6mh-gV-D2p"/>
|
||||
<constraint firstItem="1298" firstAttribute="top" secondItem="639" secondAttribute="bottom" constant="20" symbolic="YES" id="9My-zU-rE4"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1298" secondAttribute="trailing" constant="20" symbolic="YES" id="Ac7-Sc-pnt"/>
|
||||
<constraint firstItem="606" firstAttribute="centerY" secondItem="607" secondAttribute="centerY" id="Ao0-Ui-5T8"/>
|
||||
<constraint firstItem="638" firstAttribute="leading" secondItem="636" secondAttribute="trailing" constant="4" id="Ap1-e8-iyn"/>
|
||||
|
@ -1099,6 +1110,7 @@
|
|||
<constraint firstItem="1959" firstAttribute="leading" secondItem="1958" secondAttribute="trailing" constant="4" id="GBM-Dv-fBO"/>
|
||||
<constraint firstItem="604" firstAttribute="centerY" secondItem="607" secondAttribute="centerY" id="GhR-LK-fsr"/>
|
||||
<constraint firstItem="1299" firstAttribute="leading" secondItem="264" secondAttribute="leading" id="H9J-7l-cRN"/>
|
||||
<constraint firstItem="1301" firstAttribute="top" secondItem="Evu-rf-BPM" secondAttribute="bottom" constant="20" id="HFz-O8-K60"/>
|
||||
<constraint firstItem="337" firstAttribute="leading" secondItem="264" secondAttribute="leading" id="I19-F3-F5L"/>
|
||||
<constraint firstItem="1969" firstAttribute="leading" secondItem="1959" secondAttribute="trailing" constant="4" id="K65-ud-KmG"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="268" secondAttribute="trailing" constant="20" symbolic="YES" id="Kd0-RO-CDI"/>
|
||||
|
@ -1117,6 +1129,7 @@
|
|||
<constraint firstItem="2043" firstAttribute="leading" secondItem="264" secondAttribute="leading" id="WV1-Zh-WyT"/>
|
||||
<constraint firstItem="264" firstAttribute="centerY" secondItem="267" secondAttribute="centerY" id="XGp-eS-3xI"/>
|
||||
<constraint firstItem="257" firstAttribute="leading" secondItem="337" secondAttribute="trailing" constant="4" id="XHe-qE-pza"/>
|
||||
<constraint firstItem="Evu-rf-BPM" firstAttribute="top" secondItem="639" secondAttribute="bottom" constant="4" id="ZMf-g5-ItF"/>
|
||||
<constraint firstItem="267" firstAttribute="leading" secondItem="4cS-54-dlc" secondAttribute="leading" id="ZXE-R2-LbH"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="265" secondAttribute="trailing" constant="20" symbolic="YES" id="a3K-zJ-Yl9"/>
|
||||
<constraint firstItem="268" firstAttribute="leading" secondItem="264" secondAttribute="leading" constant="20" id="aMi-iz-dj7"/>
|
||||
|
@ -1135,6 +1148,7 @@
|
|||
<constraint firstItem="638" firstAttribute="centerY" secondItem="639" secondAttribute="centerY" id="lZM-1c-Rel"/>
|
||||
<constraint firstItem="1300" firstAttribute="top" secondItem="1299" secondAttribute="bottom" constant="-18" id="muf-Lk-n7G"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="638" secondAttribute="trailing" constant="20" symbolic="YES" id="nga-Zx-3XL"/>
|
||||
<constraint firstItem="Evu-rf-BPM" firstAttribute="leading" secondItem="264" secondAttribute="leading" id="ocE-4C-4Pc"/>
|
||||
<constraint firstItem="1300" firstAttribute="centerY" secondItem="1299" secondAttribute="centerY" id="pg2-8t-utk"/>
|
||||
<constraint firstItem="263" firstAttribute="centerY" secondItem="337" secondAttribute="centerY" id="pnn-34-PEE"/>
|
||||
<constraint firstAttribute="bottom" secondItem="2048" secondAttribute="bottom" constant="4" id="qBS-oe-tyG"/>
|
||||
|
|
|
@ -505,6 +505,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
|
|||
TR_KEY_incomplete_dir,
|
||||
[_fDefaults stringForKey:@"IncompleteDownloadFolder"].stringByExpandingTildeInPath.UTF8String);
|
||||
tr_variantDictAddBool(&settings, TR_KEY_incomplete_dir_enabled, [_fDefaults boolForKey:@"UseIncompleteDownloadFolder"]);
|
||||
tr_variantDictAddBool(&settings, TR_KEY_torrent_complete_verify_enabled, [_fDefaults boolForKey:@"VerifyDataOnCompletion"]);
|
||||
tr_variantDictAddBool(&settings, TR_KEY_lpd_enabled, [_fDefaults boolForKey:@"LocalPeerDiscoveryGlobal"]);
|
||||
tr_variantDictAddInt(&settings, TR_KEY_message_level, TR_LOG_DEBUG);
|
||||
tr_variantDictAddInt(&settings, TR_KEY_peer_limit_global, [_fDefaults integerForKey:@"PeersTotal"]);
|
||||
|
|
|
@ -916,6 +916,12 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
|
|||
[self updateShowAddMagnetWindowField];
|
||||
}
|
||||
|
||||
- (IBAction)setVerifyDataOnCompletion:(id)sender
|
||||
{
|
||||
bool enabled = [self.fDefaults boolForKey:@"VerifyDataOnCompletion"];
|
||||
tr_sessionSetCompleteVerifyEnabled(self.fHandle, enabled);
|
||||
}
|
||||
|
||||
- (void)folderSheetShow:(id)sender
|
||||
{
|
||||
NSOpenPanel* panel = [NSOpenPanel openPanel];
|
||||
|
|
Loading…
Reference in New Issue