haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4928 from gpatel-fr/updaterumpspy3

Browse Source 
updates rumps to python3, add icon normal-warning, set rumps as default
This commit is contained in:
gpatel-fr
2023-05-02 12:18:24 +02:00
committed by GitHub
parent 8f53308a83 93ef1a1a8c
commit 02a2beeabc
6 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
+3
View File
@@ -158,6 +158,9 @@
<EmbeddedResource Include="OSX Icons\normal-error.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="OSX Icons\normal-warning.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="OSX Icons\normal-pause.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
Duplicati/GUI/Duplicati.GUI.TrayIcon/OSX Icons/normal-warning.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 948 B

Duplicati/GUI/Duplicati.GUI.TrayIcon/OSXTrayHost/osx-trayicon-rumps.py
+20 -20
View File
@@ -41,7 +41,7 @@ def transform_app_type(toForeground):
def item_clicked(sender):
for k in lookup:
if lookup[k].title == sender.title:
print "click:%s" % k
print("click:%s" % k)
sys.stdout.flush()
@@ -49,7 +49,7 @@ def parsemenus(cfg):
menuitems = []
for n in cfg["Menus"]:
mn = rumps.MenuItem(n["Text"])
if n.has_key("Enabled") and not n["Enabled"]:
if "Enabled" in n and not n["Enabled"]:
mn.set_callback(None)
else:
mn.set_callback(item_clicked)
@@ -69,7 +69,7 @@ def get_input():
if line == '':
continue
print "info:Read %s" % line
print("info:Read %s" % line)
sys.stdout.flush()
cfg = None
try:
@@ -78,27 +78,27 @@ def get_input():
pass
if cfg == None:
print "info:Unable to parse line"
print("info:Unable to parse line")
sys.stdout.flush()
continue
if cfg.has_key("Action"):
print "info:Running %s" % cfg["Action"]
if "Action" in cfg:
print("info:Running %s" % cfg["Action"])
sys.stdout.flush()
if cfg["Action"] == "setmenu":
menu = cfg["Menu"]
if lookup.has_key(menu["Key"]):
if menu["Key"] in lookup:
lookup[menu["Key"]].title = menu["Text"]
if menu.has_key("Enabled") and not menu["Enabled"]:
if "Enabled" in menu and not menu["Enabled"]:
lookup[menu["Key"]].set_callback(None)
else:
lookup[menu["Key"]].set_callback(item_clicked)
app.menu.update([])
else:
print "warn:Key not found %s" % cfg["Action"]
print("warn:Key not found %s" % cfg["Action"])
sys.stdout.flush()
@@ -106,7 +106,7 @@ def get_input():
elif cfg["Action"] == "setmenus":
app.menu.clear()
app.menu = parsemenus(cfg)
print "info:Updated menus"
print("info:Updated menus")
sys.stdout.flush()
elif cfg["Action"] == "seticon":
@@ -119,11 +119,11 @@ def get_input():
img.setTemplate_(True)
app.icon = img
print "info:Image updated"
print("info:Image updated")
sys.stdout.flush()
except:
print "warn:Failed to set image"
print("warn:Failed to set image")
sys.stdout.flush()
elif cfg["Action"] == "setappicon":
@@ -136,11 +136,11 @@ def get_input():
#img.setSize_((21, 21))
NSApplication.sharedApplication().setApplicationIconImage_(img)
print "info:AppImage updated"
print("info:AppImage updated")
sys.stdout.flush()
except:
print "warn:Failed to set image"
print("warn:Failed to set image")
sys.stdout.flush()
elif cfg["Action"] == "shutdown":
@@ -159,18 +159,18 @@ def get_input():
playSound = True
image = None
if cfg.has_key("SubTitle"):
if "SubTitle" in cfg:
subtitle = cfg["SubTitle"]
if cfg.has_key("PlaySound"):
if "PlaySound" in cfg:
playSound = cfg["PlaySound"]
if cfg.has_key("Image"):
if "Image" in cfg:
try:
raw = base64.b64decode(cfg["Image"])
data = NSData.dataWithBytes_length_(raw, len(raw))
image = NSImage.alloc().initWithData_(data)
except:
print "warn:Failed to decode image"
print("warn:Failed to decode image")
sys.stdout.flush()
rumps.notification(cfg["Title"], subtitle, cfg["Message"], sound=playSound, image=image)
@@ -182,10 +182,10 @@ def get_input():
pass
rumps.quit_application()
print "info:Shutdown"
print("info:Shutdown")
sys.stdout.flush()
print "info:Stdin close"
print("info:Stdin close")
sys.stdout.flush()
sys.stdin.close()
Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace Duplicati.GUI.TrayIcon
private static string GetDefaultToolKit()
{
if (Platform.IsClientOSX)
return TOOLKIT_COCOA;
return TOOLKIT_RUMPS;
#if __WindowsGTK__ || ENABLE_GTK
if (Platform.IsClientPosix)
Duplicati/GUI/Duplicati.GUI.TrayIcon/RumpsRunner.cs
+3 -2
View File
@@ -92,14 +92,15 @@ namespace Duplicati.GUI.TrayIcon
private static readonly string ICON_NORMAL = ICON_PATH + "normal.png";
private static readonly string ICON_PAUSED = ICON_PATH + "normal-pause.png";
private static readonly string ICON_RUNNING = ICON_PATH + "normal-running.png";
private static readonly string ICON_WARNING = ICON_PATH + "normal-error.png"; // TODO: create a normal-warning.png, for now use normal-error.png
private static readonly string ICON_WARNING = ICON_PATH + "normal-warning.png";
private static readonly string ICON_ERROR = ICON_PATH + "normal-error.png";
private readonly Dictionary<Duplicati.GUI.TrayIcon.TrayIcons, string> m_images = new Dictionary<Duplicati.GUI.TrayIcon.TrayIcons, string>();
private System.Diagnostics.Process m_rumpsProcess;
private static readonly string RUMPS_PYTHON = string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("RUMPS_PYTHON")) ? "/usr/bin/python2.7" : Environment.GetEnvironmentVariable("RUMPS_PYTHON");
private static readonly string SYSTEM_PYTHON = System.IO.Directory.Exists("/usr/bin/python2.7") ? "/usr/bin/python2.7" : "/usr/bin/python3";
private static readonly string RUMPS_PYTHON = string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("RUMPS_PYTHON")) ? SYSTEM_PYTHON : Environment.GetEnvironmentVariable("RUMPS_PYTHON");
private static readonly string SCRIPT_PATH = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "OSXTrayHost", "osx-trayicon-rumps.py");
private IsolatedChannelScope m_scope;
thirdparty/rumps/rumps.py
Vendored
+17 -17
View File
@@ -82,11 +82,11 @@ def alert(title=None, message='', ok=None, cancel=None):
created.
:return: a number representing the button pressed. The "ok" button is ``1`` and "cancel" is ``0``.
"""
message = unicode(message)
message = str(message)
if title is not None:
title = unicode(title)
title = str(title)
_require_string_or_none(ok)
if not isinstance(cancel, basestring):
if not isinstance(cancel, str):
cancel = 'Cancel' if cancel else None
alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(
title, ok, cancel, None, message)
@@ -176,13 +176,13 @@ def _nsimage_from_file(filename, dimensions=None):
def _require_string(*objs):
for obj in objs:
if not isinstance(obj, basestring):
if not isinstance(obj, str):
raise TypeError('a string is required but given {0}, a {1}'.format(obj, type(obj).__name__))
def _require_string_or_none(*objs):
for obj in objs:
if not(obj is None or isinstance(obj, basestring)):
if not(obj is None or isinstance(obj, str)):
raise TypeError('a string or None is required but given {0}, a {1}'.format(obj, type(obj).__name__))
@@ -361,14 +361,14 @@ class Menu(ListDict):
menu.add(iterable)
return
for n, ele in enumerate(iterable.iteritems() if isinstance(iterable, Mapping) else iterable):
for n, ele in enumerate(iter(iterable.items()) if isinstance(iterable, Mapping) else iterable):
# for mappings we recurse but don't drop down a level in the menu
if not isinstance(ele, MenuItem) and isinstance(ele, Mapping):
parse_menu(ele, menu, depth)
# any iterables other than strings and MenuItems
elif not isinstance(ele, (basestring, MenuItem)) and isinstance(ele, Iterable):
elif not isinstance(ele, (str, MenuItem)) and isinstance(ele, Iterable):
try:
menuitem, submenu = ele
except TypeError:
@@ -484,7 +484,7 @@ class MenuItem(Menu):
def __init__(self, title, callback=None, key=None, icon=None, dimensions=None):
if isinstance(title, MenuItem): # don't initialize already existing instances
return
self._menuitem = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(unicode(title), None, '')
self._menuitem = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(str(title), None, '')
self._menuitem.setTarget_(NSApp)
self._menu = self._icon = None
self.set_callback(callback, key)
@@ -498,7 +498,7 @@ class MenuItem(Menu):
super(MenuItem, self).__setitem__(key, value)
def __repr__(self):
return '<{0}: [{1} -> {2}; callback: {3}]>'.format(type(self).__name__, repr(self.title), map(str, self),
return '<{0}: [{1} -> {2}; callback: {3}]>'.format(type(self).__name__, repr(self.title), list(map(str, self)),
repr(self.callback))
@property
@@ -510,7 +510,7 @@ class MenuItem(Menu):
@title.setter
def title(self, new_title):
new_title = unicode(new_title)
new_title = str(new_title)
self._menuitem.setTitle_(new_title)
@property
@@ -707,14 +707,14 @@ class Window(object):
"""
def __init__(self, message='', title='', default_text='', ok=None, cancel=None, dimensions=(320, 160)):
message = unicode(message)
title = unicode(title)
message = str(message)
title = str(title)
self._cancel = bool(cancel)
self._icon = None
_require_string_or_none(ok)
if not isinstance(cancel, basestring):
if not isinstance(cancel, str):
cancel = 'Cancel' if cancel else None
self._alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(
@@ -736,7 +736,7 @@ class Window(object):
@title.setter
def title(self, new_title):
new_title = unicode(new_title)
new_title = str(new_title)
self._alert.setMessageText_(new_title)
@property
@@ -748,7 +748,7 @@ class Window(object):
@message.setter
def message(self, new_message):
new_message = unicode(new_message)
new_message = str(new_message)
self._alert.setInformativeText_(new_message)
@property
@@ -763,7 +763,7 @@ class Window(object):
@default_text.setter
def default_text(self, new_text):
new_text = unicode(new_text)
new_text = str(new_text)
self._default_text = new_text
self._textfield.setStringValue_(new_text)
@@ -805,7 +805,7 @@ class Window(object):
"""
if iterable is None:
return
if isinstance(iterable, basestring):
if isinstance(iterable, str):
self.add_button(iterable)
else:
for ele in iterable: