kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

Move default-plugins, debug gui

Browse Source
This commit is contained in:
Arinerron 2018-05-06 16:00:28 -07:00
parent 54a3557fd0
commit 07eb512977
No known key found for this signature in database
GPG Key ID: 99383627861C62F0
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
onionr/onionr.py
View File

@ -110,9 +110,9 @@ class Onionr:
# Copy default plugins into plugins folder # Copy default plugins into plugins folder
if not os.path.exists(plugins.get_plugins_folder()): if not os.path.exists(plugins.get_plugins_folder()):
if os.path.exists('default-plugins/'): if os.path.exists('static-data/default-plugins/'):
names = [f for f in os.listdir("default-plugins/") if not os.path.isfile(f)] names = [f for f in os.listdir("static-data/default-plugins/") if not os.path.isfile(f)]
shutil.copytree('default-plugins/', plugins.get_plugins_folder()) shutil.copytree('static-data/default-plugins/', plugins.get_plugins_folder())
# Enable plugins # Enable plugins
for name in names: for name in names:
@ -216,7 +216,7 @@ class Onionr:
} }
# initialize plugins # initialize plugins
events.event('init', onionr = self) events.event('init', onionr = self, threaded = False)
command = '' command = ''
try: try:

9
onionr/default-plugins/gui/main.py → onionr/static-data/default_plugins/gui/main.py
View File

@ -74,8 +74,9 @@ def openGUI():
nodeInfo = tkinter.Frame(root) nodeInfo = tkinter.Frame(root)
keyInfo = tkinter.Frame(root) keyInfo = tkinter.Frame(root)
print(pluginapi.get_onionr().get_hostname()) hostname = pluginapi.get_onionr().get_hostname()
idText = pluginapi.get_onionr().get_hostname() logger.debug('hostname: %s' % hostname)
idText = hostname
idEntry = tkinter.Entry(nodeInfo) idEntry = tkinter.Entry(nodeInfo)
tkinter.Label(nodeInfo, text="Node Address: ").pack(side=tkinter.LEFT) tkinter.Label(nodeInfo, text="Node Address: ").pack(side=tkinter.LEFT)
@ -100,14 +101,14 @@ def openGUI():
sendEntry.pack(side=tkinter.TOP, pady=5) sendEntry.pack(side=tkinter.TOP, pady=5)
sendBtn.pack(side=tkinter.TOP) sendBtn.pack(side=tkinter.TOP)
listbox = tkinter.Listbox(root, yscrollcommand=tkinter.scrollbar.set, height=15) listbox = tkinter.Listbox(root, yscrollcommand=tkinter.Scrollbar.set, height=15)
listbox.pack(fill=tkinter.BOTH, pady=25) listbox.pack(fill=tkinter.BOTH, pady=25)
daemonStatus = tkinter.Label(root, text="Onionr Daemon Status: unknown") daemonStatus = tkinter.Label(root, text="Onionr Daemon Status: unknown")
daemonStatus.pack() daemonStatus.pack()
scrollbar.config(command=tkinter.listbox.yview) scrollbar.config(command=tkinter.Listbox.yview)
root.after(2000, update) root.after(2000, update)
root.mainloop() root.mainloop()

0
onionr/default-plugins/pluginmanager/main.py → onionr/static-data/default_plugins/pluginmanager/main.py
View File