Adding a few settings to webui, cleanup of unneeded func

deranjer · May 27, 2018 · cbfcba4 · cbfcba4
1 parent d15bb97
commit cbfcba4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/engine/engine.go b/engine/engine.go
@@ -129,11 +129,6 @@ func readTorrentFileFromDB(element *Storage.TorrentLocal, tclient *torrent.Clien
 	return singleTorrent, nil
 }
 
-//StartTorrents attempts to start torrents by adding them to the active torrents, then the queue, and by increasing their connections (if they were stopped)
-func StartTorrents(clientTorrent *torrent.Client, torrentHashes []string, torrentQueues Storage.TorrentQueues) {
-
-}
-
 //AddTorrent creates the storage.db entry and starts A NEW TORRENT and adds to the running torrent array
 func AddTorrent(clientTorrent *torrent.Torrent, torrentLocalStorage Storage.TorrentLocal, db *storm.DB, torrentType, torrentFilePathAbs, torrentStoragePath, labelValue string, config Settings.FullClientSettings) {
 	timedOut := timeOutInfo(clientTorrent, 45) //seeing if adding the torrent times out (giving 45 seconds)
@@ -233,7 +228,6 @@ func CreateInitialTorrentArray(tclient *torrent.Client, TorrentLocalArray []*Sto
 				AddTorrentToQueue(singleTorrentFromStorage, singleTorrent, db)
 			}
 		} else { //If we already have a queue set up then assign torrents to queue
-			Logger.Info("Existing Queue found in database, reading it in")
 			if singleTorrentFromStorage.TorrentStatus == "Queued" {
 				AddTorrentToQueue(singleTorrentFromStorage, singleTorrent, db)
 			} else {

diff --git a/...rrentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/clientSettingsTab.js b/...rrentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/clientSettingsTab.js
@@ -35,6 +35,7 @@ class ClientSettingsTab extends React.PureComponent {
                     <Paper className={classes.paper}>HTTP Port: <span className={classes.floatRight}>{this.props.settingsFile["HTTPAddr"]} </span> </Paper>
                     <Paper className={classes.paper}>Use Proxy: <span className={classes.floatRight}>{String(this.props.settingsFile["UseProxy"])} </span> </Paper>
                     <Paper className={classes.paper}>Base URL: <span className={classes.floatRight}>{this.props.settingsFile["BaseURL"]} </span> </Paper>
+                    <Paper className={classes.paper}>Max Active Torrents: <span className={classes.floatRight}>{this.props.settingsFile["MaxActiveTorrents"]} </span> </Paper>
 
 
                 </Grid>

diff --git a/...rentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/loggingSettingsTab.js b/...rentWebUI/src/TopMenu/Modals/SettingsModal/SettingsModalContentTabs/loggingSettingsTab.js
@@ -53,7 +53,7 @@ class LoggingSettingsTab extends React.Component {
             <Grid container spacing={8}>
                 <Grid item xs={12} sm={4}>
                     <Paper className={classes.paper}>Logging Output: <span className={classes.floatRight}>{this.props.settingsFile["LoggingOutput"]} </span></Paper>
-                    <Paper className={classes.paper}>Logging Level: <span className={classes.floatRight}>{logLevel} </span> </Paper>
+                    <Paper className={classes.paper}>Logging Level: <span className={classes.floatRight}>{this.props.settingsFile["LoggingLevel"]} </span> </Paper>
 
 
                 </Grid>

diff --git a/public/static/js/bundle.js b/public/static/js/bundle.js
@@ -109784,6 +109784,18 @@ var ClientSettingsTab = function (_React$PureComponent) {
                                 ' '
                             ),
                             ' '
+                        ),
+                        _react2.default.createElement(
+                            _Paper2.default,
+                            { className: classes.paper },
+                            'Max Active Torrents: ',
+                            _react2.default.createElement(
+                                'span',
+                                { className: classes.floatRight },
+                                this.props.settingsFile["MaxActiveTorrents"],
+                                ' '
+                            ),
+                            ' '
                         )
                     ),
                     _react2.default.createElement(
@@ -109955,7 +109967,7 @@ var LoggingSettingsTab = function (_React$Component) {
                             _react2.default.createElement(
                                 'span',
                                 { className: classes.floatRight },
-                                logLevel,
+                                this.props.settingsFile["LoggingLevel"],
                                 ' '
                             ),
                             ' '