Merge branch 'SSSSeb-seed'

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::
 

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);

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);

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;

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"  \