guinux
13 years ago
parent
5741cf9f5e
commit
0adb27f955
@ -0,0 +1,10 @@
|
||||
[Desktop Entry]
|
||||
Name=Pamac Tray Icon
|
||||
Icon=update-notifier
|
||||
Exec=pamac-tray
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=GNOME;GTK;System;
|
||||
NoDisplay=True
|
||||
StartupNotify=true
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
#! /bin/sh
|
||||
#! /usr/bin/python
|
||||
# -*-coding:utf-8 -*-
|
||||
|
||||
/usr/bin/python /usr/lib/python3.3/site-packages/pamac/manager.py
|
||||
from pamac import main
|
||||
|
||||
main.main('manager')
|
||||
|
||||
@ -1,3 +1,71 @@
|
||||
#! /bin/sh
|
||||
#! /usr/bin/python
|
||||
# -*-coding:utf-8-*-
|
||||
|
||||
/usr/bin/python /usr/lib/python3.3/site-packages/pamac/tray.py
|
||||
from gi.repository import Gtk
|
||||
from subprocess import Popen
|
||||
from pamac import transaction
|
||||
|
||||
class Tray:
|
||||
def __init__(self, icon, info):
|
||||
self.icon = icon
|
||||
self.info = info
|
||||
self.statusIcon = Gtk.StatusIcon()
|
||||
self.statusIcon.set_from_file(icon)
|
||||
self.statusIcon.set_visible(True)
|
||||
self.statusIcon.set_tooltip_markup(info)
|
||||
|
||||
self.menu = Gtk.Menu()
|
||||
self.menuItem = Gtk.ImageMenuItem('Check for updates')
|
||||
self.menuItem.connect('activate', self.execute_update, self.statusIcon)
|
||||
self.menu.append(self.menuItem)
|
||||
self.menuItem = Gtk.ImageMenuItem('Run pamac')
|
||||
self.menuItem.connect('activate', self.execute_manager, self.statusIcon)
|
||||
self.menu.append(self.menuItem)
|
||||
self.menuItem = Gtk.ImageMenuItem('Quit')
|
||||
self.menuItem.connect('activate', self.quit_tray, self.statusIcon)
|
||||
self.menu.append(self.menuItem)
|
||||
|
||||
self.statusIcon.connect('popup-menu', self.popup_menu_cb, self.menu)
|
||||
self.statusIcon.set_visible(1)
|
||||
|
||||
def execute_update(self, widget, event, data = None):
|
||||
Popen(['/usr/bin/pamac-updater'])
|
||||
|
||||
def execute_manager(self, widget, event, data = None):
|
||||
Popen(['/usr/bin/pamac-manager'])
|
||||
|
||||
def quit_tray(self, widget, data = None):
|
||||
Gtk.main_quit()
|
||||
|
||||
def popup_menu_cb(self, widget, button, time, data = None):
|
||||
if button == 3:
|
||||
if data:
|
||||
data.show_all()
|
||||
data.popup(None, None, Gtk.StatusIcon.position_menu, self.statusIcon, 3, time)
|
||||
|
||||
def handle_error(error):
|
||||
print('error',error)
|
||||
icon = '/usr/share/pamac/icons/24x24/status/update-enhancement.png'
|
||||
info = ' No update available'
|
||||
tray = Tray(icon, info)
|
||||
transaction.StopDaemon()
|
||||
|
||||
def handle_reply(reply):
|
||||
do_syncfirst, updates = transaction.get_updates()
|
||||
if updates:
|
||||
icon = '/usr/share/pamac/icons/24x24/status/update-normal.png'
|
||||
info = str(len(updates))+' update(s) available'
|
||||
else:
|
||||
icon = '/usr/share/pamac/icons/24x24/status/update-enhancement.png'
|
||||
info = ' No update available'
|
||||
tray = Tray(icon, info)
|
||||
transaction.StopDaemon()
|
||||
|
||||
def do_refresh():
|
||||
"""Sync databases like pacman -Sy"""
|
||||
transaction.get_handle()
|
||||
transaction.Refresh(reply_handler = handle_reply, error_handler = handle_error, timeout = 2000*1000)
|
||||
|
||||
if __name__ == "__main__":
|
||||
do_refresh()
|
||||
Gtk.main()
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
#! /bin/sh
|
||||
#! /usr/bin/python
|
||||
# -*-coding:utf-8 -*-
|
||||
|
||||
/usr/bin/python /usr/lib/python3.3/site-packages/pamac/updater.py
|
||||
from pamac import main
|
||||
|
||||
main.main('updater')
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
#! /usr/bin/python
|
||||
# -*-coding:utf-8-*-
|
||||
|
||||
from gi.repository import Gtk
|
||||
|
||||
from pamac import transaction, updater, manager
|
||||
|
||||
already_manager = False
|
||||
|
||||
class Tray:
|
||||
def __init__(self, icon, info):
|
||||
self.icon = icon
|
||||
self.info = info
|
||||
self.statusIcon = Gtk.StatusIcon()
|
||||
self.statusIcon.set_from_file(icon)
|
||||
self.statusIcon.set_visible(True)
|
||||
self.statusIcon.set_tooltip_markup(info)
|
||||
|
||||
self.menu = Gtk.Menu()
|
||||
self.menuItem = Gtk.ImageMenuItem('Check for updates')
|
||||
self.menuItem.connect('activate', self.execute_update, self.statusIcon)
|
||||
self.menu.append(self.menuItem)
|
||||
self.menuItem = Gtk.ImageMenuItem('Run pamac')
|
||||
self.menuItem.connect('activate', self.execute_manager, self.statusIcon)
|
||||
self.menu.append(self.menuItem)
|
||||
self.menuItem = Gtk.ImageMenuItem(Gtk.STOCK_QUIT)
|
||||
self.menuItem.connect('activate', self.quit_tray, self.statusIcon)
|
||||
self.menu.append(self.menuItem)
|
||||
|
||||
self.statusIcon.connect('popup-menu', self.popup_menu_cb, self.menu)
|
||||
self.statusIcon.set_visible(1)
|
||||
|
||||
def execute_update(self, widget, event, data = None):
|
||||
updater.main()
|
||||
|
||||
def execute_manager(self, widget, event, data = None):
|
||||
global already_manager
|
||||
if already_manager:
|
||||
manager.MainWindow.show_all()
|
||||
print('show')
|
||||
else:
|
||||
manager.main()
|
||||
already_manager = True
|
||||
|
||||
def quit_tray(self, widget, data = None):
|
||||
Gtk.main_quit()
|
||||
|
||||
def popup_menu_cb(self, widget, button, time, data = None):
|
||||
if button == 3:
|
||||
if data:
|
||||
data.show_all()
|
||||
data.popup(None, None, Gtk.StatusIcon.position_menu, self.statusIcon, 3, time)
|
||||
|
||||
if __name__ == "__main__":
|
||||
updates = transaction.get_updates()
|
||||
if updates:
|
||||
icon = '/usr/share/pamac/icons/24x24/status/update-normal.png'
|
||||
info = str(len(updates))+' update(s) available'
|
||||
else:
|
||||
icon = '/usr/share/pamac/icons/24x24/status/update-enhancement.png'
|
||||
info = ' No update available'
|
||||
tray = Tray(icon, info)
|
||||
Gtk.main()
|
||||
@ -1,212 +0,0 @@
|
||||
#! /usr/bin/python
|
||||
# -*-coding:utf-8 -*-
|
||||
|
||||
from gi.repository import Gtk
|
||||
|
||||
from pamac import config, common, transaction
|
||||
|
||||
interface = Gtk.Builder()
|
||||
interface.add_from_file('/usr/share/pamac/gui/updater.glade')
|
||||
#interface.add_from_file('/usr/share/pamac/gui/dialogs.glade')
|
||||
|
||||
UpdateWindow = interface.get_object("UpdateWindow")
|
||||
|
||||
ConfDialog = interface.get_object('ConfDialog')
|
||||
transaction_add = interface.get_object('transaction_add')
|
||||
top_label = interface.get_object('top_label')
|
||||
bottom_label = interface.get_object('bottom_label')
|
||||
update_listore = interface.get_object('update_list')
|
||||
update_label = interface.get_object('update_label')
|
||||
|
||||
def do_refresh():
|
||||
"""Sync databases like pacman -Sy"""
|
||||
transaction.get_handle()
|
||||
if transaction.t_lock is False:
|
||||
transaction.t_lock = True
|
||||
transaction.progress_label.set_text('Refreshing...')
|
||||
transaction.action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/refresh-cache.png')
|
||||
transaction.ProgressWindow.show_all()
|
||||
while Gtk.events_pending():
|
||||
Gtk.main_iteration()
|
||||
transaction.Refresh(reply_handler = handle_reply, error_handler = handle_error, timeout = 2000*1000)
|
||||
|
||||
def have_updates():
|
||||
available_updates = transaction.get_updates()
|
||||
update_listore.clear()
|
||||
update_label.set_justify(Gtk.Justification.CENTER)
|
||||
if not available_updates:
|
||||
update_listore.append(["", ""])
|
||||
update_label.set_markup("<big><b>No update available</b></big>")
|
||||
return False
|
||||
else:
|
||||
for pkg in available_updates:
|
||||
pkgname = pkg.name
|
||||
newversion = transaction.get_new_version_available(pkgname)
|
||||
pkgname = pkg.name+" "+newversion
|
||||
update_listore.append([pkgname, common.format_size(pkg.size)])
|
||||
update_label.set_markup("<big><b>Available updates</b></big>")
|
||||
return True
|
||||
|
||||
def set_transaction_add():
|
||||
transaction_add.clear()
|
||||
if transaction.to_remove:
|
||||
transaction_add.append(['To remove:', transaction.to_remove[0]])
|
||||
i = 1
|
||||
while i < len(transaction.to_remove):
|
||||
transaction_add.append([' ', transaction.to_remove[i]])
|
||||
i += 1
|
||||
bottom_label.set_markup('')
|
||||
if transaction.to_add:
|
||||
installed_name = []
|
||||
for pkg_object in transaction.handle.get_localdb().pkgcache:
|
||||
installed_name.append(pkg_object.name)
|
||||
transaction.to_update = sorted(set(installed_name).intersection(transaction.to_add))
|
||||
to_remove_from_add_name = sorted(set(transaction.to_update).intersection(transaction.to_add))
|
||||
for name in to_remove_from_add_name:
|
||||
transaction.to_add.remove(name)
|
||||
if transaction.to_add:
|
||||
transaction_add.append(['To install:', transaction.to_add[0]])
|
||||
i = 1
|
||||
while i < len(transaction.to_add):
|
||||
transaction_add.append([' ', transaction.to_add[i]])
|
||||
i += 1
|
||||
bottom_label.set_markup('')
|
||||
#bottom_label.set_markup('<b>Total Download size: </b>'+format_size(totaldlcb))
|
||||
top_label.set_markup('<big><b>Additionnal Transaction(s)</b></big>')
|
||||
|
||||
def do_sysupgrade():
|
||||
"""Upgrade a system like pacman -Su"""
|
||||
if transaction.t_lock is False:
|
||||
if transaction.do_syncfirst is True:
|
||||
if transaction.init_transaction(recurse = True):
|
||||
for pkg in transaction.list_first:
|
||||
transaction.Add(pkg.name)
|
||||
transaction.get_to_remove()
|
||||
transaction.get_to_add()
|
||||
set_transaction_add()
|
||||
if len(transaction.to_add) + len(transaction.to_remove) != 0:
|
||||
ConfDialog.show_all()
|
||||
else:
|
||||
finalize()
|
||||
else:
|
||||
if transaction.init_transaction():
|
||||
error = transaction.Sysupgrade()
|
||||
if error:
|
||||
transaction.ErrorDialog.format_secondary_text(error)
|
||||
response = transaction.ErrorDialog.run()
|
||||
if response:
|
||||
transaction.ErrorDialog.hide()
|
||||
transaction.Release()
|
||||
transaction.t_lock = False
|
||||
transaction.get_to_remove()
|
||||
transaction.get_to_add()
|
||||
transaction.check_conflicts()
|
||||
transaction.Release()
|
||||
if len(transaction.to_add) == 0:
|
||||
transaction.t_lock = False
|
||||
print("Nothing to update")
|
||||
else:
|
||||
if transaction.init_transaction(noconflicts = True):
|
||||
for pkgname in transaction.to_update:
|
||||
transaction.Add(pkgname)
|
||||
for pkgname in transaction.to_add:
|
||||
transaction.Add(pkgname)
|
||||
for pkgname in transaction.to_remove:
|
||||
transaction.Remove(pkgname)
|
||||
set_transaction_add()
|
||||
if len(transaction.to_add) + len(transaction.to_remove) != 0:
|
||||
ConfDialog.show_all()
|
||||
else:
|
||||
finalize()
|
||||
|
||||
def finalize():
|
||||
error = transaction.Prepare()
|
||||
if error:
|
||||
transaction.ErrorDialog.format_secondary_text(error)
|
||||
response = transaction.ErrorDialog.run()
|
||||
if response:
|
||||
transaction.ErrorDialog.hide()
|
||||
transaction.Release()
|
||||
transaction.t_lock = False
|
||||
else:
|
||||
transaction.progress_label.set_text('Preparing...')
|
||||
transaction.action_icon.set_from_file('/usr/share/pamac/icons/24x24/status/setup.png')
|
||||
transaction.ProgressWindow.show_all()
|
||||
while Gtk.events_pending():
|
||||
Gtk.main_iteration()
|
||||
transaction.Commit(reply_handler = handle_reply, error_handler = handle_error, timeout = 2000*1000)
|
||||
|
||||
def handle_error(error):
|
||||
if not 'DBus.Error.NoReply' in str(error):
|
||||
transaction.ErrorDialog.format_secondary_text('Commit Error:\n'+str(error))
|
||||
response = transaction.ErrorDialog.run()
|
||||
if response:
|
||||
transaction.ErrorDialog.hide()
|
||||
transaction.t_lock = False
|
||||
transaction.Release()
|
||||
transaction.ProgressWindow.hide()
|
||||
have_updates()
|
||||
|
||||
def handle_reply(reply):
|
||||
if str(reply):
|
||||
transaction.ErrorDialog.format_secondary_text('Commit Error:\n'+str(reply))
|
||||
response = transaction.ErrorDialog.run()
|
||||
if response:
|
||||
transaction.ErrorDialog.hide()
|
||||
if transaction.do_syncfirst is True:
|
||||
transaction.do_syncfirst = False
|
||||
transaction.list_first = []
|
||||
transaction.t_lock = False
|
||||
transaction.Release()
|
||||
transaction.ProgressWindow.hide()
|
||||
have_updates()
|
||||
|
||||
class Handler:
|
||||
def on_UpdateWindow_delete_event(self, *arg):
|
||||
transaction.StopDaemon()
|
||||
if __name__ == "__main__":
|
||||
Gtk.main_quit()
|
||||
else:
|
||||
UpdateWindow.hide()
|
||||
|
||||
def on_QuitButton_clicked(self, *arg):
|
||||
transaction.StopDaemon()
|
||||
if __name__ == "__main__":
|
||||
Gtk.main_quit()
|
||||
else:
|
||||
UpdateWindow.hide()
|
||||
|
||||
def on_ApplyButton_clicked(self, *arg):
|
||||
do_sysupgrade()
|
||||
|
||||
def on_RefreshButton_clicked(self, *arg):
|
||||
transaction.do_refresh()
|
||||
#have_updates()
|
||||
|
||||
def on_TransCancelButton_clicked(self, *arg):
|
||||
ConfDialog.hide()
|
||||
transaction.t_lock = False
|
||||
transaction.Release()
|
||||
|
||||
def on_TransValidButton_clicked(self, *arg):
|
||||
ConfDialog.hide()
|
||||
finalize()
|
||||
|
||||
def on_ProgressCancelButton_clicked(self, *arg):
|
||||
transaction.t_lock = False
|
||||
transaction.Release()
|
||||
transaction.ProgressWindow.hide()
|
||||
have_updates()
|
||||
|
||||
def main():
|
||||
do_refresh()
|
||||
#have_updates()
|
||||
update_label.set_markup("<big><b>Available updates</b></big>")
|
||||
interface.connect_signals(Handler())
|
||||
UpdateWindow.show_all()
|
||||
while Gtk.events_pending():
|
||||
Gtk.main_iteration()
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Gtk.main()
|
||||
@ -1,101 +0,0 @@
|
||||
#! /usr/bin/python
|
||||
# -*-coding:utf-8 -*-
|
||||
|
||||
import pyalpm
|
||||
from pamac import config, common
|
||||
from collections import OrderedDict
|
||||
#~ syncpkgs = OrderedDict()
|
||||
#~ localpkgs = OrderedDict()
|
||||
#~ virtualdeps = {}
|
||||
|
||||
class MyOrderedDict(OrderedDict):
|
||||
def keys(self):
|
||||
return [i for i in self]
|
||||
def values(self):
|
||||
return [self[i] for i in self]
|
||||
|
||||
d=MyOrderedDict()
|
||||
d['pear']=3
|
||||
d['apple']=2
|
||||
print(d.items())
|
||||
|
||||
#~ for repo in config.handle.get_syncdbs():
|
||||
#~ for pkg in repo.pkgcache:
|
||||
#~ if not pkg.name in syncpkgs.keys():
|
||||
#~ syncpkgs[pkg.name] = pkg
|
||||
#~ for pkg in config.handle.get_localdb().pkgcache:
|
||||
#~ if not pkg.name in localpkgs.keys():
|
||||
#~ localpkgs[pkg.name] = pkg
|
||||
#~ for pkg in syncpkgs.values():
|
||||
#~ for name in pkg.depends:
|
||||
#~ if (not name in syncpkgs.keys()) and (not '>' in name) and (not '<' in name) and (not '=' in name):
|
||||
#~ if 'module' in name:
|
||||
#~ if not virtualdeps.__contains__(name):
|
||||
#~ virtualdeps[name] = []
|
||||
#~ virtualdeps.get(name).append(pkg.name)
|
||||
|
||||
#~ to_add = ['libreoffice-writer', 'anjuta']
|
||||
#~ depends = [[syncpkgs['libreoffice-writer'],syncpkgs['anjuta']]]
|
||||
#~ to_provide = []
|
||||
#~ to_remove = []
|
||||
#~ warning = ''
|
||||
#~ i = 0
|
||||
#~ while depends[i]:
|
||||
#~ depends.append([])
|
||||
#~ for pkg in depends[i]:
|
||||
#~ for depend in pkg.depends:
|
||||
#~ provide = pyalpm.find_satisfier(localpkgs.values(), depend)
|
||||
#~ if provide:
|
||||
#~ print(i,'local',provide)
|
||||
#~ if provide.name != common.format_pkg_name(depend):
|
||||
#~ if ('-module' in depend) or ('linux' in depend):
|
||||
#~ to_provide.append(depend)
|
||||
#~ else:
|
||||
#~ provide = pyalpm.find_satisfier(syncpkgs.values(), depend)
|
||||
#~ if provide:
|
||||
#~ print(i,'sync',provide)
|
||||
#~ if provide.name != common.format_pkg_name(depend):
|
||||
#~ print(provide.name,common.format_pkg_name(depend))
|
||||
#~ to_provide.append(depend)
|
||||
#~ else:
|
||||
#~ depends[i+1].append(provide)
|
||||
#~ for replace in pkg.replaces:
|
||||
#~ provide = pyalpm.find_satisfier(localpkgs.values(), replace)
|
||||
#~ if provide:
|
||||
#~ if not provide.name in to_remove:
|
||||
#~ to_remove.append(provide.name)
|
||||
#~ if warning:
|
||||
#~ warning = warning+'\n'
|
||||
#~ warning = warning+provide.name+' will be replaced by '+pkg.name
|
||||
#~ for conflict in pkg.conflicts:
|
||||
#~ provide = pyalpm.find_satisfier(localpkgs.values(), conflict)
|
||||
#~ if provide:
|
||||
#~ if not provide.name in to_remove:
|
||||
#~ to_remove.append(provide.name)
|
||||
#~ if warning:
|
||||
#~ warning = warning+'\n'
|
||||
#~ warning = warning+pkg.name+' conflicts with '+provide.name
|
||||
#~ provide = pyalpm.find_satisfier(depends[0], conflict)
|
||||
#~ if provide:
|
||||
#~ if not common.format_pkg_name(conflict) in to_remove:
|
||||
#~ if pkg.name in to_add and common.format_pkg_name(conflict) in to_add:
|
||||
#~ to_add.remove(common.format_pkg_name(conflict))
|
||||
#~ to_add.remove(pkg.name)
|
||||
#~ if warning:
|
||||
#~ warning = warning+'\n'
|
||||
#~ warning = warning+pkg.name+' conflicts with '+common.format_pkg_name(conflict)+'\nNone of them will be installed'
|
||||
#~ i = i + 1
|
||||
#~ for pkg in localpkgs.values():
|
||||
#~ for conflict in pkg.conflicts:
|
||||
#~ provide = pyalpm.find_satisfier(depends[0], conflict)
|
||||
#~ if provide:
|
||||
#~ if not provide.name in to_remove:
|
||||
#~ to_remove.append(pkg.name)
|
||||
#~ if warning:
|
||||
#~ warning = warning+'\n'
|
||||
#~ warning = warning+provide.name+' conflicts with '+pkg.name
|
||||
#~ print('depends:',depends)
|
||||
#~ print('to provide:',to_provide)
|
||||
#~ print('to add:',to_add)
|
||||
#~ print('to remove:',to_remove)
|
||||
#~ print(warning)
|
||||
Loading…
Reference in new issue