storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #53 from BafDyce/config-wi

Browse Source 
Add webinterface section to config file
This commit is contained in:
Fabian Würfl 2018-06-02 17:39:47 +02:00 committed by GitHub
commit 3843fff14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configuration.ini
View File

@ -4,11 +4,15 @@ volume = 0.1
admin = Azlux;AzMobile admin = Azlux;AzMobile
music_folder = /home/dmichel/botamusique/music/ music_folder = /home/dmichel/botamusique/music/
tmp_folder = /tmp/ tmp_folder = /tmp/
web_interface = False
is_web_proxified = True
ignored_folders = tmp ignored_folders = tmp
ignored_files = Thumbs.db ignored_files = Thumbs.db
[webinterface]
enabled = False
is_web_proxified = True
listening_addr = 127.0.0.1
listening_port = 8181
[command] [command]
play_file = file play_file = file
play_url = url play_url = url

12
mumbleBot.py
View File

@ -54,14 +54,16 @@ class MumbleBot:
var.user = args.user var.user = args.user
var.music_folder = var.config.get('bot', 'music_folder') var.music_folder = var.config.get('bot', 'music_folder')
var.is_proxified = var.config.getboolean("bot", "is_web_proxified") var.is_proxified = var.config.getboolean("webinterface", "is_web_proxified")
self.exit = False self.exit = False
self.nb_exit = 0 self.nb_exit = 0
self.thread = None self.thread = None
if var.config.getboolean("bot", "web_interface"): if var.config.getboolean("webinterface", "enabled"):
wi_addr = var.config.get("webinterface", "listening_addr")
wi_port = var.config.getint("webinterface", "listening_port")
interface.init_proxy() interface.init_proxy()
tt = threading.Thread(target=start_web_interface, args=(args.wi_addr, args.wi_port)) tt = threading.Thread(target=start_web_interface, args=(wi_addr, wi_port))
tt.daemon = True tt.daemon = True
tt.start() tt.start()
@ -355,10 +357,6 @@ if __name__ == '__main__':
parser.add_argument("-p", "--port", dest="port", type=int, default=64738, help="Port for the mumble server") parser.add_argument("-p", "--port", dest="port", type=int, default=64738, help="Port for the mumble server")
parser.add_argument("-c", "--channel", dest="channel", type=str, default="", help="Default chanel for the bot") parser.add_argument("-c", "--channel", dest="channel", type=str, default="", help="Default chanel for the bot")
# web interface arguments
parser.add_argument('--wi-port', dest='wi_port', type=int, default=8181, help='Listening port of the web interface')
parser.add_argument('--wi-addr', dest='wi_addr', type=str, default=None, help='Listening address of the web interface')
args = parser.parse_args() args = parser.parse_args()
config = configparser.ConfigParser(interpolation=None) config = configparser.ConfigParser(interpolation=None)
parsed_configs = config.read(args.config, encoding='latin-1') parsed_configs = config.read(args.config, encoding='latin-1')