diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-07-18 17:42:11 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-07-18 17:42:11 +0900 |
| commit | 1ab2b9969255d3bda778e88811cc8dc86ae403a2 (patch) | |
| tree | c1e0981493686b87b778105d2dc86b229667b6fd | |
| parent | 8096690418f0343de22aaaf4315a044966631cc8 (diff) | |
| parent | 66976ea4b1a1cf01669bfa1d5f57fc19456bb78a (diff) | |
Merge branch 'SSSSeb-seed'
| -rw-r--r-- | doc/manual-src/en/aria2c.rst | 3 | ||||
| -rw-r--r-- | src/BtSetup.cc | 5 | ||||
| -rw-r--r-- | src/OptionHandlerFactory.cc | 2 | ||||
| -rw-r--r-- | src/prefs.h | 2 | ||||
| -rw-r--r-- | src/usage_text.h | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/doc/manual-src/en/aria2c.rst b/doc/manual-src/en/aria2c.rst index 0086ac51..83182860 100644 --- a/doc/manual-src/en/aria2c.rst +++ b/doc/manual-src/en/aria2c.rst @@ -939,7 +939,8 @@ BitTorrent Specific Options .. option:: --seed-time=<MINUTES> - Specify seeding time in minutes. Also see the :option:`--seed-ratio` option. + Specify seeding time in (fractional) minutes. Also see the + :option:`--seed-ratio` option. .. note:: diff --git a/src/BtSetup.cc b/src/BtSetup.cc index e541fd7e..63f20569 100644 --- a/src/BtSetup.cc +++ b/src/BtSetup.cc @@ -157,8 +157,9 @@ void BtSetup::setup(std::vector<std::unique_ptr<Command>>& commands, if (!metadataGetMode) { auto unionCri = make_unique<UnionSeedCriteria>(); if (option->defined(PREF_SEED_TIME)) { - unionCri->addSeedCriteria(make_unique<TimeSeedCriteria>( - std::chrono::seconds(option->getAsInt(PREF_SEED_TIME) * 60))); + unionCri->addSeedCriteria( + make_unique<TimeSeedCriteria>(std::chrono::seconds( + static_cast<int>(option->getAsDouble(PREF_SEED_TIME) * 60)))); } { double ratio = option->getAsDouble(PREF_SEED_RATIO); diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index 595f9cd9..9d5a9489 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -1799,7 +1799,7 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler(PREF_SEED_TIME, TEXT_SEED_TIME, + OptionHandler* op(new FloatNumberOptionHandler(PREF_SEED_TIME, TEXT_SEED_TIME, NO_DEFAULT_VALUE, 0)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); diff --git a/src/prefs.h b/src/prefs.h index 68eb408f..9188f656 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -420,7 +420,7 @@ extern PrefPtr PREF_LISTEN_PORT; extern PrefPtr PREF_FOLLOW_TORRENT; // values: 1*digit *( (,|-) 1*digit) extern PrefPtr PREF_SELECT_FILE; -// values: 1*digit +// values: 1*digit ['.' [ 1*digit ] ] extern PrefPtr PREF_SEED_TIME; // values: 1*digit ['.' [ 1*digit ] ] extern PrefPtr PREF_SEED_RATIO; diff --git a/src/usage_text.h b/src/usage_text.h index 6c30f84a..43ad21c0 100644 --- a/src/usage_text.h +++ b/src/usage_text.h @@ -313,8 +313,8 @@ " To limit the overall upload speed, use\n" \ " --max-overall-upload-limit option.") #define TEXT_SEED_TIME \ - _(" --seed-time=MINUTES Specify seeding time in minutes. Also see the\n" \ - " --seed-ratio option.") + _(" --seed-time=MINUTES Specify seeding time in (fractional) minutes.\n" \ + " Also see the --seed-ratio option.") #define TEXT_SEED_RATIO \ _(" --seed-ratio=RATIO Specify share ratio. Seed completed torrents\n" \ " until share ratio reaches RATIO.\n" \ |