Started adding frontend notifications, fixing firefox file upload bug
This commit is contained in:
@@ -13,15 +13,16 @@ import (
|
||||
|
||||
//FullClientSettings contains all of the settings for our entire application
|
||||
type FullClientSettings struct {
|
||||
LoggingLevel logrus.Level
|
||||
LoggingOutput string
|
||||
HTTPAddr string
|
||||
Version int
|
||||
TorrentConfig torrent.Config
|
||||
TFileUploadFolder string
|
||||
SeedRatioStop float64
|
||||
PushBulletToken string
|
||||
DefaultMoveFolder string
|
||||
LoggingLevel logrus.Level
|
||||
LoggingOutput string
|
||||
HTTPAddr string
|
||||
Version int
|
||||
TorrentConfig torrent.Config
|
||||
TFileUploadFolder string
|
||||
SeedRatioStop float64
|
||||
PushBulletToken string
|
||||
DefaultMoveFolder string
|
||||
TorrentWatchFolder string
|
||||
}
|
||||
|
||||
//default is called if there is a parsing error
|
||||
@@ -71,6 +72,11 @@ func FullClientSettingsNew() FullClientSettings {
|
||||
if err != nil {
|
||||
fmt.Println("Failed creating absolute path for defaultMoveFolder", err)
|
||||
}
|
||||
torrentWatchFolder := filepath.ToSlash(viper.GetString("serverConfig.TorrentWatchFolder"))
|
||||
torrentWatchFolderAbs, err := filepath.Abs(torrentWatchFolder)
|
||||
if err != nil {
|
||||
fmt.Println("Failed creating absolute path for torrentWatchFolderAbs", err)
|
||||
}
|
||||
|
||||
dataDir := filepath.ToSlash(viper.GetString("torrentClientConfig.DownloadDir")) //Converting the string literal into a filepath
|
||||
dataDirAbs, err := filepath.Abs(dataDir) //Converting to an absolute file path
|
||||
@@ -149,14 +155,15 @@ func FullClientSettingsNew() FullClientSettings {
|
||||
}
|
||||
|
||||
Config := FullClientSettings{
|
||||
LoggingLevel: logLevel,
|
||||
LoggingOutput: logOutput,
|
||||
SeedRatioStop: seedRatioStop,
|
||||
HTTPAddr: httpAddr,
|
||||
TorrentConfig: tConfig,
|
||||
TFileUploadFolder: "uploadedTorrents",
|
||||
PushBulletToken: pushBulletToken,
|
||||
DefaultMoveFolder: defaultMoveFolderAbs,
|
||||
LoggingLevel: logLevel,
|
||||
LoggingOutput: logOutput,
|
||||
SeedRatioStop: seedRatioStop,
|
||||
HTTPAddr: httpAddr,
|
||||
TorrentConfig: tConfig,
|
||||
TFileUploadFolder: "uploadedTorrents",
|
||||
PushBulletToken: pushBulletToken,
|
||||
DefaultMoveFolder: defaultMoveFolderAbs,
|
||||
TorrentWatchFolder: torrentWatchFolderAbs,
|
||||
}
|
||||
|
||||
return Config
|
||||
|
Reference in New Issue
Block a user