This commit is contained in:
guinux 2017-07-29 16:35:04 +02:00
parent b64b603e82
commit d661c573f9
36 changed files with 1979 additions and 2527 deletions

3
.gitignore vendored
View File

@ -5,7 +5,8 @@ src/*.c
src/pamac.h src/pamac.h
src/pamac.vapi src/pamac.vapi
src/libpamac.so src/libpamac.so
src/pamac-daemon src/pamac-user-daemon
src/pamac-system-daemon
src/pamac-tray src/pamac-tray
src/pamac-tray-appindicator src/pamac-tray-appindicator
src/pamac-manager src/pamac-manager

View File

@ -28,20 +28,21 @@ install: install_pamac-tray-appindicator
install -Dm644 src/pamac.h $(includedir)/pamac.h install -Dm644 src/pamac.h $(includedir)/pamac.h
install -Dm644 src/pamac.vapi $(datadir)/vala/vapi/pamac.vapi install -Dm644 src/pamac.vapi $(datadir)/vala/vapi/pamac.vapi
install -Dm755 src/libpamac.so $(libdir)/libpamac.so install -Dm755 src/libpamac.so $(libdir)/libpamac.so
install -Dm744 src/pamac-daemon $(bindir)/pamac-daemon install -Dm755 src/pamac-user-daemon $(bindir)/pamac-user-daemon
install -Dm744 src/pamac-system-daemon $(bindir)/pamac-system-daemon
install -Dm755 src/pamac-tray $(bindir)/pamac-tray install -Dm755 src/pamac-tray $(bindir)/pamac-tray
install -Dm755 src/pamac-manager $(bindir)/pamac-manager install -Dm755 src/pamac-manager $(bindir)/pamac-manager
install -Dm755 src/pamac-updater $(bindir)/pamac-updater ln -srf $(bindir)/pamac-manager $(bindir)/pamac-updater
install -Dm755 src/pamac-install $(bindir)/pamac-install install -Dm755 src/pamac-install $(bindir)/pamac-install
install -Dm755 src/pamac-refresh $(bindir)/pamac-refresh
install -Dm644 data/applications/pamac-tray.desktop $(sysconfdir)/xdg/autostart/pamac-tray.desktop install -Dm644 data/applications/pamac-tray.desktop $(sysconfdir)/xdg/autostart/pamac-tray.desktop
install -Dm644 data/applications/pamac-manager.desktop $(datadir)/applications/pamac-manager.desktop install -Dm644 data/applications/pamac-manager.desktop $(datadir)/applications/pamac-manager.desktop
install -Dm644 data/applications/pamac-updater.desktop $(datadir)/applications/pamac-updater.desktop install -Dm644 data/applications/pamac-updater.desktop $(datadir)/applications/pamac-updater.desktop
install -Dm644 data/applications/pamac-install.desktop $(datadir)/applications/pamac-install.desktop install -Dm644 data/applications/pamac-install.desktop $(datadir)/applications/pamac-install.desktop
install -Dm644 data/config/pamac.conf $(sysconfdir)/pamac.conf install -Dm644 data/config/pamac.conf $(sysconfdir)/pamac.conf
install -Dm644 data/dbus/org.manjaro.pamac.conf $(sysconfdir)/dbus-1/system.d/org.manjaro.pamac.conf install -Dm644 data/dbus/org.manjaro.pamac.system.conf $(sysconfdir)/dbus-1/system.d/org.manjaro.pamac.system.conf
install -Dm644 data/dbus/org.manjaro.pamac.service $(datadir)/dbus-1/system-services/org.manjaro.pamac.service install -Dm644 data/dbus/org.manjaro.pamac.user.service $(datadir)/dbus-1/services/org.manjaro.pamac.user.service
install -Dm644 data/systemd/pamac.service $(libdir)/systemd/system/pamac.service install -Dm644 data/dbus/org.manjaro.pamac.system.service $(datadir)/dbus-1/system-services/org.manjaro.pamac.system.service
install -Dm644 data/systemd/pamac-system.service $(libdir)/systemd/system/pamac-system.service
install -Dm644 data/systemd/pamac-cleancache.service $(libdir)/systemd/system/pamac-cleancache.service install -Dm644 data/systemd/pamac-cleancache.service $(libdir)/systemd/system/pamac-cleancache.service
install -Dm644 data/systemd/pamac-cleancache.timer $(libdir)/systemd/system/pamac-cleancache.timer install -Dm644 data/systemd/pamac-cleancache.timer $(libdir)/systemd/system/pamac-cleancache.timer
install -Dm644 data/systemd/pamac-mirrorlist.service $(libdir)/systemd/system/pamac-mirrorlist.service install -Dm644 data/systemd/pamac-mirrorlist.service $(libdir)/systemd/system/pamac-mirrorlist.service
@ -49,7 +50,6 @@ install: install_pamac-tray-appindicator
mkdir -p $(libdir)/systemd/system/multi-user.target.wants mkdir -p $(libdir)/systemd/system/multi-user.target.wants
ln -srf $(libdir)/systemd/system/pamac-cleancache.timer $(libdir)/systemd/system/multi-user.target.wants ln -srf $(libdir)/systemd/system/pamac-cleancache.timer $(libdir)/systemd/system/multi-user.target.wants
ln -srf $(libdir)/systemd/system/pamac-mirrorlist.timer $(libdir)/systemd/system/multi-user.target.wants ln -srf $(libdir)/systemd/system/pamac-mirrorlist.timer $(libdir)/systemd/system/multi-user.target.wants
install -Dm744 data/networkmanager/99_update_pamac_tray $(sysconfdir)/NetworkManager/dispatcher.d/99_update_pamac_tray
install -Dm644 data/polkit/org.manjaro.pamac.policy $(datadir)/polkit-1/actions/org.manjaro.pamac.policy install -Dm644 data/polkit/org.manjaro.pamac.policy $(datadir)/polkit-1/actions/org.manjaro.pamac.policy
install -Dm644 data/mime/x-alpm-package.xml $(datadir)/mime/packages/x-alpm-package.xml install -Dm644 data/mime/x-alpm-package.xml $(datadir)/mime/packages/x-alpm-package.xml
@ -66,27 +66,27 @@ uninstall:
rm -f $(includedir)/pamac.h rm -f $(includedir)/pamac.h
rm -f $(datadir)/vala/vapi/pamac.vapi rm -f $(datadir)/vala/vapi/pamac.vapi
rm -f $(libdir)/libpamac.so rm -f $(libdir)/libpamac.so
rm -f $(bindir)/pamac-daemon rm -f $(bindir)/pamac-user-daemon
rm -f $(bindir)/pamac-system-daemon
rm -f $(bindir)/pamac-tray rm -f $(bindir)/pamac-tray
rm -f $(bindir)/pamac-tray-appindicator rm -f $(bindir)/pamac-tray-appindicator
rm -f $(bindir)/pamac-manager rm -f $(bindir)/pamac-manager
rm -f $(bindir)/pamac-updater rm -f $(bindir)/pamac-updater
rm -f $(bindir)/pamac-install rm -f $(bindir)/pamac-install
rm -f $(bindir)/pamac-refresh
rm -f $(sysconfdir)/xdg/autostart/pamac-tray.desktop rm -f $(sysconfdir)/xdg/autostart/pamac-tray.desktop
rm -f $(sysconfdir)/xdg/autostart/pamac-tray-appindicator.desktop rm -f $(sysconfdir)/xdg/autostart/pamac-tray-appindicator.desktop
rm -f $(datadir)/applications/pamac-manager.desktop rm -f $(datadir)/applications/pamac-manager.desktop
rm -f $(datadir)/applications/pamac-updater.desktop rm -f $(datadir)/applications/pamac-updater.desktop
rm -f $(datadir)/applications/pamac-install.desktop rm -f $(datadir)/applications/pamac-install.desktop
rm -f $(sysconfdir)/pamac.conf rm -f $(sysconfdir)/pamac.conf
rm -f $(sysconfdir)/dbus-1/system.d/org.manjaro.pamac.conf rm -f $(sysconfdir)/dbus-1/system.d/org.manjaro.pamac.system.conf
rm -f $(datadir)/dbus-1/system-services/org.manjaro.pamac.service rm -f $(datadir)/dbus-1/services/org.manjaro.pamac.user.service
rm -f $(libdir)/systemd/system/pamac.service rm -f $(datadir)/dbus-1/system-services/org.manjaro.pamac.system.service
rm -f $(libdir)/systemd/system/pamac-system.service
rm -f $(libdir)/systemd/system/pamac-cleancache.service rm -f $(libdir)/systemd/system/pamac-cleancache.service
rm -f $(libdir)/systemd/system/pamac-cleancache.timer rm -f $(libdir)/systemd/system/pamac-cleancache.timer
rm -f $(libdir)/systemd/system/pamac-mirrorlist.service rm -f $(libdir)/systemd/system/pamac-mirrorlist.service
rm -f $(libdir)/systemd/system/pamac-mirrorlist.timer rm -f $(libdir)/systemd/system/pamac-mirrorlist.timer
rm -f $(libdir)/systemd/system/multi-user.target.wants/pamac-cleancache.timer rm -f $(libdir)/systemd/system/multi-user.target.wants/pamac-cleancache.timer
rm -f $(sysconfdir)/NetworkManager/dispatcher.d/99_update_pamac_tray
rm -f $(datadir)/polkit-1/actions/org.manjaro.pamac.policy rm -f $(datadir)/polkit-1/actions/org.manjaro.pamac.policy
rm -f $(datadir)/mime/packages/x-alpm-package.xml rm -f $(datadir)/mime/packages/x-alpm-package.xml

View File

@ -1,5 +0,0 @@
[D-BUS Service]
Name=org.manjaro.pamac
Exec=/usr/bin/pamac-daemon
User=root
SystemdService=pamac.service

View File

@ -4,19 +4,19 @@
<busconfig> <busconfig>
<!-- Only root can own the service --> <!-- Only root can own the service -->
<policy user="root"> <policy user="root">
<allow own="org.manjaro.pamac"/> <allow own="org.manjaro.pamac.system"/>
</policy> </policy>
<!-- Allow anyone to invoke methods on the interfaces --> <!-- Allow anyone to invoke methods on the interfaces -->
<policy context="default"> <policy context="default">
<allow send_destination="org.manjaro.pamac" <allow send_destination="org.manjaro.pamac.system"
send_interface="org.manjaro.pamac"/> send_interface="org.manjaro.pamac.system"/>
<allow send_destination="org.manjaro.pamac" <allow send_destination="org.manjaro.pamac.system"
send_interface="org.freedesktop.DBus.Introspectable"/> send_interface="org.freedesktop.DBus_Introspectable"/>
<allow send_destination="org.manjaro.pamac" <allow send_destination="org.manjaro.pamac.system"
send_interface="org.freedesktop.DBus.Peer"/> send_interface="org.freedesktop.DBus.Peer"/>
<allow send_destination="org.manjaro.pamac" <allow send_destination="org.manjaro.pamac.system"
send_interface="org.freedesktop.DBus.Properties"/> send_interface="org.freedesktop.DBus.Properties"/>
</policy> </policy>
</busconfig> </busconfig>

View File

@ -0,0 +1,5 @@
[D-BUS Service]
Name=org.manjaro.pamac.system
Exec=/usr/bin/pamac-system-daemon
User=root
SystemdService=pamac-system.service

View File

@ -0,0 +1,3 @@
[D-BUS Service]
Name=org.manjaro.pamac.user
Exec=/usr/bin/pamac-user-daemon

View File

@ -1,12 +0,0 @@
#!/bin/sh
INTERFACE=$1 # The interface which is brought up or down
STATUS=$2 # The new state of the interface
case "$STATUS" in
'up') # $INTERFACE is up
[[ -e /usr/bin/mhwd-live ]] && sleep 30
/usr/bin/pamac-refresh
;;
esac

View File

@ -0,0 +1,7 @@
[Unit]
Description=Pamac System Session
[Service]
Type=dbus
BusName=org.manjaro.pamac.system
ExecStart=/usr/bin/pamac-system-daemon

View File

@ -1,7 +0,0 @@
[Unit]
Description=Pamac
[Service]
Type=dbus
BusName=org.manjaro.pamac
ExecStart=/usr/bin/pamac-daemon

View File

@ -1,11 +1,10 @@
../src/daemon.vala ../src/user_daemon.vala
../src/system_daemon.vala
../src/transaction.vala ../src/transaction.vala
../src/installer.vala ../src/installer.vala
../src/tray.vala ../src/tray.vala
../src/manager.vala ../src/manager.vala
../src/updater.vala
../src/manager_window.vala ../src/manager_window.vala
../src/updater_window.vala
../src/preferences_dialog.vala ../src/preferences_dialog.vala
../src/choose_ignorepkgs_dialog.vala ../src/choose_ignorepkgs_dialog.vala
@ -14,6 +13,5 @@
../resources/history_dialog.ui ../resources/history_dialog.ui
../resources/transaction_sum_dialog.ui ../resources/transaction_sum_dialog.ui
../resources/manager_window.ui ../resources/manager_window.ui
../resources/updater_window.ui
../resources/preferences_dialog.ui ../resources/preferences_dialog.ui
../resources/choose_ignorepkgs_dialog.ui ../resources/choose_ignorepkgs_dialog.ui

View File

@ -21,114 +21,110 @@ msgstr ""
msgid "Authentication is required" msgid "Authentication is required"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/user_daemon.vala
msgid "Failed to initialize alpm library"
msgstr ""
#: ../src/daemon.vala ../src/transaction.vala
msgid "Authentication failed"
msgstr ""
#: ../src/daemon.vala
msgid "Failed to synchronize any databases"
msgstr ""
#: ../src/daemon.vala
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/user_daemon.vala ../src/manager_window.vala
msgid "Explicitly installed" msgid "Explicitly installed"
msgstr "" msgstr ""
#: ../src/daemon.vala ../src/manager_window.vala #: ../src/user_daemon.vala ../src/manager_window.vala
msgid "Installed as a dependency for another package" msgid "Installed as a dependency for another package"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/user_daemon.vala
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/user_daemon.vala
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
msgid "Failed to initialize alpm library"
msgstr ""
#: ../src/system_daemon.vala ../src/transaction.vala
msgid "Authentication failed"
msgstr ""
#: ../src/system_daemon.vala
msgid "Failed to synchronize any databases"
msgstr ""
#: ../src/system_daemon.vala
msgid "Failed to init transaction" msgid "Failed to init transaction"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
msgid "Failed to prepare transaction" msgid "Failed to prepare transaction"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "target not found: %s" msgid "target not found: %s"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "package %s does not have a valid architecture" msgid "package %s does not have a valid architecture"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s: requires %s" msgid "unable to satisfy dependency '%s' required by %s"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s: installing %s (%s) breaks dependency '%s'" msgid "installing %s (%s) breaks dependency '%s' required by %s"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s: removing %s breaks dependency '%s'" msgid "removing %s breaks dependency '%s' required by %s"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s and %s are in conflict" msgid "%s and %s are in conflict"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s needs to be removed but it is a locked package" msgid "%s needs to be removed but it is a locked package"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
msgid "Failed to commit transaction" msgid "Failed to commit transaction"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s exists in both %s and %s" msgid "%s exists in both %s and %s"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s: %s already exists in filesystem" msgid "%s: %s already exists in filesystem"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s is invalid or corrupted" msgid "%s is invalid or corrupted"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "%s appears to be truncated: %jd/%jd bytes\n" msgid "%s appears to be truncated: %jd/%jd bytes\n"
msgstr "" msgstr ""
#: ../src/daemon.vala #: ../src/system_daemon.vala
#, c-format #, c-format
msgid "failed retrieving file '%s' from %s : %s\n" msgid "failed retrieving file '%s' from %s : %s\n"
msgstr "" msgstr ""
#: ../src/transaction.vala
msgid "A Gtk3 frontend for libalpm"
msgstr ""
#: ../src/transaction.vala #: ../src/transaction.vala
msgid "Copy" msgid "Copy"
msgstr "" msgstr ""
@ -174,11 +170,7 @@ msgstr ""
msgid "To reinstall" msgid "To reinstall"
msgstr "" msgstr ""
#: ../src/transaction.vala #: ../src/transaction.vala ../src/manager_window.vala
msgid "To update"
msgstr ""
#: ../src/transaction.vala ../src/updater_window.vala
msgid "Total download size" msgid "Total download size"
msgstr "" msgstr ""
@ -191,10 +183,6 @@ msgstr ""
msgid "Transaction cancelled" msgid "Transaction cancelled"
msgstr "" msgstr ""
#: ../src/transaction.vala
msgid "Waiting for another package manager to quit"
msgstr ""
#: ../src/transaction.vala #: ../src/transaction.vala
msgid "Checking dependencies" msgid "Checking dependencies"
msgstr "" msgstr ""
@ -345,6 +333,7 @@ msgid "Warning"
msgstr "" msgstr ""
#: ../src/transaction.vala ../resources/progress_dialog.ui #: ../src/transaction.vala ../resources/progress_dialog.ui
#: ../resources/history_dialog.ui
msgid "_Close" msgid "_Close"
msgstr "" msgstr ""
@ -356,18 +345,14 @@ msgstr ""
msgid "Transaction successfully finished" msgid "Transaction successfully finished"
msgstr "" msgstr ""
#: ../src/installer.vala ../src/manager.vala ../src/updater.vala #: ../src/installer.vala ../src/manager.vala
msgid "Pamac is already running" msgid "Pamac is already running"
msgstr "" msgstr ""
#: ../src/tray.vala ../src/updater_window.vala #: ../src/tray.vala ../src/manager_window.vala
msgid "Your system is up-to-date" msgid "Your system is up-to-date"
msgstr "" msgstr ""
#: ../src/tray.vala ../src/updater_window.vala
msgid "Update Manager"
msgstr ""
#: ../src/tray.vala ../src/manager_window.vala #: ../src/tray.vala ../src/manager_window.vala
msgid "Package Manager" msgid "Package Manager"
msgstr "" msgstr ""
@ -376,7 +361,7 @@ msgstr ""
msgid "_Quit" msgid "_Quit"
msgstr "" msgstr ""
#: ../src/tray.vala ../src/updater_window.vala #: ../src/tray.vala
#, c-format #, c-format
msgid "%u available update" msgid "%u available update"
msgid_plural "%u available updates" msgid_plural "%u available updates"
@ -384,7 +369,7 @@ msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../src/tray.vala ../src/manager_window.vala ../resources/progress_dialog.ui #: ../src/tray.vala ../src/manager_window.vala ../resources/progress_dialog.ui
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "Details" msgid "Details"
msgstr "" msgstr ""
@ -392,6 +377,10 @@ msgstr ""
msgid "Deselect" msgid "Deselect"
msgstr "" msgstr ""
#: ../src/manager_window.vala
msgid "Upgrade"
msgstr ""
#: ../src/manager_window.vala ../resources/manager_window.ui #: ../src/manager_window.vala ../resources/manager_window.ui
msgid "Install" msgid "Install"
msgstr "" msgstr ""
@ -400,6 +389,10 @@ msgstr ""
msgid "Remove" msgid "Remove"
msgstr "" msgstr ""
#: ../src/manager_window.vala
msgid "Waiting for another package manager to quit"
msgstr ""
#: ../src/manager_window.vala #: ../src/manager_window.vala
#, c-format #, c-format
msgid "%u pending operation" msgid "%u pending operation"
@ -436,7 +429,6 @@ msgid "Licenses"
msgstr "" msgstr ""
#: ../src/manager_window.vala ../resources/manager_window.ui #: ../src/manager_window.vala ../resources/manager_window.ui
#: ../resources/updater_window.ui
msgid "Repository" msgid "Repository"
msgstr "" msgstr ""
@ -525,7 +517,6 @@ msgid "Check Dependencies"
msgstr "" msgstr ""
#: ../src/manager_window.vala ../resources/manager_window.ui #: ../src/manager_window.vala ../resources/manager_window.ui
#: ../resources/updater_window.ui
msgid "Name" msgid "Name"
msgstr "" msgstr ""
@ -534,8 +525,7 @@ msgid "Install Local Packages"
msgstr "" msgstr ""
#: ../src/manager_window.vala ../resources/transaction_sum_dialog.ui #: ../src/manager_window.vala ../resources/transaction_sum_dialog.ui
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui ../resources/choose_ignorepkgs_dialog.ui
#: ../resources/choose_ignorepkgs_dialog.ui
msgid "_Cancel" msgid "_Cancel"
msgstr "" msgstr ""
@ -547,6 +537,10 @@ msgstr ""
msgid "Alpm Package" msgid "Alpm Package"
msgstr "" msgstr ""
#: ../src/manager_window.vala
msgid "A Gtk3 frontend for libalpm"
msgstr ""
#: ../src/preferences_dialog.vala ../resources/preferences_dialog.ui #: ../src/preferences_dialog.vala ../resources/preferences_dialog.ui
msgid "How often to check for updates, value in hours" msgid "How often to check for updates, value in hours"
msgstr "" msgstr ""
@ -592,19 +586,19 @@ msgstr ""
msgid "Commit" msgid "Commit"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "Refresh databases" msgid "Refresh databases"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "View History" msgid "View History"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "Preferences" msgid "Preferences"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "About" msgid "About"
msgstr "" msgstr ""
@ -612,19 +606,23 @@ msgstr ""
msgid "Search" msgid "Search"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "State" msgid "State"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "Repositories" msgid "Repositories"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "Updates"
msgstr ""
#: ../resources/manager_window.ui
msgid "Version" msgid "Version"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "Size" msgid "Size"
msgstr "" msgstr ""
@ -632,8 +630,7 @@ msgstr ""
msgid "Popularity" msgid "Popularity"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui ../resources/preferences_dialog.ui
#: ../resources/preferences_dialog.ui
msgid "AUR" msgid "AUR"
msgstr "" msgstr ""
@ -653,7 +650,7 @@ msgstr ""
msgid "Files" msgid "Files"
msgstr "" msgstr ""
#: ../resources/manager_window.ui ../resources/updater_window.ui #: ../resources/manager_window.ui
msgid "_Apply" msgid "_Apply"
msgstr "" msgstr ""

View File

@ -9,8 +9,6 @@ MANAGER_RESOURCES_FILES = manager_window.ui \
package-reinstall.png \ package-reinstall.png \
package-remove.png package-remove.png
UPDATER_RESOURCES_FILES = updater_window.ui
INSTALLER_RESOURCES_FILES = progress_dialog.ui INSTALLER_RESOURCES_FILES = progress_dialog.ui
TRANSACTION_RESOURCES_FILES = progress_box.ui \ TRANSACTION_RESOURCES_FILES = progress_box.ui \
@ -23,11 +21,9 @@ TRANSACTION_GRESOURCE_FILE = pamac.transaction.gresource.xml
MANAGER_GRESOURCE_FILE = pamac.manager.gresource.xml MANAGER_GRESOURCE_FILE = pamac.manager.gresource.xml
UPDATER_GRESOURCE_FILE = pamac.updater.gresource.xml
INSTALLER_GRESOURCE_FILE = pamac.installer.gresource.xml INSTALLER_GRESOURCE_FILE = pamac.installer.gresource.xml
resources: transaction_resources.c manager_resources.c updater_resources.c installer_resources.c resources: transaction_resources.c manager_resources.c installer_resources.c
clean: clean:
rm -f *.c rm -f *.c
@ -38,8 +34,5 @@ transaction_resources.c: $(TRANSACTION_GRESOURCE_FILE) $(TRANSACTION_RESOURCES_F
manager_resources.c: $(MANAGER_GRESOURCE_FILE) $(MANAGER_RESOURCES_FILES) manager_resources.c: $(MANAGER_GRESOURCE_FILE) $(MANAGER_RESOURCES_FILES)
glib-compile-resources $(MANAGER_GRESOURCE_FILE) --target=manager_resources.c --generate-source glib-compile-resources $(MANAGER_GRESOURCE_FILE) --target=manager_resources.c --generate-source
updater_resources.c: $(UPDATER_GRESOURCE_FILE) $(UPDATER_RESOURCES_FILES)
glib-compile-resources $(UPDATER_GRESOURCE_FILE) --target=updater_resources.c --generate-source
installer_resources.c: $(INSTALLER_GRESOURCE_FILE) $(INSTALLER_RESOURCES_FILES) installer_resources.c: $(INSTALLER_GRESOURCE_FILE) $(INSTALLER_RESOURCES_FILES)
glib-compile-resources $(INSTALLER_GRESOURCE_FILE) --target=installer_resources.c --generate-source glib-compile-resources $(INSTALLER_GRESOURCE_FILE) --target=installer_resources.c --generate-source

View File

@ -294,6 +294,21 @@
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="name">updates</property>
<property name="title" translatable="yes">Updates</property>
<property name="position">4</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -311,6 +326,7 @@
<object class="GtkStackSwitcher" id="packages_stackswitcher"> <object class="GtkStackSwitcher" id="packages_stackswitcher">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="stack">packages_stack</property> <property name="stack">packages_stack</property>
</object> </object>
<packing> <packing>
@ -394,7 +410,7 @@
<child> <child>
<object class="GtkCellRendererText" id="packages_version_renderertext"/> <object class="GtkCellRendererText" id="packages_version_renderertext"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="markup">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -512,7 +528,7 @@
<child> <child>
<object class="GtkCellRendererText" id="aur_version_renderertext"/> <object class="GtkCellRendererText" id="aur_version_renderertext"/>
<attributes> <attributes>
<attribute name="text">3</attribute> <attribute name="markup">3</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
@ -543,6 +559,44 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox" id="updated_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkImage" id="updated_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
<property name="icon_name">object-select-symbolic</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="updated_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">updated</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

Binary file not shown.

After

Width:  |  Height:  |  Size: 501 B

View File

@ -2,6 +2,7 @@
<gresources> <gresources>
<gresource prefix="/org/manjaro/pamac/manager"> <gresource prefix="/org/manjaro/pamac/manager">
<file preprocess="xml-stripblanks">manager_window.ui</file> <file preprocess="xml-stripblanks">manager_window.ui</file>
<file preprocess="xml-stripblanks">history_dialog.ui</file>
<file preprocess="to-pixdata">package-available.png</file> <file preprocess="to-pixdata">package-available.png</file>
<file preprocess="to-pixdata">package-available-locked.png</file> <file preprocess="to-pixdata">package-available-locked.png</file>
<file preprocess="to-pixdata">package-install.png</file> <file preprocess="to-pixdata">package-install.png</file>
@ -9,5 +10,6 @@
<file preprocess="to-pixdata">package-installed-updated.png</file> <file preprocess="to-pixdata">package-installed-updated.png</file>
<file preprocess="to-pixdata">package-reinstall.png</file> <file preprocess="to-pixdata">package-reinstall.png</file>
<file preprocess="to-pixdata">package-remove.png</file> <file preprocess="to-pixdata">package-remove.png</file>
<file preprocess="to-pixdata">package-upgrade.png</file>
</gresource> </gresource>
</gresources> </gresources>

View File

@ -3,7 +3,6 @@
<gresource prefix="/org/manjaro/pamac/transaction"> <gresource prefix="/org/manjaro/pamac/transaction">
<file preprocess="xml-stripblanks">progress_dialog.ui</file> <file preprocess="xml-stripblanks">progress_dialog.ui</file>
<file preprocess="xml-stripblanks">progress_box.ui</file> <file preprocess="xml-stripblanks">progress_box.ui</file>
<file preprocess="xml-stripblanks">history_dialog.ui</file>
<file preprocess="xml-stripblanks">choose_provider_dialog.ui</file> <file preprocess="xml-stripblanks">choose_provider_dialog.ui</file>
<file preprocess="xml-stripblanks">transaction_sum_dialog.ui</file> <file preprocess="xml-stripblanks">transaction_sum_dialog.ui</file>
</gresource> </gresource>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/manjaro/pamac/updater">
<file preprocess="xml-stripblanks">updater_window.ui</file>
</gresource>
</gresources>

View File

@ -1,455 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.16"/>
<object class="GtkPopoverMenu" id="popovermenu">
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="menu_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkModelButton" id="refresh_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Refresh databases</property>
<signal name="clicked" handler="on_refresh_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="history_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">View History</property>
<signal name="clicked" handler="on_history_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="preferences_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Preferences</property>
<signal name="clicked" handler="on_preferences_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="about_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">About</property>
<signal name="clicked" handler="on_about_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="submenu">main</property>
<property name="position">1</property>
</packing>
</child>
</object>
<template class="PamacUpdaterWindow" parent="GtkApplicationWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="default_height">500</property>
<property name="icon_name">system-software-update</property>
<property name="gravity">center</property>
<property name="show_menubar">False</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkStackSwitcher" id="stackswitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="margin_top">6</property>
<property name="stack">stack</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkStack" id="stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkScrolledWindow" id="repos_scrolledwindow">
<property name="width_request">750</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkTreeView" id="repos_updates_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="search_column">1</property>
<property name="fixed_height_mode">True</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection">
<property name="mode">none</property>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn3">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">50</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">State</property>
<property name="clickable">True</property>
<property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererToggle" id="repos_select_update">
<signal name="toggled" handler="on_repos_select_update_toggled" swapped="no"/>
</object>
<attributes>
<attribute name="active">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">200</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">Name</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="repos_update_name"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn6">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">250</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">Version</property>
<property name="clickable">True</property>
<property name="sort_column_id">2</property>
<child>
<object class="GtkCellRendererText" id="repos_update_new_version"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="repos_update_old_version"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn10">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">90</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">Repository</property>
<property name="clickable">True</property>
<property name="sort_column_id">4</property>
<child>
<object class="GtkCellRendererText" id="repos_update_repo"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn2">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">90</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">Size</property>
<property name="clickable">True</property>
<property name="sort_column_id">6</property>
<child>
<object class="GtkCellRendererText" id="repos_update_size"/>
<attributes>
<attribute name="text">5</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="name">repos</property>
<property name="title" translatable="yes">Repositories</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="aur_scrolledwindow">
<property name="width_request">750</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkTreeView" id="aur_updates_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
<property name="search_column">1</property>
<property name="fixed_height_mode">True</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection2">
<property name="mode">none</property>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">40</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">State</property>
<property name="clickable">True</property>
<property name="sort_column_id">0</property>
<child>
<object class="GtkCellRendererToggle" id="aur_select_update">
<signal name="toggled" handler="on_aur_select_update_toggled" swapped="no"/>
</object>
<attributes>
<attribute name="active">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn5">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">200</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">Name</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="aur_update_name"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn8">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed_width">250</property>
<property name="min_width">20</property>
<property name="title" translatable="yes">Version</property>
<property name="clickable">True</property>
<property name="sort_column_id">2</property>
<child>
<object class="GtkCellRendererText" id="aur_update_new_version"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="aur_update_old_version"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="name">aur</property>
<property name="title" translatable="yes">AUR</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="transaction_infobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkButtonBox" id="transaction_infos_buttonbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="details_button">
<property name="label" translatable="yes">Details</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_details_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply_button">
<property name="label" translatable="yes">_Apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_apply_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="button_back">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<signal name="clicked" handler="on_button_back_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="back_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
<style>
<class name="image-button"/>
</style>
</object>
</child>
<child>
<object class="GtkMenuButton" id="menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="popover">popovermenu</property>
<signal name="toggled" handler="on_menu_button_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="menu_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">open-menu-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
<style>
<class name="image-button"/>
</style>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</template>
</interface>

View File

@ -21,11 +21,10 @@ PAMAC_LIB_FLAGS = -X -I. \
--pkg=pamac \ --pkg=pamac \
COMMON_SOURCES = common.vala \ COMMON_SOURCES = common.vala \
package.vala \
pamac_config.vala pamac_config.vala
TRANSACTION_SOURCES = package.vala \ TRANSACTION_SOURCES = transaction.vala \
transaction.vala \
history_dialog.vala \
choose_provider_dialog.vala \ choose_provider_dialog.vala \
transaction_sum_dialog.vala \ transaction_sum_dialog.vala \
progress_box.vala progress_box.vala
@ -38,22 +37,12 @@ TRANSACTION_GRESOURCE_FILE = ../resources/pamac.transaction.gresource.xml
MANAGER_GRESOURCE_FILE = ../resources/pamac.manager.gresource.xml MANAGER_GRESOURCE_FILE = ../resources/pamac.manager.gresource.xml
UPDATER_GRESOURCE_FILE = ../resources/pamac.updater.gresource.xml
INSTALLER_GRESOURCE_FILE = ../resources/pamac.installer.gresource.xml INSTALLER_GRESOURCE_FILE = ../resources/pamac.installer.gresource.xml
binaries: pamac-refresh pamac-daemon pamac-tray pamac-updater pamac-manager pamac-install binaries: pamac-user-daemon pamac-system-daemon pamac-tray pamac-manager pamac-install
clean: clean:
rm -f *.c pamac.h pamac.vapi libpamac.so pamac-refresh pamac-daemon pamac-tray pamac-tray-appindicator pamac-updater pamac-manager pamac-install rm -f *.c pamac.h pamac.vapi libpamac.so pamac-user-daemon pamac-system-daemon pamac-tray pamac-tray-appindicator pamac-manager pamac-install
pamac-refresh: pamac_config.vala refresh.vala
valac -o pamac-refresh \
-X -w \
--pkg=gio-2.0 \
--pkg=posix \
pamac_config.vala \
refresh.vala
pamac-tray: $(COMMON_SOURCES) alpm_config.vala tray.vala tray-gtk.vala pamac-tray: $(COMMON_SOURCES) alpm_config.vala tray.vala tray-gtk.vala
valac -o pamac-tray \ valac -o pamac-tray \
@ -74,8 +63,21 @@ pamac-tray-appindicator: $(COMMON_SOURCES) alpm_config.vala tray.vala tray-appin
tray-appindicator.vala \ tray-appindicator.vala \
tray.vala tray.vala
pamac-daemon: ../vapi/libalpm.vapi ../vapi/polkit-gobject-1.vapi ../vapi/libcurl.vapi alpm_config.vala $(COMMON_SOURCES) package.vala aur.vala mirrors_config.vala daemon.vala pamac-user-daemon: ../vapi/libalpm.vapi alpm_config.vala common.vala package.vala aur.vala user_daemon.vala
valac -o pamac-daemon \ valac -o pamac-user-daemon \
$(COMMON_VALA_FLAGS) \
$(ALPM_VALA_FLAGS) \
--pkg=json-glib-1.0 \
--pkg=libsoup-2.4 \
--thread \
alpm_config.vala \
common.vala \
package.vala \
aur.vala \
user_daemon.vala
pamac-system-daemon: ../vapi/libalpm.vapi ../vapi/polkit-gobject-1.vapi ../vapi/libcurl.vapi alpm_config.vala $(COMMON_SOURCES) aur.vala mirrors_config.vala system_daemon.vala
valac -o pamac-system-daemon \
$(COMMON_VALA_FLAGS) \ $(COMMON_VALA_FLAGS) \
$(ALPM_VALA_FLAGS) \ $(ALPM_VALA_FLAGS) \
--pkg=polkit-gobject-1 \ --pkg=polkit-gobject-1 \
@ -85,10 +87,9 @@ pamac-daemon: ../vapi/libalpm.vapi ../vapi/polkit-gobject-1.vapi ../vapi/libcurl
--thread \ --thread \
alpm_config.vala \ alpm_config.vala \
$(COMMON_SOURCES) \ $(COMMON_SOURCES) \
package.vala \
aur.vala \ aur.vala \
mirrors_config.vala \ mirrors_config.vala \
daemon.vala system_daemon.vala
libpamac.so: $(COMMON_SOURCES) $(TRANSACTION_SOURCES) $(PREFERENCES_SOURCES) ../resources/transaction_resources.c libpamac.so: $(COMMON_SOURCES) $(TRANSACTION_SOURCES) $(PREFERENCES_SOURCES) ../resources/transaction_resources.c
valac -o libpamac.so \ valac -o libpamac.so \
@ -105,7 +106,7 @@ libpamac.so: $(COMMON_SOURCES) $(TRANSACTION_SOURCES) $(PREFERENCES_SOURCES) ../
$(TRANSACTION_SOURCES) \ $(TRANSACTION_SOURCES) \
$(PREFERENCES_SOURCES) $(PREFERENCES_SOURCES)
pamac-manager: libpamac.so ../resources/manager_resources.c manager_window.vala manager.vala pamac-manager: libpamac.so ../resources/manager_resources.c history_dialog.vala manager_window.vala manager.vala
valac -o pamac-manager \ valac -o pamac-manager \
$(COMMON_VALA_FLAGS) \ $(COMMON_VALA_FLAGS) \
$(PAMAC_LIB_FLAGS) \ $(PAMAC_LIB_FLAGS) \
@ -113,20 +114,10 @@ pamac-manager: libpamac.so ../resources/manager_resources.c manager_window.vala
--pkg=gdk-3.0 \ --pkg=gdk-3.0 \
--gresources=$(MANAGER_GRESOURCE_FILE) \ --gresources=$(MANAGER_GRESOURCE_FILE) \
../resources/manager_resources.c \ ../resources/manager_resources.c \
history_dialog.vala \
manager_window.vala \ manager_window.vala \
manager.vala manager.vala
pamac-updater: libpamac.so ../resources/updater_resources.c updater_window.vala updater.vala
valac -o pamac-updater \
$(COMMON_VALA_FLAGS) \
$(PAMAC_LIB_FLAGS) \
--pkg=gtk+-3.0 \
--pkg=gdk-3.0 \
--gresources=$(UPDATER_GRESOURCE_FILE) \
../resources/updater_resources.c \
updater_window.vala \
updater.vala
pamac-install: libpamac.so ../resources/installer_resources.c progress_dialog.vala installer.vala pamac-install: libpamac.so ../resources/installer_resources.c progress_dialog.vala installer.vala
valac -o pamac-install \ valac -o pamac-install \
$(COMMON_VALA_FLAGS) \ $(COMMON_VALA_FLAGS) \

View File

@ -51,7 +51,7 @@ class AlpmConfig {
string? arch; string? arch;
double deltaratio; double deltaratio;
int usesyslog; int usesyslog;
int checkspace; public int checkspace;
GLib.List<string> cachedirs; GLib.List<string> cachedirs;
GLib.List<string> hookdirs; GLib.List<string> hookdirs;
GLib.List<string> ignoregroups; GLib.List<string> ignoregroups;
@ -134,9 +134,22 @@ class AlpmConfig {
} }
} }
public Alpm.Handle? get_handle (bool files_db = false) { public Alpm.Handle? get_handle (bool files_db = false, bool tmp_db = false) {
Alpm.Errno error; Alpm.Errno error = 0;
Alpm.Handle? handle = new Alpm.Handle (rootdir, dbpath, out error); Alpm.Handle? handle = null;
if (tmp_db) {
string tmp_dbpath = "/tmp/pamac-checkdbs-%s".printf (Environment.get_user_name ());
try {
Process.spawn_command_line_sync ("mkdir -p %s".printf (tmp_dbpath));
Process.spawn_command_line_sync ("ln -sf %s/local %s".printf (dbpath, tmp_dbpath));
Process.spawn_command_line_sync ("cp -au %s/sync %s".printf (dbpath, tmp_dbpath));
handle = new Alpm.Handle (rootdir, tmp_dbpath, out error);
} catch (SpawnError e) {
stderr.printf ("SpawnError: %s\n", e.message);
}
} else {
handle = new Alpm.Handle (rootdir, dbpath, out error);
}
if (error == Alpm.Errno.DB_VERSION) { if (error == Alpm.Errno.DB_VERSION) {
try { try {
Process.spawn_command_line_sync ("pacman-db-upgrade", null, null, null); Process.spawn_command_line_sync ("pacman-db-upgrade", null, null, null);
@ -153,7 +166,9 @@ class AlpmConfig {
if (files_db) { if (files_db) {
handle.dbext = ".files"; handle.dbext = ".files";
} }
handle.logfile = logfile; if (!tmp_db) {
handle.logfile = logfile;
}
handle.gpgdir = gpgdir; handle.gpgdir = gpgdir;
handle.arch = arch; handle.arch = arch;
handle.deltaratio = deltaratio; handle.deltaratio = deltaratio;

View File

@ -39,8 +39,8 @@ namespace Pamac {
public struct Updates { public struct Updates {
public bool is_syncfirst; public bool is_syncfirst;
public UpdateInfos[] repos_updates; public AlpmPackage[] repos_updates;
public UpdateInfos[] aur_updates; public AURPackage[] aur_updates;
} }
public struct ErrorInfos { public struct ErrorInfos {

View File

@ -19,7 +19,7 @@
namespace Pamac { namespace Pamac {
[GtkTemplate (ui = "/org/manjaro/pamac/transaction/history_dialog.ui")] [GtkTemplate (ui = "/org/manjaro/pamac/manager/history_dialog.ui")]
class HistoryDialog : Gtk.Dialog { class HistoryDialog : Gtk.Dialog {
[GtkChild] [GtkChild]

View File

@ -26,7 +26,7 @@ namespace Pamac {
bool important_details; bool important_details;
public Installer () { public Installer () {
application_id = "org.manjaro.pamac.install"; application_id = "org.manjaro.pamac.installer";
flags |= ApplicationFlags.HANDLES_OPEN; flags |= ApplicationFlags.HANDLES_OPEN;
} }
@ -90,16 +90,6 @@ namespace Pamac {
stderr.printf ("%s\n", e.message); stderr.printf ("%s\n", e.message);
} }
run = app.get_is_remote (); run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.updater", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
return run; return run;
} }

View File

@ -22,10 +22,11 @@ namespace Pamac {
class Manager : Gtk.Application { class Manager : Gtk.Application {
ManagerWindow manager_window; ManagerWindow manager_window;
bool pamac_run; bool pamac_run;
bool started;
public Manager () { public Manager () {
application_id = "org.manjaro.pamac.manager"; application_id = "org.manjaro.pamac.manager";
flags = ApplicationFlags.FLAGS_NONE; flags = ApplicationFlags.HANDLES_COMMAND_LINE;
} }
public override void startup () { public override void startup () {
@ -67,13 +68,22 @@ namespace Pamac {
} }
} }
public override void activate () { public override int command_line (ApplicationCommandLine cmd) {
if (cmd.get_arguments ()[0] == "pamac-updater") {
manager_window.display_package_queue.clear ();
manager_window.main_stack.visible_child_name = "browse";
manager_window.filters_stack.visible_child_name = "updates";
} else if (!started) {
manager_window.show_default_pkgs ();
started = true;
}
if (!pamac_run) { if (!pamac_run) {
manager_window.present (); manager_window.present ();
while (Gtk.events_pending ()) { while (Gtk.events_pending ()) {
Gtk.main_iteration (); Gtk.main_iteration ();
} }
} }
return 0;
} }
public override void shutdown () { public override void shutdown () {
@ -86,17 +96,7 @@ namespace Pamac {
bool check_pamac_running () { bool check_pamac_running () {
Application app; Application app;
bool run = false; bool run = false;
app = new Application ("org.manjaro.pamac.updater", 0); app = new Application ("org.manjaro.pamac.installer", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.install", 0);
try { try {
app.register (); app.register ();
} catch (GLib.Error e) { } catch (GLib.Error e) {

View File

@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
const string VERSION = "4.9.0";
namespace Pamac { namespace Pamac {
class ActivableCellRendererPixbuf : Gtk.CellRendererPixbuf { class ActivableCellRendererPixbuf : Gtk.CellRendererPixbuf {
@ -42,12 +44,13 @@ namespace Pamac {
Gdk.Pixbuf? to_install_icon; Gdk.Pixbuf? to_install_icon;
Gdk.Pixbuf? to_reinstall_icon; Gdk.Pixbuf? to_reinstall_icon;
Gdk.Pixbuf? to_remove_icon; Gdk.Pixbuf? to_remove_icon;
Gdk.Pixbuf? to_upgrade_icon;
Gdk.Pixbuf? installed_locked_icon; Gdk.Pixbuf? installed_locked_icon;
Gdk.Pixbuf? available_locked_icon; Gdk.Pixbuf? available_locked_icon;
// manager objects // manager objects
[GtkChild] [GtkChild]
Gtk.Stack main_stack; public Gtk.Stack main_stack;
[GtkChild] [GtkChild]
Gtk.Button button_back; Gtk.Button button_back;
[GtkChild] [GtkChild]
@ -79,6 +82,8 @@ namespace Pamac {
[GtkChild] [GtkChild]
Gtk.StackSwitcher packages_stackswitcher; Gtk.StackSwitcher packages_stackswitcher;
[GtkChild] [GtkChild]
Gtk.Label updated_label;
[GtkChild]
Gtk.Stack properties_stack; Gtk.Stack properties_stack;
[GtkChild] [GtkChild]
Gtk.StackSwitcher properties_stackswitcher; Gtk.StackSwitcher properties_stackswitcher;
@ -116,6 +121,7 @@ namespace Pamac {
// menu // menu
Gtk.Menu right_click_menu; Gtk.Menu right_click_menu;
Gtk.MenuItem deselect_item; Gtk.MenuItem deselect_item;
Gtk.MenuItem upgrade_item;
Gtk.MenuItem install_item; Gtk.MenuItem install_item;
Gtk.MenuItem remove_item; Gtk.MenuItem remove_item;
Gtk.MenuItem details_item; Gtk.MenuItem details_item;
@ -130,15 +136,19 @@ namespace Pamac {
Gtk.ListStore packages_list; Gtk.ListStore packages_list;
Gtk.ListStore aur_list; Gtk.ListStore aur_list;
Queue<string> display_package_queue; public Queue<string> display_package_queue;
string current_package_displayed; string current_package_displayed;
public Transaction transaction; public Transaction transaction;
delegate void TransactionAction ();
bool refreshing; bool refreshing;
bool important_details; bool important_details;
bool transaction_running; bool transaction_running;
bool sysupgrade_running;
bool generate_mirrors_list; bool generate_mirrors_list;
bool waiting;
bool force_refresh;
uint search_entry_timeout_id; uint search_entry_timeout_id;
@ -151,13 +161,11 @@ namespace Pamac {
refreshing = false; refreshing = false;
important_details = false; important_details = false;
transaction_running = false; transaction_running = false;
sysupgrade_running = false;
generate_mirrors_list = false; generate_mirrors_list = false;
this.title = dgettext (null, "Package Manager"); this.title = dgettext (null, "Package Manager");
Timeout.add (100, populate_window); updated_label.set_markup ("<b>%s</b>".printf (dgettext (null, "Your system is up-to-date")));
}
bool populate_window () {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH)); this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
while (Gtk.events_pending ()) { while (Gtk.events_pending ()) {
Gtk.main_iteration (); Gtk.main_iteration ();
@ -166,6 +174,9 @@ namespace Pamac {
deselect_item = new Gtk.MenuItem.with_label (dgettext (null, "Deselect")); deselect_item = new Gtk.MenuItem.with_label (dgettext (null, "Deselect"));
deselect_item.activate.connect (on_deselect_item_activate); deselect_item.activate.connect (on_deselect_item_activate);
right_click_menu.append (deselect_item); right_click_menu.append (deselect_item);
upgrade_item = new Gtk.MenuItem.with_label (dgettext (null, "Upgrade"));
upgrade_item.activate.connect (on_upgrade_item_activate);
right_click_menu.append (upgrade_item);
install_item = new Gtk.MenuItem.with_label (dgettext (null, "Install")); install_item = new Gtk.MenuItem.with_label (dgettext (null, "Install"));
install_item.activate.connect (on_install_item_activate); install_item.activate.connect (on_install_item_activate);
right_click_menu.append (install_item); right_click_menu.append (install_item);
@ -205,7 +216,7 @@ namespace Pamac {
uint origin; uint origin;
string pkgname; string pkgname;
treemodel.get (treeiter, 0, out origin, 1, out pkgname); treemodel.get (treeiter, 0, out origin, 1, out pkgname);
if (origin == 2 ) { //origin == Alpm.Package.From.LOCALDB) if (origin == 2) { //origin == Alpm.Package.From.LOCALDB
if (unlikely (transaction.transaction_summary.contains (pkgname))) { if (unlikely (transaction.transaction_summary.contains (pkgname))) {
pixbuf = installed_locked_icon; pixbuf = installed_locked_icon;
} else if (unlikely (transaction.should_hold (pkgname))) { } else if (unlikely (transaction.should_hold (pkgname))) {
@ -221,6 +232,8 @@ namespace Pamac {
pixbuf = available_locked_icon; pixbuf = available_locked_icon;
} else if (unlikely (transaction.to_install.contains (pkgname))) { } else if (unlikely (transaction.to_install.contains (pkgname))) {
pixbuf = to_install_icon; pixbuf = to_install_icon;
} else if (unlikely (transaction.to_update.contains (pkgname))) {
pixbuf = to_upgrade_icon;
} else { } else {
pixbuf = uninstalled_icon; pixbuf = uninstalled_icon;
} }
@ -246,7 +259,13 @@ namespace Pamac {
uint origin; uint origin;
string pkgname; string pkgname;
treemodel.get (treeiter, 0, out origin, 1, out pkgname); treemodel.get (treeiter, 0, out origin, 1, out pkgname);
if ((uint) origin == 2 ) { //origin == Alpm.Package.From.LOCALDB) if (filters_stack.visible_child_name == "updates") {
if (unlikely (transaction.temporary_ignorepkgs.contains (pkgname))) {
pixbuf = uninstalled_icon;
} else {
pixbuf = to_upgrade_icon;
}
} else if ((uint) origin == 2) { //origin == Alpm.Package.From.LOCALDB
if (unlikely (transaction.transaction_summary.contains (pkgname))) { if (unlikely (transaction.transaction_summary.contains (pkgname))) {
pixbuf = installed_locked_icon; pixbuf = installed_locked_icon;
} else if (unlikely (transaction.should_hold (pkgname))) { } else if (unlikely (transaction.should_hold (pkgname))) {
@ -273,6 +292,7 @@ namespace Pamac {
to_install_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-install.png"); to_install_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-install.png");
to_reinstall_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-reinstall.png"); to_reinstall_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-reinstall.png");
to_remove_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-remove.png"); to_remove_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-remove.png");
to_upgrade_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-upgrade.png");
installed_locked_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-installed-locked.png"); installed_locked_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-installed-locked.png");
available_locked_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-available-locked.png"); available_locked_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-available-locked.png");
} catch (GLib.Error e) { } catch (GLib.Error e) {
@ -280,9 +300,6 @@ namespace Pamac {
} }
transaction = new Transaction (this as Gtk.ApplicationWindow); transaction = new Transaction (this as Gtk.ApplicationWindow);
transaction.mode = Mode.MANAGER;
transaction.start_waiting.connect (on_start_waiting);
transaction.stop_waiting.connect (on_stop_waiting);
transaction.start_downloading.connect (on_start_downloading); transaction.start_downloading.connect (on_start_downloading);
transaction.stop_downloading.connect (on_stop_downloading); transaction.stop_downloading.connect (on_stop_downloading);
transaction.start_building.connect (on_start_building); transaction.start_building.connect (on_start_building);
@ -292,6 +309,8 @@ namespace Pamac {
transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished); transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished);
transaction.set_pkgreason_finished.connect (on_set_pkgreason_finished); transaction.set_pkgreason_finished.connect (on_set_pkgreason_finished);
transaction.generate_mirrors_list.connect (on_generate_mirrors_list); transaction.generate_mirrors_list.connect (on_generate_mirrors_list);
transaction.run_preferences_dialog_finished.connect (on_run_preferences_dialog_finished);
transaction.get_updates_finished.connect (on_get_updates_finished);
// integrate progress box and term widget // integrate progress box and term widget
main_stack.add_named (transaction.term_window, "term"); main_stack.add_named (transaction.term_window, "term");
@ -301,15 +320,16 @@ namespace Pamac {
display_package_queue = new Queue<string> (); display_package_queue = new Queue<string> ();
update_lists ();
show_default_pkgs ();
search_entry.grab_focus ();
main_stack.notify["visible-child"].connect (on_main_stack_visible_child_changed); main_stack.notify["visible-child"].connect (on_main_stack_visible_child_changed);
filters_stack.notify["visible-child"].connect (on_filters_stack_visible_child_changed); filters_stack.notify["visible-child"].connect (on_filters_stack_visible_child_changed);
packages_stack.notify["visible-child"].connect (on_packages_stack_visible_child_changed); packages_stack.notify["visible-child"].connect (on_packages_stack_visible_child_changed);
properties_stack.notify["visible-child"].connect (on_properties_stack_visible_child_changed); properties_stack.notify["visible-child"].connect (on_properties_stack_visible_child_changed);
Timeout.add (100, populate_window);
}
bool populate_window () {
update_lists ();
return false; return false;
} }
@ -319,6 +339,8 @@ namespace Pamac {
} }
void on_set_pkgreason_finished () { void on_set_pkgreason_finished () {
transaction.unlock ();
transaction.refresh_handle ();
refresh_packages_list (); refresh_packages_list ();
if (main_stack.visible_child_name == "details") { if (main_stack.visible_child_name == "details") {
if (transaction.get_installed_pkg (current_package_displayed).name != "" if (transaction.get_installed_pkg (current_package_displayed).name != ""
@ -328,7 +350,7 @@ namespace Pamac {
display_aur_properties (current_package_displayed); display_aur_properties (current_package_displayed);
} }
} }
} }
void support_aur (bool enable_aur) { void support_aur (bool enable_aur) {
if (enable_aur) { if (enable_aur) {
@ -340,28 +362,76 @@ namespace Pamac {
} }
} }
void set_pendings_operations () { void try_lock_and_run (TransactionAction action) {
if (!transaction_running && !generate_mirrors_list) { if (transaction.get_lock ()) {
uint total_pending = transaction.to_install.length + transaction.to_remove.length + transaction.to_build.length; action ();
if (total_pending == 0) { } else {
transaction.progress_box.action_label.label = ""; waiting = true;
cancel_button.sensitive = false; transaction.progress_box.action_label.label = dgettext (null, "Waiting for another package manager to quit") + "...";
apply_button.sensitive = false; transaction.start_progressbar_pulse ();
if (important_details) { cancel_button.sensitive = true;
transaction_infobox.show_all (); transaction_infobox.show_all ();
Timeout.add (5000, () => {
bool locked = transaction.get_lock ();
if (locked) {
waiting = false;
transaction.stop_progressbar_pulse ();
action ();
} }
} else { return !locked;
string info = dngettext (null, "%u pending operation", "%u pending operations", total_pending).printf (total_pending); });
transaction.progress_box.action_label.label = info; }
cancel_button.sensitive = true; }
apply_button.sensitive = true;
void set_pendings_operations () {
if (!transaction_running && !generate_mirrors_list && !refreshing && !sysupgrade_running) {
if (filters_stack.visible_child_name == "updates") {
uint64 total_dsize = 0;
packages_list.foreach ((model, path, iter) => {
string name;
uint64 dsize;
packages_list.get (iter, 1, out name, 5, out dsize);
if (transaction.to_update.contains (name)) {
total_dsize += dsize;
}
return false;
});
if (total_dsize > 0) {
transaction.progress_box.action_label.set_markup("<b>%s: %s</b>".printf (dgettext (null, "Total download size"), format_size (total_dsize)));
} else {
transaction.progress_box.action_label.label = "";
}
if (!transaction_running && !generate_mirrors_list && !refreshing && !sysupgrade_running
&& (transaction.to_update.length > 0)) {
apply_button.sensitive = true;
} else {
apply_button.sensitive = false;
}
cancel_button.sensitive = false;
// fix an possible visibility issue // fix an possible visibility issue
transaction_infobox.show_all (); transaction_infobox.show_all ();
} else {
uint total_pending = transaction.to_install.length + transaction.to_remove.length + transaction.to_build.length;
if (total_pending == 0) {
transaction.progress_box.action_label.label = "";
cancel_button.sensitive = false;
apply_button.sensitive = false;
if (important_details) {
transaction_infobox.show_all ();
}
} else {
string info = dngettext (null, "%u pending operation", "%u pending operations", total_pending).printf (total_pending);
transaction.progress_box.action_label.label = info;
cancel_button.sensitive = true;
apply_button.sensitive = true;
// fix an possible visibility issue
transaction_infobox.show_all ();
}
} }
} }
} }
void show_default_pkgs () { public void show_default_pkgs () {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH)); this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
transaction.get_installed_pkgs.begin ((obj, res) => { transaction.get_installed_pkgs.begin ((obj, res) => {
populate_packages_list (transaction.get_installed_pkgs.end (res)); populate_packages_list (transaction.get_installed_pkgs.end (res));
@ -402,7 +472,9 @@ namespace Pamac {
} }
void on_mark_explicit_button_clicked (Gtk.Button button) { void on_mark_explicit_button_clicked (Gtk.Button button) {
transaction.start_set_pkgreason (current_package_displayed, 0); //Alpm.Package.Reason.EXPLICIT if (transaction.get_lock ()) {
transaction.start_set_pkgreason (current_package_displayed, 0); //Alpm.Package.Reason.EXPLICIT
}
} }
Gtk.Widget populate_details_grid (string detail_type, string detail, Gtk.Widget? previous_widget) { Gtk.Widget populate_details_grid (string detail_type, string detail, Gtk.Widget? previous_widget) {
@ -411,6 +483,7 @@ namespace Pamac {
label.halign = Gtk.Align.START; label.halign = Gtk.Align.START;
details_grid.attach_next_to (label, previous_widget, Gtk.PositionType.BOTTOM); details_grid.attach_next_to (label, previous_widget, Gtk.PositionType.BOTTOM);
if (!transaction_running if (!transaction_running
&& !sysupgrade_running
&& detail_type == dgettext (null, "Install Reason") && detail_type == dgettext (null, "Install Reason")
&& detail == dgettext (null, "Installed as a dependency for another package")) { && detail == dgettext (null, "Installed as a dependency for another package")) {
var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12); var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
@ -816,14 +889,26 @@ namespace Pamac {
packages_treeview.freeze_child_notify (); packages_treeview.freeze_child_notify ();
packages_list.clear (); packages_list.clear ();
foreach (unowned AlpmPackage pkg in pkgs) { foreach (unowned AlpmPackage pkg in pkgs) {
string version;
uint64 size;
string size_str;
if (filters_stack.visible_child_name == "updates") {
version = "<b>%s</b>\n(%s)".printf (pkg.version, pkg.installed_version);
size = pkg.download_size;
size_str = pkg.download_size == 0 ? "" : GLib.format_size (pkg.download_size);
} else {
version = pkg.version;
size = pkg.size;
size_str = GLib.format_size (pkg.size);
}
packages_list.insert_with_values (null, -1, packages_list.insert_with_values (null, -1,
0, pkg.origin, 0, pkg.origin,
1, pkg.name, 1, pkg.name,
2, "<b>%s</b>\n%s".printf (pkg.name, Markup.escape_text (pkg.desc)), 2, "<b>%s</b>\n%s".printf (pkg.name, Markup.escape_text (pkg.desc)),
3, pkg.version, 3, version,
4, pkg.repo, 4, pkg.repo,
5, pkg.size, 5, size,
6, GLib.format_size (pkg.size)); 6, size_str);
} }
packages_treeview.thaw_child_notify (); packages_treeview.thaw_child_notify ();
packages_treeview.thaw_notify (); packages_treeview.thaw_notify ();
@ -836,24 +921,21 @@ namespace Pamac {
aur_treeview.freeze_child_notify (); aur_treeview.freeze_child_notify ();
aur_list.clear (); aur_list.clear ();
foreach (unowned AURPackage aur_pkg in pkgs) { foreach (unowned AURPackage aur_pkg in pkgs) {
AlpmPackage alpm_pkg = transaction.get_installed_pkg (aur_pkg.name); string version;
if (alpm_pkg.name != "") { if (filters_stack.visible_child_name == "updates") {
aur_list.insert_with_values (null, -1, version = "<b>%s</b>\n(%s)".printf (aur_pkg.version, aur_pkg.installed_version);
0, alpm_pkg.origin, } else if (aur_pkg.installed_version == "") {
1, alpm_pkg.name, version = aur_pkg.version;
2, "<b>%s</b>\n%s".printf (alpm_pkg.name, Markup.escape_text (alpm_pkg.desc)),
3, alpm_pkg.version,
4, aur_pkg.popularity,
5, "%.2f".printf (aur_pkg.popularity));
} else { } else {
aur_list.insert_with_values (null, -1, version = aur_pkg.installed_version;
0, 0,
1, aur_pkg.name,
2, "<b>%s</b>\n%s".printf (aur_pkg.name, Markup.escape_text (aur_pkg.desc)),
3, aur_pkg.version,
4, aur_pkg.popularity,
5, "%.2f".printf (aur_pkg.popularity));
} }
aur_list.insert_with_values (null, -1,
0, aur_pkg.installed_version == "" ? 0 : 2, //Alpm.Package.From.LOCALDB
1, aur_pkg.name,
2, "<b>%s</b>\n%s".printf (aur_pkg.name, Markup.escape_text (aur_pkg.desc)),
3, version,
4, aur_pkg.popularity,
5, "%.2f".printf (aur_pkg.popularity));
} }
aur_treeview.thaw_child_notify (); aur_treeview.thaw_child_notify ();
aur_treeview.thaw_notify (); aur_treeview.thaw_notify ();
@ -863,7 +945,13 @@ namespace Pamac {
void refresh_packages_list () { void refresh_packages_list () {
switch (filters_stack.visible_child_name) { switch (filters_stack.visible_child_name) {
case "search": case "search":
aur_list.clear ();
filters_stack.visible = true;
set_pendings_operations ();
packages_stackswitcher.visible = transaction.enable_aur; packages_stackswitcher.visible = transaction.enable_aur;
if (packages_stack.visible_child_name == "updated") {
packages_stack.visible_child_name = "repos";
}
Gtk.TreeSelection selection = search_treeview.get_selection (); Gtk.TreeSelection selection = search_treeview.get_selection ();
if (selection.get_selected (null, null)) { if (selection.get_selected (null, null)) {
on_search_treeview_selection_changed (); on_search_treeview_selection_changed ();
@ -873,20 +961,41 @@ namespace Pamac {
} }
break; break;
case "groups": case "groups":
filters_stack.visible = true;
set_pendings_operations ();
packages_stack.visible_child_name = "repos"; packages_stack.visible_child_name = "repos";
packages_stackswitcher.visible = false; packages_stackswitcher.visible = false;
on_groups_treeview_selection_changed (); on_groups_treeview_selection_changed ();
break; break;
case "states": case "states":
filters_stack.visible = true;
set_pendings_operations ();
packages_stack.visible_child_name = "repos"; packages_stack.visible_child_name = "repos";
packages_stackswitcher.visible = false; packages_stackswitcher.visible = false;
on_states_treeview_selection_changed (); on_states_treeview_selection_changed ();
break; break;
case "repos": case "repos":
filters_stack.visible = true;
set_pendings_operations ();
packages_stack.visible_child_name = "repos"; packages_stack.visible_child_name = "repos";
packages_stackswitcher.visible = false; packages_stackswitcher.visible = false;
on_repos_treeview_selection_changed (); on_repos_treeview_selection_changed ();
break; break;
case "updates":
packages_list.clear ();
aur_list.clear ();
var attention_val = GLib.Value (typeof (bool));
attention_val.set_boolean (false);
filters_stack.child_set_property (filters_stack.get_child_by_name ("updates"),
"needs-attention",
attention_val);
filters_stack.visible = false;
packages_stack.visible_child_name = "repos";
packages_stackswitcher.visible = false;
apply_button.visible = false;
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
transaction.start_get_updates ();
break;
default: default:
break; break;
} }
@ -1005,6 +1114,10 @@ namespace Pamac {
if (!transaction.should_hold (pkgname)) { if (!transaction.should_hold (pkgname)) {
transaction.to_remove.add (pkgname); transaction.to_remove.add (pkgname);
} }
} else if (transaction.to_update.remove (pkgname)) {
transaction.temporary_ignorepkgs.add (pkgname);
} else if (transaction.temporary_ignorepkgs.remove (pkgname)) {
transaction.to_update.add (pkgname);
} else { } else {
transaction.to_install.add (pkgname); transaction.to_install.add (pkgname);
} }
@ -1037,7 +1150,13 @@ namespace Pamac {
uint origin; uint origin;
string pkgname; string pkgname;
aur_list.get (iter, 0, out origin, 1, out pkgname); aur_list.get (iter, 0, out origin, 1, out pkgname);
if (origin == 2) { //Alpm.Package.From.LOCALDB if (filters_stack.visible_child_name == "updates") {
if (transaction.to_update.remove (pkgname)) {
transaction.temporary_ignorepkgs.add (pkgname);
} else if (transaction.temporary_ignorepkgs.remove (pkgname)) {
transaction.to_update.add (pkgname);
}
} else if (origin == 2) { //Alpm.Package.From.LOCALDB
if (!transaction.transaction_summary.contains (pkgname)) { if (!transaction.transaction_summary.contains (pkgname)) {
if (transaction.to_remove.remove (pkgname)) { if (transaction.to_remove.remove (pkgname)) {
} else if (!transaction.should_hold (pkgname)) { } else if (!transaction.should_hold (pkgname)) {
@ -1119,12 +1238,30 @@ namespace Pamac {
void on_deselect_item_activate () { void on_deselect_item_activate () {
foreach (unowned string pkgname in selected_pkgs) { foreach (unowned string pkgname in selected_pkgs) {
if (transaction.to_install.remove (pkgname)) { if (transaction.to_install.remove (pkgname)) {
} else if (transaction.to_update.remove (pkgname)) {
transaction.temporary_ignorepkgs.add (pkgname);
} else { } else {
transaction.to_remove.remove (pkgname); transaction.to_remove.remove (pkgname);
} }
} }
foreach (unowned string pkgname in selected_aur) { foreach (unowned string pkgname in selected_aur) {
transaction.to_build.remove (pkgname); if (transaction.to_build.remove (pkgname)) {
} else {
transaction.to_update.remove (pkgname);
transaction.temporary_ignorepkgs.add (pkgname);
}
}
set_pendings_operations ();
}
void on_upgrade_item_activate () {
foreach (unowned string pkgname in selected_pkgs) {
transaction.temporary_ignorepkgs.remove (pkgname);
transaction.to_update.add (pkgname);
}
foreach (unowned string pkgname in selected_aur) {
transaction.temporary_ignorepkgs.remove (pkgname);
transaction.to_update.add (pkgname);
} }
set_pendings_operations (); set_pendings_operations ();
} }
@ -1188,6 +1325,7 @@ namespace Pamac {
selected_pkgs = new GLib.List<string> (); selected_pkgs = new GLib.List<string> ();
selected_aur = new GLib.List<string> (); selected_aur = new GLib.List<string> ();
deselect_item.sensitive = false; deselect_item.sensitive = false;
upgrade_item.sensitive = false;
install_item.sensitive = false; install_item.sensitive = false;
remove_item.sensitive = false; remove_item.sensitive = false;
if (selected_paths.length () == 1) { if (selected_paths.length () == 1) {
@ -1201,8 +1339,11 @@ namespace Pamac {
selected_pkgs.append (pkgname); selected_pkgs.append (pkgname);
details_item.sensitive = true; details_item.sensitive = true;
if (transaction.to_install.contains (pkgname) if (transaction.to_install.contains (pkgname)
|| transaction.to_remove.contains (pkgname)) { || transaction.to_remove.contains (pkgname)
|| transaction.to_update.contains (pkgname)) {
deselect_item.sensitive = true; deselect_item.sensitive = true;
} else if (transaction.temporary_ignorepkgs.contains (pkgname)) {
upgrade_item.sensitive = true;
} else if (origin == 2) { //Alpm.Package.From.LOCALDB } else if (origin == 2) { //Alpm.Package.From.LOCALDB
remove_item.sensitive = true; remove_item.sensitive = true;
} else if (origin == 3) { //Alpm.Package.From.SYNCDB } else if (origin == 3) { //Alpm.Package.From.SYNCDB
@ -1219,12 +1360,17 @@ namespace Pamac {
selected_pkgs.append (pkgname); selected_pkgs.append (pkgname);
if (!deselect_item.sensitive) { if (!deselect_item.sensitive) {
if (transaction.to_install.contains (pkgname) if (transaction.to_install.contains (pkgname)
|| transaction.to_remove.contains (pkgname)) { || transaction.to_remove.contains (pkgname)
|| transaction.to_update.contains (pkgname)) {
deselect_item.sensitive = true; deselect_item.sensitive = true;
} }
} }
if (origin == 3) { //Alpm.Package.From.SYNCDB if (origin == 3) { //Alpm.Package.From.SYNCDB
install_item.sensitive = true; if (transaction.temporary_ignorepkgs.contains (pkgname)) {
upgrade_item.sensitive = true;
} else {
install_item.sensitive = true;
}
} }
if (origin == 2) { //Alpm.Package.From.LOCALDB if (origin == 2) { //Alpm.Package.From.LOCALDB
remove_item.sensitive = true; remove_item.sensitive = true;
@ -1234,7 +1380,7 @@ namespace Pamac {
right_click_menu.popup (null, null, null, event.button, event.time); right_click_menu.popup (null, null, null, event.button, event.time);
return true; return true;
} }
} }
return false; return false;
} }
@ -1268,6 +1414,7 @@ namespace Pamac {
selected_pkgs = new GLib.List<string> (); selected_pkgs = new GLib.List<string> ();
selected_aur = new GLib.List<string> (); selected_aur = new GLib.List<string> ();
deselect_item.sensitive = false; deselect_item.sensitive = false;
upgrade_item.sensitive = false;
install_item.sensitive = false; install_item.sensitive = false;
remove_item.sensitive = false; remove_item.sensitive = false;
if (selected_paths.length () == 1) { if (selected_paths.length () == 1) {
@ -1297,9 +1444,11 @@ namespace Pamac {
} }
} }
foreach (unowned string pkgname in selected_pkgs) { foreach (unowned string pkgname in selected_pkgs) {
if (transaction.to_remove.contains (pkgname)) { if (transaction.to_remove.contains (pkgname)
|| transaction.to_update.contains (pkgname)) {
deselect_item.sensitive = true; deselect_item.sensitive = true;
break; } else if (transaction.temporary_ignorepkgs.contains (pkgname)) {
upgrade_item.sensitive = true;
} }
} }
right_click_menu.popup (null, null, null, event.button, event.time); right_click_menu.popup (null, null, null, event.button, event.time);
@ -1573,12 +1722,44 @@ namespace Pamac {
[GtkCallback] [GtkCallback]
void on_menu_button_toggled () { void on_menu_button_toggled () {
preferences_button.sensitive = !transaction_running; preferences_button.sensitive = !(transaction_running || sysupgrade_running);
} }
[GtkCallback] [GtkCallback]
void on_history_button_clicked () { void on_history_button_clicked () {
transaction.run_history_dialog (); this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
while (Gtk.events_pending ()) {
Gtk.main_iteration ();
}
var file = GLib.File.new_for_path ("/var/log/pacman.log");
if (!file.query_exists ()) {
GLib.stderr.printf ("File '%s' doesn't exist.\n", file.get_path ());
} else {
StringBuilder text = new StringBuilder ();
try {
// Open file for reading and wrap returned FileInputStream into a
// DataInputStream, so we can read line by line
var dis = new DataInputStream (file.read ());
string line;
// Read lines until end of file (null) is reached
while ((line = dis.read_line ()) != null) {
// construct text in reverse order
text.prepend (line + "\n");
}
} catch (GLib.Error e) {
GLib.stderr.printf ("%s\n", e.message);
}
var history_dialog = new HistoryDialog (this);
history_dialog.textview.buffer.set_text (text.str, (int) text.len);
this.get_window ().set_cursor (null);
history_dialog.show ();
history_dialog.response.connect (() => {
history_dialog.destroy ();
});
while (Gtk.events_pending ()) {
Gtk.main_iteration ();
}
}
} }
[GtkCallback] [GtkCallback]
@ -1589,7 +1770,6 @@ namespace Pamac {
dgettext (null, "_Open"),Gtk.ResponseType.ACCEPT); dgettext (null, "_Open"),Gtk.ResponseType.ACCEPT);
chooser.window_position = Gtk.WindowPosition.CENTER_ON_PARENT; chooser.window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
chooser.icon_name = "system-software-install"; chooser.icon_name = "system-software-install";
chooser.default_width = 900;
chooser.select_multiple = true; chooser.select_multiple = true;
chooser.local_only = false; chooser.local_only = false;
chooser.create_folders = false; chooser.create_folders = false;
@ -1603,13 +1783,8 @@ namespace Pamac {
foreach (unowned string path in packages_paths) { foreach (unowned string path in packages_paths) {
transaction.to_load.add (path); transaction.to_load.add (path);
} }
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
chooser.destroy (); chooser.destroy ();
while (Gtk.events_pending ()) { try_lock_and_run (run_transaction);
Gtk.main_iteration ();
}
transaction_running = true;
transaction.run ();
} }
} else { } else {
chooser.destroy (); chooser.destroy ();
@ -1621,18 +1796,43 @@ namespace Pamac {
[GtkCallback] [GtkCallback]
void on_preferences_button_clicked () { void on_preferences_button_clicked () {
transaction.run_preferences_dialog.begin (); if (transaction.get_lock ()) {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
transaction.run_preferences_dialog ();
} else {
transaction.display_error (dgettext (null, "Waiting for another package manager to quit"), {});
}
}
void on_run_preferences_dialog_finished () {
transaction.unlock ();
if (filters_stack.visible_child_name == "updates") {
transaction.start_get_updates ();
} else {
this.get_window ().set_cursor (null);
}
} }
[GtkCallback] [GtkCallback]
void on_about_button_clicked () { void on_about_button_clicked () {
transaction.run_about_dialog (); string[] authors = {"Guillaume Benoit"};
Gtk.show_about_dialog (
this,
"program_name", "Pamac",
"icon_name", "system-software-install",
"logo_icon_name", "system-software-install",
"comments", dgettext (null, "A Gtk3 frontend for libalpm"),
"copyright", "Copyright © 2017 Guillaume Benoit",
"authors", authors,
"version", VERSION,
"license_type", Gtk.License.GPL_3_0,
"website", "http://github.com/manjaro/pamac");
} }
[GtkCallback] [GtkCallback]
void on_details_button_clicked () { void on_details_button_clicked () {
important_details = false; important_details = false;
if (transaction_running) { if (transaction_running || sysupgrade_running) {
main_stack.visible_child_name = "term"; main_stack.visible_child_name = "term";
} else { } else {
uint total_pending = transaction.to_install.length + transaction.to_remove.length + transaction.to_build.length; uint total_pending = transaction.to_install.length + transaction.to_remove.length + transaction.to_build.length;
@ -1658,17 +1858,47 @@ namespace Pamac {
[GtkCallback] [GtkCallback]
void on_apply_button_clicked () { void on_apply_button_clicked () {
if (filters_stack.visible_child_name == "updates") {
force_refresh = false;
refreshing = true;
try_lock_and_run (run_refresh);
} else {
try_lock_and_run (run_transaction);
}
}
void run_transaction () {
transaction_running = true; transaction_running = true;
apply_button.sensitive = false; apply_button.sensitive = false;
cancel_button.sensitive = false; cancel_button.sensitive = false;
transaction.run (); transaction.run ();
} }
void run_sysupgrade () {
sysupgrade_running = true;
apply_button.sensitive = false;
cancel_button.sensitive = false;
transaction.sysupgrade (false);
}
[GtkCallback] [GtkCallback]
void on_cancel_button_clicked () { void on_cancel_button_clicked () {
if (transaction_running || refreshing) { if (waiting) {
waiting = false;
transaction.stop_progressbar_pulse ();
transaction.to_load.remove_all ();
transaction.unlock ();
set_pendings_operations ();
} else if (transaction_running) {
transaction_running = false; transaction_running = false;
transaction.cancel (); transaction.cancel ();
} else if (refreshing) {
refreshing = false;
transaction.cancel ();
} else if (sysupgrade_running) {
sysupgrade_running = false;
transaction.cancel ();
transaction.to_build.remove_all ();
} else { } else {
transaction.clear_lists (); transaction.clear_lists ();
set_pendings_operations (); set_pendings_operations ();
@ -1689,19 +1919,60 @@ namespace Pamac {
[GtkCallback] [GtkCallback]
void on_refresh_button_clicked () { void on_refresh_button_clicked () {
force_refresh = true;
try_lock_and_run (run_refresh);
}
void run_refresh () {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH)); this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
refreshing = true; transaction.start_refresh (force_refresh);
transaction.start_refresh (true);
apply_button.sensitive = false; apply_button.sensitive = false;
cancel_button.sensitive = true;
transaction_infobox.show_all (); transaction_infobox.show_all ();
} }
void on_start_waiting () { void on_get_updates_finished (Updates updates) {
cancel_button.sensitive = true; if (filters_stack.visible_child_name == "updates") {
} transaction.to_update.remove_all ();
packages_stackswitcher.visible = false;
void on_stop_waiting () { if ((updates.repos_updates.length + updates.aur_updates.length) == 0) {
set_pendings_operations (); filters_stack.visible = false;
if (!refreshing && !transaction_running && !sysupgrade_running) {
transaction_infobox.visible = false;
}
packages_stack.visible_child_name = "updated";
this.get_window ().set_cursor (null);
} else {
if (updates.repos_updates.length > 0) {
foreach (unowned AlpmPackage pkg in updates.repos_updates) {
if (!transaction.temporary_ignorepkgs.contains (pkg.name)) {
transaction.to_update.add (pkg.name);
}
}
populate_packages_list (updates.repos_updates);
}
if (updates.aur_updates.length > 0) {
packages_stackswitcher.visible = true;
foreach (unowned AURPackage pkg in updates.aur_updates) {
if (!transaction.temporary_ignorepkgs.contains (pkg.name)) {
transaction.to_update.add (pkg.name);
}
}
populate_aur_list (updates.aur_updates);
if (updates.repos_updates.length == 0) {
packages_stack.visible_child_name = "aur";
}
}
set_pendings_operations ();
}
} else if ((updates.repos_updates.length + updates.aur_updates.length) > 0) {
this.get_window ().set_cursor (null);
var attention_val = GLib.Value (typeof (bool));
attention_val.set_boolean (true);
filters_stack.child_set_property (filters_stack.get_child_by_name ("updates"),
"needs-attention",
attention_val);
}
} }
void on_start_downloading () { void on_start_downloading () {
@ -1737,7 +2008,7 @@ namespace Pamac {
} }
void on_transaction_finished (bool success) { void on_transaction_finished (bool success) {
refresh_packages_list (); transaction.refresh_handle ();
if (main_stack.visible_child_name == "details") { if (main_stack.visible_child_name == "details") {
if (transaction.get_installed_pkg (current_package_displayed).name != "" if (transaction.get_installed_pkg (current_package_displayed).name != ""
|| transaction.get_sync_pkg (current_package_displayed).name != "") { || transaction.get_sync_pkg (current_package_displayed).name != "") {
@ -1750,14 +2021,18 @@ namespace Pamac {
} }
transaction.to_load.remove_all (); transaction.to_load.remove_all ();
if (refreshing) { if (refreshing) {
if (success) {
transaction_running = true;
transaction.sysupgrade (false);
}
refreshing = false; refreshing = false;
run_sysupgrade ();
} else if (sysupgrade_running) {
sysupgrade_running = false;
transaction.to_build.remove_all ();
transaction.unlock ();
refresh_packages_list ();
} else { } else {
transaction_running = false; transaction_running = false;
generate_mirrors_list = false; generate_mirrors_list = false;
transaction.unlock ();
refresh_packages_list ();
} }
set_pendings_operations (); set_pendings_operations ();
} }

View File

@ -20,32 +20,9 @@
namespace Pamac { namespace Pamac {
class MirrorsConfig { class MirrorsConfig {
string conf_path; string conf_path;
GLib.List<string> _countries ;
public string choosen_generation_method { get; private set; } public string choosen_generation_method { get; private set; }
public string choosen_country { get; private set; } public string choosen_country { get; private set; }
public unowned GLib.List<string> countries {
get {
try {
string countries_str;
int status;
Process.spawn_command_line_sync ("pacman-mirrors -l",
out countries_str,
null,
out status);
_countries = new GLib.List<string> ();
if (status == 0) {
foreach (unowned string country in countries_str.split ("\n")) {
_countries.append (country);
}
}
} catch (SpawnError e) {
stdout.printf ("Error: %s\n", e.message);
}
return _countries;
}
}
public MirrorsConfig (string path) { public MirrorsConfig (string path) {
conf_path = path; conf_path = path;

View File

@ -21,9 +21,11 @@ namespace Pamac {
public struct AlpmPackage { public struct AlpmPackage {
public string name; public string name;
public string version; public string version;
public string installed_version;
public string desc; public string desc;
public string repo; public string repo;
public uint64 size; public uint64 size;
public uint64 download_size;
public uint origin; public uint origin;
} }
@ -54,6 +56,7 @@ namespace Pamac {
public struct AURPackage { public struct AURPackage {
public string name; public string name;
public string version; public string version;
public string installed_version;
public string desc; public string desc;
public double popularity; public double popularity;
} }

View File

@ -62,6 +62,7 @@ namespace Pamac {
Gtk.ListStore ignorepkgs_liststore; Gtk.ListStore ignorepkgs_liststore;
Transaction transaction; Transaction transaction;
uint64 previous_refresh_period; uint64 previous_refresh_period;
string[] countries;
public PreferencesDialog (Transaction transaction) { public PreferencesDialog (Transaction transaction) {
Object (transient_for: transaction.application_window, use_header_bar: 1); Object (transient_for: transaction.application_window, use_header_bar: 1);
@ -108,8 +109,9 @@ namespace Pamac {
var mirrors_config = new MirrorsConfig ("/etc/pacman-mirrors.conf"); var mirrors_config = new MirrorsConfig ("/etc/pacman-mirrors.conf");
mirrors_country_comboboxtext.append_text (dgettext (null, "Worldwide")); mirrors_country_comboboxtext.append_text (dgettext (null, "Worldwide"));
mirrors_country_comboboxtext.active = 0; mirrors_country_comboboxtext.active = 0;
countries = transaction.get_mirrors_countries ();
int index = 1; int index = 1;
foreach (unowned string country in mirrors_config.countries) { foreach (unowned string country in countries) {
mirrors_country_comboboxtext.append_text (country); mirrors_country_comboboxtext.append_text (country);
if (country == mirrors_config.choosen_country) { if (country == mirrors_config.choosen_country) {
mirrors_country_comboboxtext.active = index; mirrors_country_comboboxtext.active = index;

View File

@ -1,100 +0,0 @@
/*
* pamac-vala
*
* Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a get of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Pamac {
[DBus (name = "org.manjaro.pamac")]
interface Daemon : Object {
public abstract void start_refresh (bool force) throws IOError;
[DBus (no_reply = true)]
public abstract void quit () throws IOError;
public signal void refresh_finished (bool success);
}
}
Pamac.Daemon pamac_daemon;
MainLoop loop;
bool check_pamac_running () {
Application app;
bool run = false;
app = new Application ("org.manjaro.pamac.manager", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.updater", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.install", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
return run;
}
void on_refresh_finished () {
Timeout.add (1000, () => {
if (!check_pamac_running ()) {
try {
pamac_daemon.quit ();
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
}
Timeout.add (100, () => {
loop.quit ();
return false;
});
return false;
});
}
int main () {
var pamac_config = new Pamac.Config ("/etc/pamac.conf");
// if refresh period is 0, just exit
if (pamac_config.refresh_period != 0) {
if (!check_pamac_running ()) {
try {
pamac_daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.manjaro.pamac", "/org/manjaro/pamac");
pamac_daemon.refresh_finished.connect (on_refresh_finished);
pamac_daemon.start_refresh (false);
loop = new MainLoop ();
loop.run ();
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
}
}
return 0;
}

File diff suppressed because it is too large Load Diff

View File

@ -17,22 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
const string VERSION = "4.3.7";
namespace Pamac { namespace Pamac {
[DBus (name = "org.manjaro.pamac")] [DBus (name = "org.manjaro.pamac.user")]
interface Daemon : Object { interface UserDaemon : Object {
public abstract void set_environment_variables (HashTable<string,string> variables) throws IOError; public abstract void refresh_handle () throws IOError;
public abstract ErrorInfos get_current_error () throws IOError;
public abstract void start_get_authorization () throws IOError;
public abstract void start_write_pamac_config (HashTable<string,Variant> new_pamac_conf) throws IOError;
public abstract void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf) throws IOError;
public abstract void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf) throws IOError;
public abstract void start_generate_mirrors_list () throws IOError;
public abstract void clean_cache (uint keep_nb, bool only_uninstalled) throws IOError;
public abstract void start_set_pkgreason (string pkgname, uint reason) throws IOError;
public abstract AlpmPackage get_installed_pkg (string pkgname) throws IOError; public abstract AlpmPackage get_installed_pkg (string pkgname) throws IOError;
public abstract void start_refresh (bool force) throws IOError;
public abstract bool get_checkspace () throws IOError; public abstract bool get_checkspace () throws IOError;
public abstract string[] get_ignorepkgs () throws IOError; public abstract string[] get_ignorepkgs () throws IOError;
public abstract bool should_hold (string pkgname) throws IOError; public abstract bool should_hold (string pkgname) throws IOError;
@ -56,16 +45,36 @@ namespace Pamac {
public abstract async AURPackageDetails get_aur_details (string pkgname) throws IOError; public abstract async AURPackageDetails get_aur_details (string pkgname) throws IOError;
public abstract string[] get_pkg_uninstalled_optdeps (string pkgname) throws IOError; public abstract string[] get_pkg_uninstalled_optdeps (string pkgname) throws IOError;
public abstract void start_get_updates (bool check_aur_updates) throws IOError; public abstract void start_get_updates (bool check_aur_updates) throws IOError;
[DBus (no_reply = true)]
public abstract void quit () throws IOError;
public signal void get_updates_finished (Updates updates);
}
[DBus (name = "org.manjaro.pamac.system")]
interface SystemDaemon : Object {
public abstract void set_environment_variables (HashTable<string,string> variables) throws IOError;
public abstract string[] get_mirrors_countries () throws IOError;
public abstract ErrorInfos get_current_error () throws IOError;
public abstract bool get_lock () throws IOError;
public abstract bool unlock () throws IOError;
public abstract void start_get_authorization () throws IOError;
public abstract void start_write_pamac_config (HashTable<string,Variant> new_pamac_conf) throws IOError;
public abstract void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf) throws IOError;
public abstract void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf) throws IOError;
public abstract void start_generate_mirrors_list () throws IOError;
public abstract void clean_cache (uint keep_nb, bool only_uninstalled) throws IOError;
public abstract void start_set_pkgreason (string pkgname, uint reason) throws IOError;
public abstract void start_refresh (bool force) throws IOError;
public abstract void start_sysupgrade_prepare (bool enable_downgrade, string[] temporary_ignorepkgs) throws IOError; public abstract void start_sysupgrade_prepare (bool enable_downgrade, string[] temporary_ignorepkgs) throws IOError;
public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) throws IOError; public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) throws IOError;
public abstract void choose_provider (int provider) throws IOError; public abstract void choose_provider (int provider) throws IOError;
public abstract TransactionSummary get_transaction_summary () throws IOError; public abstract TransactionSummary get_transaction_summary () throws IOError;
public abstract void start_trans_commit () throws IOError; public abstract void start_trans_commit () throws IOError;
public abstract void trans_release () throws IOError; public abstract void trans_release () throws IOError;
[DBus (no_reply = true)]
public abstract void trans_cancel () throws IOError; public abstract void trans_cancel () throws IOError;
public abstract void start_get_updates (bool check_aur_updates) throws IOError;
[DBus (no_reply = true)] [DBus (no_reply = true)]
public abstract void quit () throws IOError; public abstract void quit () throws IOError;
public signal void get_updates_finished (Updates updates);
public signal void emit_event (uint primary_event, uint secondary_event, string[] details); public signal void emit_event (uint primary_event, uint secondary_event, string[] details);
public signal void emit_providers (string depend, string[] providers); public signal void emit_providers (string depend, string[] providers);
public signal void emit_progress (uint progress, string pkgname, uint percent, uint n_targets, uint current_target); public signal void emit_progress (uint progress, string pkgname, uint percent, uint n_targets, uint current_target);
@ -74,7 +83,6 @@ namespace Pamac {
public signal void emit_log (uint level, string msg); public signal void emit_log (uint level, string msg);
public signal void set_pkgreason_finished (); public signal void set_pkgreason_finished ();
public signal void refresh_finished (bool success); public signal void refresh_finished (bool success);
public signal void get_updates_finished (Updates updates);
public signal void trans_prepare_finished (bool success); public signal void trans_prepare_finished (bool success);
public signal void trans_commit_finished (bool success); public signal void trans_commit_finished (bool success);
public signal void get_authorization_finished (bool authorized); public signal void get_authorization_finished (bool authorized);
@ -86,11 +94,6 @@ namespace Pamac {
public signal void generate_mirrors_list_finished (); public signal void generate_mirrors_list_finished ();
} }
public enum Mode {
MANAGER,
UPDATER
}
public class Transaction: Object { public class Transaction: Object {
enum Type { enum Type {
@ -99,7 +102,8 @@ namespace Pamac {
BUILD = (1 << 2) BUILD = (1 << 2)
} }
Daemon daemon; UserDaemon user_daemon;
SystemDaemon system_daemon;
Pamac.Config pamac_config; Pamac.Config pamac_config;
public bool check_aur_updates { get { return pamac_config.check_aur_updates; } } public bool check_aur_updates { get { return pamac_config.check_aur_updates; } }
@ -117,6 +121,7 @@ namespace Pamac {
public GenericSet<string?> to_remove; public GenericSet<string?> to_remove;
public GenericSet<string?> to_load; public GenericSet<string?> to_load;
public GenericSet<string?> to_build; public GenericSet<string?> to_build;
public GenericSet<string?> to_update;
Queue<string> to_build_queue; Queue<string> to_build_queue;
string[] aur_pkgs_to_install; string[] aur_pkgs_to_install;
GenericSet<string?> previous_to_install; GenericSet<string?> previous_to_install;
@ -124,8 +129,6 @@ namespace Pamac {
public GenericSet<string?> transaction_summary; public GenericSet<string?> transaction_summary;
public GenericSet<string?> temporary_ignorepkgs; public GenericSet<string?> temporary_ignorepkgs;
public Mode mode { get; set; }
uint64 total_download; uint64 total_download;
uint64 already_downloaded; uint64 already_downloaded;
string previous_textbar; string previous_textbar;
@ -154,22 +157,20 @@ namespace Pamac {
//parent window //parent window
public Gtk.ApplicationWindow? application_window { get; private set; } public Gtk.ApplicationWindow? application_window { get; private set; }
public signal void start_waiting ();
public signal void stop_waiting ();
public signal void start_downloading (); public signal void start_downloading ();
public signal void stop_downloading (); public signal void stop_downloading ();
public signal void start_building (); public signal void start_building ();
public signal void stop_building (); public signal void stop_building ();
public signal void important_details_outpout (bool must_show); public signal void important_details_outpout (bool must_show);
public signal void alpm_handle_refreshed ();
public signal void finished (bool success); public signal void finished (bool success);
public signal void set_pkgreason_finished (); public signal void set_pkgreason_finished ();
public signal void get_updates_finished (Updates updates);
public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon,
bool enable_aur, bool search_aur, bool check_aur_updates); bool enable_aur, bool search_aur, bool check_aur_updates);
public signal void write_alpm_config_finished (bool checkspace); public signal void write_alpm_config_finished (bool checkspace);
public signal void write_mirrors_config_finished (string choosen_country, string choosen_generation_method); public signal void write_mirrors_config_finished (string choosen_country, string choosen_generation_method);
public signal void generate_mirrors_list (); public signal void generate_mirrors_list ();
public signal void run_preferences_dialog_finished ();
public signal void get_updates_finished (Updates updates);
public Transaction (Gtk.ApplicationWindow? application_window) { public Transaction (Gtk.ApplicationWindow? application_window) {
pamac_config = new Pamac.Config ("/etc/pamac.conf"); pamac_config = new Pamac.Config ("/etc/pamac.conf");
@ -177,17 +178,17 @@ namespace Pamac {
if (pamac_config.recurse) { if (pamac_config.recurse) {
flags |= (1 << 5); //Alpm.TransFlag.RECURSE flags |= (1 << 5); //Alpm.TransFlag.RECURSE
} }
to_install = new GenericSet<string?> (str_hash, str_equal); to_install = new GenericSet<string?> (str_hash, str_equal);
to_remove = new GenericSet<string?> (str_hash, str_equal); to_remove = new GenericSet<string?> (str_hash, str_equal);
to_load = new GenericSet<string?> (str_hash, str_equal); to_load = new GenericSet<string?> (str_hash, str_equal);
to_build = new GenericSet<string?> (str_hash, str_equal); to_build = new GenericSet<string?> (str_hash, str_equal);
to_update = new GenericSet<string?> (str_hash, str_equal);
to_build_queue = new Queue<string> (); to_build_queue = new Queue<string> ();
previous_to_install = new GenericSet<string?> (str_hash, str_equal); previous_to_install = new GenericSet<string?> (str_hash, str_equal);
previous_to_remove = new GenericSet<string?> (str_hash, str_equal); previous_to_remove = new GenericSet<string?> (str_hash, str_equal);
transaction_summary = new GenericSet<string?> (str_hash, str_equal); transaction_summary = new GenericSet<string?> (str_hash, str_equal);
temporary_ignorepkgs = new GenericSet<string?> (str_hash, str_equal); temporary_ignorepkgs = new GenericSet<string?> (str_hash, str_equal);
connecting_dbus_signals (); connecting_user_daemon ();
//creating dialogs //creating dialogs
this.application_window = application_window; this.application_window = application_window;
transaction_sum_dialog = new TransactionSumDialog (application_window); transaction_sum_dialog = new TransactionSumDialog (application_window);
@ -230,39 +231,7 @@ namespace Pamac {
warning_textbuffer = new StringBuilder (); warning_textbuffer = new StringBuilder ();
} }
public void run_history_dialog () { public void run_preferences_dialog () {
var file = GLib.File.new_for_path ("/var/log/pacman.log");
if (!file.query_exists ()) {
GLib.stderr.printf ("File '%s' doesn't exist.\n", file.get_path ());
} else {
StringBuilder text = new StringBuilder ();
try {
// Open file for reading and wrap returned FileInputStream into a
// DataInputStream, so we can read line by line
var dis = new DataInputStream (file.read ());
string line;
// Read lines until end of file (null) is reached
while ((line = dis.read_line ()) != null) {
// construct text in reverse order
text.prepend (line + "\n");
}
} catch (GLib.Error e) {
GLib.stderr.printf ("%s\n", e.message);
}
var history_dialog = new HistoryDialog (application_window);
history_dialog.textview.buffer.set_text (text.str, (int) text.len);
history_dialog.show ();
history_dialog.response.connect (() => {
history_dialog.destroy ();
});
while (Gtk.events_pending ()) {
Gtk.main_iteration ();
}
}
}
public async void run_preferences_dialog () {
SourceFunc callback = run_preferences_dialog.callback;
check_authorization.begin ((obj, res) => { check_authorization.begin ((obj, res) => {
bool authorized = check_authorization.end (res); bool authorized = check_authorization.end (res);
if (authorized) { if (authorized) {
@ -273,73 +242,95 @@ namespace Pamac {
Gtk.main_iteration (); Gtk.main_iteration ();
} }
} }
Idle.add ((owned) callback); run_preferences_dialog_finished ();
}); });
yield;
}
public void run_about_dialog () {
string[] authors = {"Guillaume Benoit"};
Gtk.show_about_dialog (
application_window,
"program_name", "Pamac",
"icon_name", "system-software-install",
"logo_icon_name", "system-software-install",
"comments", dgettext (null, "A Gtk3 frontend for libalpm"),
"copyright", "Copyright © 2017 Guillaume Benoit",
"authors", authors,
"version", VERSION,
"license_type", Gtk.License.GPL_3_0,
"website", "http://github.com/manjaro/pamac");
} }
public ErrorInfos get_current_error () { public ErrorInfos get_current_error () {
try { try {
return daemon.get_current_error (); return system_daemon.get_current_error ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
return ErrorInfos (); return ErrorInfos ();
} }
} }
public string[] get_mirrors_countries () {
string[] countries = {};
connecting_system_daemon ();
try {
countries = system_daemon.get_mirrors_countries ();
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
return countries;
}
public bool get_lock () {
bool locked = false;
connecting_system_daemon ();
try {
locked = system_daemon.get_lock ();
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
return locked;
}
public bool unlock () {
bool unlocked = false;
try {
unlocked = system_daemon.unlock ();
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
return unlocked;
}
async bool check_authorization () { async bool check_authorization () {
SourceFunc callback = check_authorization.callback; SourceFunc callback = check_authorization.callback;
bool authorized = false; bool authorized = false;
ulong handler_id = daemon.get_authorization_finished.connect ((authorized_) => { ulong handler_id = system_daemon.get_authorization_finished.connect ((authorized_) => {
authorized = authorized_; authorized = authorized_;
Idle.add ((owned) callback); Idle.add ((owned) callback);
}); });
try { try {
daemon.start_get_authorization (); system_daemon.start_get_authorization ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
yield; yield;
daemon.disconnect (handler_id); system_daemon.disconnect (handler_id);
return authorized; return authorized;
} }
public void start_write_pamac_config (HashTable<string,Variant> new_pamac_conf) { public void start_write_pamac_config (HashTable<string,Variant> new_pamac_conf) {
try { try {
daemon.start_write_pamac_config (new_pamac_conf); system_daemon.write_pamac_config_finished.connect (on_write_pamac_config_finished);
system_daemon.start_write_pamac_config (new_pamac_conf);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
system_daemon.write_pamac_config_finished.disconnect (on_write_pamac_config_finished);
} }
} }
public void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf) { public void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf) {
try { try {
daemon.start_write_alpm_config (new_alpm_conf); system_daemon.write_alpm_config_finished.connect (on_write_alpm_config_finished);
system_daemon.start_write_alpm_config (new_alpm_conf);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
system_daemon.write_alpm_config_finished.disconnect (on_write_alpm_config_finished);
} }
} }
public void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf) { public void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf) {
try { try {
daemon.start_write_mirrors_config (new_mirrors_conf); system_daemon.write_mirrors_config_finished.connect (on_write_mirrors_config_finished);
system_daemon.start_write_mirrors_config (new_mirrors_conf);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
system_daemon.write_mirrors_config_finished.disconnect (on_write_mirrors_config_finished);
} }
} }
@ -415,12 +406,12 @@ namespace Pamac {
progress_box.progressbar.text = ""; progress_box.progressbar.text = "";
} }
void start_progressbar_pulse () { public void start_progressbar_pulse () {
stop_progressbar_pulse (); stop_progressbar_pulse ();
pulse_timeout_id = Timeout.add (500, (GLib.SourceFunc) progress_box.progressbar.pulse); pulse_timeout_id = Timeout.add (500, (GLib.SourceFunc) progress_box.progressbar.pulse);
} }
void stop_progressbar_pulse () { public void stop_progressbar_pulse () {
if (pulse_timeout_id != 0) { if (pulse_timeout_id != 0) {
Source.remove (pulse_timeout_id); Source.remove (pulse_timeout_id);
pulse_timeout_id = 0; pulse_timeout_id = 0;
@ -435,16 +426,20 @@ namespace Pamac {
important_details_outpout (false); important_details_outpout (false);
generate_mirrors_list (); generate_mirrors_list ();
try { try {
daemon.start_generate_mirrors_list (); system_daemon.generate_mirrors_list_data.connect (on_generate_mirrors_list_data);
system_daemon.generate_mirrors_list_finished.connect (on_generate_mirrors_list_finished);
system_daemon.start_generate_mirrors_list ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
stop_progressbar_pulse (); stop_progressbar_pulse ();
system_daemon.generate_mirrors_list_data.disconnect (on_generate_mirrors_list_data);
system_daemon.generate_mirrors_list_finished.disconnect (on_generate_mirrors_list_finished);
} }
} }
public void clean_cache (uint keep_nb, bool only_uninstalled) { public void clean_cache (uint keep_nb, bool only_uninstalled) {
try { try {
daemon.clean_cache (keep_nb, only_uninstalled); system_daemon.clean_cache (keep_nb, only_uninstalled);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -452,30 +447,42 @@ namespace Pamac {
public void start_set_pkgreason (string pkgname, uint reason) { public void start_set_pkgreason (string pkgname, uint reason) {
try { try {
daemon.start_set_pkgreason (pkgname, reason); system_daemon.set_pkgreason_finished.connect (on_set_pkgreason_finished);
system_daemon.start_set_pkgreason (pkgname, reason);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
system_daemon.set_pkgreason_finished.disconnect (on_set_pkgreason_finished);
} }
} }
public void start_refresh (bool force) { public void start_refresh (bool force) {
string action = dgettext (null, "Synchronizing package databases") + "..."; string action = dgettext (null, "Synchronizing package databases") + "...";
reset_progress_box (action); reset_progress_box (action);
connecting_system_daemon ();
connecting_dbus_signals ();
try { try {
daemon.refresh_finished.connect (on_refresh_finished); system_daemon.refresh_finished.connect (on_refresh_finished);
daemon.start_refresh (force); system_daemon.start_refresh (force);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
daemon.refresh_finished.disconnect (on_refresh_finished); system_daemon.refresh_finished.disconnect (on_refresh_finished);
success = false; success = false;
finish_transaction (); finish_transaction ();
} }
} }
public void refresh_handle () {
try {
user_daemon.refresh_handle ();
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
}
public bool get_checkspace () { public bool get_checkspace () {
bool checkspace = false; bool checkspace = false;
try { try {
checkspace = daemon.get_checkspace (); checkspace = user_daemon.get_checkspace ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -485,7 +492,7 @@ namespace Pamac {
public string[] get_ignorepkgs () { public string[] get_ignorepkgs () {
string[] ignorepkgs = {}; string[] ignorepkgs = {};
try { try {
ignorepkgs = daemon.get_ignorepkgs (); ignorepkgs = user_daemon.get_ignorepkgs ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -494,7 +501,7 @@ namespace Pamac {
public AlpmPackage get_installed_pkg (string pkgname) { public AlpmPackage get_installed_pkg (string pkgname) {
try { try {
return daemon.get_installed_pkg (pkgname); return user_daemon.get_installed_pkg (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
return AlpmPackage () { return AlpmPackage () {
@ -508,7 +515,7 @@ namespace Pamac {
public AlpmPackage find_installed_satisfier (string depstring) { public AlpmPackage find_installed_satisfier (string depstring) {
try { try {
return daemon.find_installed_satisfier (depstring); return user_daemon.find_installed_satisfier (depstring);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
return AlpmPackage () { return AlpmPackage () {
@ -523,7 +530,7 @@ namespace Pamac {
public bool should_hold (string pkgname) { public bool should_hold (string pkgname) {
bool should_hold = false; bool should_hold = false;
try { try {
should_hold = daemon.should_hold (pkgname); should_hold = user_daemon.should_hold (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -533,7 +540,7 @@ namespace Pamac {
public uint get_pkg_reason (string pkgname) { public uint get_pkg_reason (string pkgname) {
uint reason = 0; uint reason = 0;
try { try {
reason = daemon.get_pkg_reason (pkgname); reason = user_daemon.get_pkg_reason (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -543,7 +550,7 @@ namespace Pamac {
public uint get_pkg_origin (string pkgname) { public uint get_pkg_origin (string pkgname) {
uint origin = 0; uint origin = 0;
try { try {
origin = daemon.get_pkg_origin (pkgname); origin = user_daemon.get_pkg_origin (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -553,7 +560,7 @@ namespace Pamac {
public async AlpmPackage[] get_installed_pkgs () { public async AlpmPackage[] get_installed_pkgs () {
AlpmPackage[] pkgs = {}; AlpmPackage[] pkgs = {};
try { try {
pkgs = yield daemon.get_installed_pkgs (); pkgs = yield user_daemon.get_installed_pkgs ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -563,7 +570,7 @@ namespace Pamac {
public async AlpmPackage[] get_explicitly_installed_pkgs () { public async AlpmPackage[] get_explicitly_installed_pkgs () {
AlpmPackage[] pkgs = {}; AlpmPackage[] pkgs = {};
try { try {
pkgs = yield daemon.get_explicitly_installed_pkgs (); pkgs = yield user_daemon.get_explicitly_installed_pkgs ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -573,7 +580,7 @@ namespace Pamac {
public async AlpmPackage[] get_foreign_pkgs () { public async AlpmPackage[] get_foreign_pkgs () {
AlpmPackage[] pkgs = {}; AlpmPackage[] pkgs = {};
try { try {
pkgs = yield daemon.get_foreign_pkgs (); pkgs = yield user_daemon.get_foreign_pkgs ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -583,7 +590,7 @@ namespace Pamac {
public async AlpmPackage[] get_orphans () { public async AlpmPackage[] get_orphans () {
AlpmPackage[] pkgs = {}; AlpmPackage[] pkgs = {};
try { try {
pkgs = yield daemon.get_orphans (); pkgs = yield user_daemon.get_orphans ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -592,7 +599,7 @@ namespace Pamac {
public AlpmPackage get_sync_pkg (string pkgname) { public AlpmPackage get_sync_pkg (string pkgname) {
try { try {
return daemon.get_sync_pkg (pkgname); return user_daemon.get_sync_pkg (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
return AlpmPackage () { return AlpmPackage () {
@ -606,7 +613,7 @@ namespace Pamac {
public AlpmPackage find_sync_satisfier (string depstring) { public AlpmPackage find_sync_satisfier (string depstring) {
try { try {
return daemon.find_sync_satisfier (depstring); return user_daemon.find_sync_satisfier (depstring);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
return AlpmPackage () { return AlpmPackage () {
@ -621,7 +628,7 @@ namespace Pamac {
public async AlpmPackage[] search_pkgs (string search_string) { public async AlpmPackage[] search_pkgs (string search_string) {
AlpmPackage[] pkgs = {}; AlpmPackage[] pkgs = {};
try { try {
pkgs = yield daemon.search_pkgs (search_string); pkgs = yield user_daemon.search_pkgs (search_string);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -631,7 +638,7 @@ namespace Pamac {
public async AURPackage[] search_in_aur (string search_string) { public async AURPackage[] search_in_aur (string search_string) {
AURPackage[] pkgs = {}; AURPackage[] pkgs = {};
try { try {
pkgs = yield daemon.search_in_aur (search_string); pkgs = yield user_daemon.search_in_aur (search_string);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -641,7 +648,7 @@ namespace Pamac {
public string[] get_repos_names () { public string[] get_repos_names () {
string[] repos_names = {}; string[] repos_names = {};
try { try {
repos_names = daemon.get_repos_names (); repos_names = user_daemon.get_repos_names ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -651,7 +658,7 @@ namespace Pamac {
public async AlpmPackage[] get_repo_pkgs (string repo) { public async AlpmPackage[] get_repo_pkgs (string repo) {
AlpmPackage[] pkgs = {}; AlpmPackage[] pkgs = {};
try { try {
pkgs = yield daemon.get_repo_pkgs (repo); pkgs = yield user_daemon.get_repo_pkgs (repo);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -661,7 +668,7 @@ namespace Pamac {
public string[] get_groups_names () { public string[] get_groups_names () {
string[] groups_names = {}; string[] groups_names = {};
try { try {
groups_names = daemon.get_groups_names (); groups_names = user_daemon.get_groups_names ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -671,7 +678,7 @@ namespace Pamac {
public async AlpmPackage[] get_group_pkgs (string group_name) { public async AlpmPackage[] get_group_pkgs (string group_name) {
AlpmPackage[] pkgs = {}; AlpmPackage[] pkgs = {};
try { try {
pkgs = yield daemon.get_group_pkgs (group_name); pkgs = yield user_daemon.get_group_pkgs (group_name);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -681,7 +688,7 @@ namespace Pamac {
public string[] get_pkg_uninstalled_optdeps (string pkgname) { public string[] get_pkg_uninstalled_optdeps (string pkgname) {
string[] optdeps = {}; string[] optdeps = {};
try { try {
optdeps = daemon.get_pkg_uninstalled_optdeps (pkgname); optdeps = user_daemon.get_pkg_uninstalled_optdeps (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -690,7 +697,7 @@ namespace Pamac {
public AlpmPackageDetails get_pkg_details (string pkgname) { public AlpmPackageDetails get_pkg_details (string pkgname) {
try { try {
return daemon.get_pkg_details (pkgname); return user_daemon.get_pkg_details (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
return AlpmPackageDetails () { return AlpmPackageDetails () {
@ -710,7 +717,7 @@ namespace Pamac {
public string[] get_pkg_files (string pkgname) { public string[] get_pkg_files (string pkgname) {
try { try {
return daemon.get_pkg_files (pkgname); return user_daemon.get_pkg_files (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
return {}; return {};
@ -727,7 +734,7 @@ namespace Pamac {
maintainer = "" maintainer = ""
}; };
try { try {
pkg = yield daemon.get_aur_details (pkgname); pkg = yield user_daemon.get_aur_details (pkgname);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -735,9 +742,9 @@ namespace Pamac {
} }
public void start_get_updates () { public void start_get_updates () {
daemon.get_updates_finished.connect (on_get_updates_finished); user_daemon.get_updates_finished.connect (on_get_updates_finished);
try { try {
daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates); user_daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
success = false; success = false;
@ -746,9 +753,9 @@ namespace Pamac {
} }
void start_get_updates_for_sysupgrade () { void start_get_updates_for_sysupgrade () {
daemon.get_updates_finished.connect (on_get_updates_for_sysupgrade_finished); system_daemon.get_updates_finished.connect (on_get_updates_for_sysupgrade_finished);
try { try {
daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates); system_daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
success = false; success = false;
@ -762,9 +769,11 @@ namespace Pamac {
foreach (unowned string pkgname in temporary_ignorepkgs) { foreach (unowned string pkgname in temporary_ignorepkgs) {
temporary_ignorepkgs_ += pkgname; temporary_ignorepkgs_ += pkgname;
} }
connecting_system_daemon ();
connecting_dbus_signals ();
try { try {
// this will respond with trans_prepare_finished signal // this will respond with trans_prepare_finished signal
daemon.start_sysupgrade_prepare (enable_downgrade, temporary_ignorepkgs_); system_daemon.start_sysupgrade_prepare (enable_downgrade, temporary_ignorepkgs_);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
success = false; success = false;
@ -780,19 +789,18 @@ namespace Pamac {
} }
void on_get_updates_finished (Updates updates) { void on_get_updates_finished (Updates updates) {
daemon.get_updates_finished.disconnect (on_get_updates_finished); user_daemon.get_updates_finished.disconnect (on_get_updates_finished);
get_updates_finished (updates); get_updates_finished (updates);
} }
void on_get_updates_for_sysupgrade_finished (Updates updates) { void on_get_updates_for_sysupgrade_finished (Updates updates) {
daemon.get_updates_finished.disconnect (on_get_updates_for_sysupgrade_finished); system_daemon.get_updates_finished.disconnect (on_get_updates_for_sysupgrade_finished);
// get syncfirst updates // get syncfirst updates
if (updates.is_syncfirst) { if (updates.is_syncfirst) {
clear_lists (); clear_lists ();
if (mode == Mode.MANAGER) { sysupgrade_after_trans = true;
sysupgrade_after_trans = true; no_confirm_commit = true;
} foreach (unowned AlpmPackage infos in updates.repos_updates) {
foreach (unowned UpdateInfos infos in updates.repos_updates) {
to_install.add (infos.name); to_install.add (infos.name);
} }
// run as a standard transaction // run as a standard transaction
@ -800,7 +808,7 @@ namespace Pamac {
} else { } else {
if (updates.aur_updates.length != 0) { if (updates.aur_updates.length != 0) {
clear_lists (); clear_lists ();
foreach (unowned UpdateInfos infos in updates.aur_updates) { foreach (unowned AURPackage infos in updates.aur_updates) {
if (!(infos.name in temporary_ignorepkgs)) { if (!(infos.name in temporary_ignorepkgs)) {
to_build.add (infos.name); to_build.add (infos.name);
} }
@ -838,7 +846,7 @@ namespace Pamac {
void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) { void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) {
try { try {
daemon.start_trans_prepare (transflags, to_install, to_remove, to_load, to_build); system_daemon.start_trans_prepare (transflags, to_install, to_remove, to_load, to_build);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
stop_progressbar_pulse (); stop_progressbar_pulse ();
@ -867,6 +875,8 @@ namespace Pamac {
foreach (unowned string name in to_build) { foreach (unowned string name in to_build) {
to_build_ += name; to_build_ += name;
} }
connecting_system_daemon ();
connecting_dbus_signals ();
start_trans_prepare (flags, to_install_, to_remove_, to_load_, to_build_); start_trans_prepare (flags, to_install_, to_remove_, to_load_, to_build_);
} }
@ -896,7 +906,7 @@ namespace Pamac {
foreach (var radiobutton in list) { foreach (var radiobutton in list) {
if (radiobutton.active) { if (radiobutton.active) {
try { try {
daemon.choose_provider (index); system_daemon.choose_provider (index);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -917,7 +927,7 @@ namespace Pamac {
var summary = TransactionSummary (); var summary = TransactionSummary ();
transaction_sum_dialog.sum_list.clear (); transaction_sum_dialog.sum_list.clear ();
try { try {
summary = daemon.get_transaction_summary (); summary = system_daemon.get_transaction_summary ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -1012,20 +1022,6 @@ namespace Pamac {
} }
if (summary.to_upgrade.length > 0) { if (summary.to_upgrade.length > 0) {
type |= Type.UPDATE; type |= Type.UPDATE;
if (mode != Mode.UPDATER) {
foreach (unowned UpdateInfos infos in summary.to_upgrade) {
dsize += infos.download_size;
transaction_summary.add (infos.name);
transaction_sum_dialog.sum_list.insert_with_values (out iter, -1,
1, infos.name,
2, infos.new_version,
3, "(%s)".printf (infos.old_version));
}
Gtk.TreePath path = transaction_sum_dialog.sum_list.get_path (iter);
int pos = (path.get_indices ()[0]) - (summary.to_upgrade.length - 1);
transaction_sum_dialog.sum_list.get_iter (out iter, new Gtk.TreePath.from_indices (pos));
transaction_sum_dialog.sum_list.set (iter, 0, "<b>%s</b>".printf (dgettext (null, "To update") + ":"));
}
} }
if (dsize == 0) { if (dsize == 0) {
transaction_sum_dialog.top_label.visible = false; transaction_sum_dialog.top_label.visible = false;
@ -1038,7 +1034,7 @@ namespace Pamac {
void start_commit () { void start_commit () {
try { try {
daemon.start_trans_commit (); system_daemon.start_trans_commit ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
success = false; success = false;
@ -1120,21 +1116,19 @@ namespace Pamac {
build_cancellable.cancel (); build_cancellable.cancel ();
} else { } else {
try { try {
daemon.trans_cancel (); system_daemon.trans_cancel ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
} }
show_in_term ("\n" + dgettext (null, "Transaction cancelled") + ".\n"); show_in_term ("\n" + dgettext (null, "Transaction cancelled") + ".\n");
progress_box.action_label.label = ""; progress_box.action_label.label = "";
stop_progressbar_pulse ();
stop_waiting ();
warning_textbuffer = new StringBuilder (); warning_textbuffer = new StringBuilder ();
} }
public void release () { public void release () {
try { try {
daemon.trans_release (); system_daemon.trans_release ();
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -1143,7 +1137,10 @@ namespace Pamac {
public void stop_daemon () { public void stop_daemon () {
try { try {
daemon.quit (); user_daemon.quit ();
if (system_daemon != null) {
system_daemon.quit ();
}
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -1153,11 +1150,6 @@ namespace Pamac {
string? action = null; string? action = null;
string? detailed_action = null; string? detailed_action = null;
switch (primary_event) { switch (primary_event) {
case 0: //special case: wait for database lock
action = dgettext (null, "Waiting for another package manager to quit") + "...";
start_progressbar_pulse ();
start_waiting ();
break;
case 1: //Alpm.Event.Type.CHECKDEPS_START case 1: //Alpm.Event.Type.CHECKDEPS_START
action = dgettext (null, "Checking dependencies") + "..."; action = dgettext (null, "Checking dependencies") + "...";
break; break;
@ -1399,11 +1391,8 @@ namespace Pamac {
rates_nb = 0; rates_nb = 0;
fraction = 0; fraction = 0;
timer.start (); timer.start ();
if (filename.has_suffix (".db")) { if (filename.has_suffix (".db") || filename.has_suffix (".files")) {
string action = dgettext (null, "Refreshing %s").printf (filename.replace (".db", "")) + "..."; string action = dgettext (null, "Refreshing %s").printf (filename) + "...";
reset_progress_box (action);
} else if (filename.has_suffix (".files")) {
string action = dgettext (null, "Refreshing %s").printf (filename.replace (".files", "")) + "...";
reset_progress_box (action); reset_progress_box (action);
} }
} else if (xfered == total) { } else if (xfered == total) {
@ -1526,7 +1515,7 @@ namespace Pamac {
} }
} }
void display_error (string message, string[] details) { public void display_error (string message, string[] details) {
var flags = Gtk.DialogFlags.MODAL; var flags = Gtk.DialogFlags.MODAL;
int use_header_bar; int use_header_bar;
Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header_bar); Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header_bar);
@ -1579,6 +1568,7 @@ namespace Pamac {
} }
void finish_transaction () { void finish_transaction () {
disconnecting_dbus_signals ();
transaction_summary.remove_all (); transaction_summary.remove_all ();
reset_progress_box (""); reset_progress_box ("");
finished (success); finished (success);
@ -1588,7 +1578,6 @@ namespace Pamac {
void on_refresh_finished (bool success) { void on_refresh_finished (bool success) {
stop_progressbar_pulse (); stop_progressbar_pulse ();
this.success = success; this.success = success;
clear_lists ();
if (success) { if (success) {
finished (success); finished (success);
reset_progress_box (""); reset_progress_box ("");
@ -1597,7 +1586,8 @@ namespace Pamac {
handle_error (get_current_error ()); handle_error (get_current_error ());
} }
previous_filename = ""; previous_filename = "";
daemon.refresh_finished.disconnect (on_refresh_finished); disconnecting_dbus_signals ();
system_daemon.refresh_finished.disconnect (on_refresh_finished);
} }
void on_trans_prepare_finished (bool success) { void on_trans_prepare_finished (bool success) {
@ -1606,8 +1596,9 @@ namespace Pamac {
if (success) { if (success) {
show_warnings (); show_warnings ();
Type type = set_transaction_sum (); Type type = set_transaction_sum ();
if (no_confirm_commit || (type == Type.UPDATE && mode == Mode.UPDATER)) { if (no_confirm_commit || type == Type.UPDATE) {
// no_confirm_commit or only updates // no_confirm_commit or only updates
to_install.remove_all ();
start_commit (); start_commit ();
} else if (type != 0) { } else if (type != 0) {
if (transaction_sum_dialog.run () == Gtk.ResponseType.OK) { if (transaction_sum_dialog.run () == Gtk.ResponseType.OK) {
@ -1689,6 +1680,7 @@ namespace Pamac {
sysupgrade (false); sysupgrade (false);
} else if (build_after_sysupgrade) { } else if (build_after_sysupgrade) {
build_after_sysupgrade = false; build_after_sysupgrade = false;
disconnecting_dbus_signals ();
// build aur updates in to_build // build aur updates in to_build
run (); run ();
} else { } else {
@ -1724,13 +1716,16 @@ namespace Pamac {
} }
void on_set_pkgreason_finished () { void on_set_pkgreason_finished () {
system_daemon.set_pkgreason_finished.disconnect (on_set_pkgreason_finished);
set_pkgreason_finished (); set_pkgreason_finished ();
} }
void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon,
bool enable_aur, bool search_aur, bool check_aur_updates) { bool enable_aur, bool search_aur, bool check_aur_updates) {
system_daemon.write_pamac_config_finished.disconnect (on_write_pamac_config_finished);
pamac_config.reload (); pamac_config.reload ();
if (recurse) { flags = (1 << 4); //Alpm.TransFlag.CASCADE
if (pamac_config.recurse) {
flags |= (1 << 5); //Alpm.TransFlag.RECURSE flags |= (1 << 5); //Alpm.TransFlag.RECURSE
} }
write_pamac_config_finished (recurse, refresh_period, no_update_hide_icon, write_pamac_config_finished (recurse, refresh_period, no_update_hide_icon,
@ -1738,10 +1733,12 @@ namespace Pamac {
} }
void on_write_alpm_config_finished (bool checkspace) { void on_write_alpm_config_finished (bool checkspace) {
system_daemon.write_alpm_config_finished.disconnect (on_write_alpm_config_finished);
write_alpm_config_finished (checkspace); write_alpm_config_finished (checkspace);
} }
void on_write_mirrors_config_finished (string choosen_country, string choosen_generation_method) { void on_write_mirrors_config_finished (string choosen_country, string choosen_generation_method) {
system_daemon.write_mirrors_config_finished.disconnect (on_write_mirrors_config_finished);
write_mirrors_config_finished (choosen_country, choosen_generation_method); write_mirrors_config_finished (choosen_country, choosen_generation_method);
} }
@ -1750,35 +1747,50 @@ namespace Pamac {
} }
void on_generate_mirrors_list_finished () { void on_generate_mirrors_list_finished () {
system_daemon.generate_mirrors_list_data.disconnect (on_generate_mirrors_list_data);
system_daemon.generate_mirrors_list_finished.disconnect (on_generate_mirrors_list_finished);
stop_progressbar_pulse (); stop_progressbar_pulse ();
show_in_term (""); show_in_term ("");
// force a dbs refresh
start_refresh (true);
} }
void connecting_dbus_signals () { void connecting_user_daemon () {
try { try {
daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.manjaro.pamac", "/org/manjaro/pamac"); user_daemon = Bus.get_proxy_sync (BusType.SESSION, "org.manjaro.pamac.user", "/org/manjaro/pamac/user");
// Set environment variables
daemon.set_environment_variables (pamac_config.environment_variables);
// Connecting to signals
daemon.emit_event.connect (on_emit_event);
daemon.emit_providers.connect (on_emit_providers);
daemon.emit_progress.connect (on_emit_progress);
daemon.emit_download.connect (on_emit_download);
daemon.emit_totaldownload.connect (on_emit_totaldownload);
daemon.emit_log.connect (on_emit_log);
daemon.trans_prepare_finished.connect (on_trans_prepare_finished);
daemon.trans_commit_finished.connect (on_trans_commit_finished);
daemon.set_pkgreason_finished.connect (on_set_pkgreason_finished);
daemon.write_mirrors_config_finished.connect (on_write_mirrors_config_finished);
daemon.write_alpm_config_finished.connect (on_write_alpm_config_finished);
daemon.write_pamac_config_finished.connect (on_write_pamac_config_finished);
daemon.generate_mirrors_list_data.connect (on_generate_mirrors_list_data);
daemon.generate_mirrors_list_finished.connect (on_generate_mirrors_list_finished);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
} }
void connecting_system_daemon () {
try {
system_daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.manjaro.pamac.system", "/org/manjaro/pamac/system");
// Set environment variables
system_daemon.set_environment_variables (pamac_config.environment_variables);
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
}
void connecting_dbus_signals () {
system_daemon.emit_event.connect (on_emit_event);
system_daemon.emit_providers.connect (on_emit_providers);
system_daemon.emit_progress.connect (on_emit_progress);
system_daemon.emit_download.connect (on_emit_download);
system_daemon.emit_totaldownload.connect (on_emit_totaldownload);
system_daemon.emit_log.connect (on_emit_log);
system_daemon.trans_prepare_finished.connect (on_trans_prepare_finished);
system_daemon.trans_commit_finished.connect (on_trans_commit_finished);
}
void disconnecting_dbus_signals () {
system_daemon.emit_event.disconnect (on_emit_event);
system_daemon.emit_providers.disconnect (on_emit_providers);
system_daemon.emit_progress.disconnect (on_emit_progress);
system_daemon.emit_download.disconnect (on_emit_download);
system_daemon.emit_totaldownload.disconnect (on_emit_totaldownload);
system_daemon.emit_log.disconnect (on_emit_log);
system_daemon.trans_prepare_finished.disconnect (on_trans_prepare_finished);
system_daemon.trans_commit_finished.disconnect (on_trans_commit_finished);
}
} }
} }

View File

@ -25,23 +25,19 @@ const string noupdate_icon_name = "pamac-tray-no-update";
const string noupdate_info = _("Your system is up-to-date"); const string noupdate_info = _("Your system is up-to-date");
namespace Pamac { namespace Pamac {
[DBus (name = "org.manjaro.pamac")] [DBus (name = "org.manjaro.pamac.user")]
interface Daemon : Object { interface UserDaemon : Object {
public abstract void refresh_handle () throws IOError;
public abstract string get_lockfile () throws IOError; public abstract string get_lockfile () throws IOError;
public abstract void start_refresh (bool force) throws IOError;
public abstract void start_get_updates (bool check_aur_updates) throws IOError; public abstract void start_get_updates (bool check_aur_updates) throws IOError;
[DBus (no_reply = true)] [DBus (no_reply = true)]
public abstract void quit () throws IOError; public abstract void quit () throws IOError;
public signal void get_updates_finished (Updates updates); public signal void get_updates_finished (Updates updates);
public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon,
bool enable_aur, bool search_aur, bool check_aur_updates,
bool no_confirm_build);
public signal void write_alpm_config_finished (bool checkspace);
} }
public abstract class TrayIcon: Gtk.Application { public abstract class TrayIcon: Gtk.Application {
Notify.Notification notification; Notify.Notification notification;
Daemon daemon; UserDaemon daemon;
bool extern_lock; bool extern_lock;
uint refresh_timeout_id; uint refresh_timeout_id;
public Gtk.Menu menu; public Gtk.Menu menu;
@ -56,11 +52,8 @@ namespace Pamac {
void start_daemon () { void start_daemon () {
try { try {
daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.manjaro.pamac", "/org/manjaro/pamac"); daemon = Bus.get_proxy_sync (BusType.SESSION, "org.manjaro.pamac.user", "/org/manjaro/pamac/user");
// Connecting to signals
daemon.get_updates_finished.connect (on_get_updates_finished); daemon.get_updates_finished.connect (on_get_updates_finished);
daemon.write_pamac_config_finished.connect (on_write_pamac_config_finished);
daemon.write_alpm_config_finished.connect (on_write_alpm_config_finished);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -79,10 +72,7 @@ namespace Pamac {
// Create menu for right button // Create menu for right button
void create_menu () { void create_menu () {
menu = new Gtk.Menu (); menu = new Gtk.Menu ();
var item = new Gtk.MenuItem.with_label (_("Update Manager")); var item = new Gtk.MenuItem.with_label (_("Package Manager"));
item.activate.connect (execute_updater);
menu.append (item);
item = new Gtk.MenuItem.with_label (_("Package Manager"));
item.activate.connect (execute_manager); item.activate.connect (execute_manager);
menu.append (item); menu.append (item);
item = new Gtk.MenuItem.with_mnemonic (_("_Quit")); item = new Gtk.MenuItem.with_mnemonic (_("_Quit"));
@ -123,13 +113,11 @@ namespace Pamac {
public abstract void set_icon_visible (bool visible); public abstract void set_icon_visible (bool visible);
bool start_refresh () { bool check_updates () {
// if pamac is not running start refresh else just check updates var pamac_config = new Pamac.Config ("/etc/pamac.conf");
if (check_pamac_running ()) { if (pamac_config.refresh_period != 0) {
check_updates ();
} else {
try { try {
daemon.start_refresh (false); daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates);
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
} }
@ -137,19 +125,6 @@ namespace Pamac {
return true; return true;
} }
void on_write_pamac_config_finished (bool recurse, uint64 refresh_period) {
launch_refresh_timeout (refresh_period);
if (refresh_period == 0) {
set_icon_visible (false);
} else {
check_updates ();
}
}
void on_write_alpm_config_finished (bool checkspace) {
check_updates ();
}
void on_get_updates_finished (Updates updates) { void on_get_updates_finished (Updates updates) {
uint updates_nb = updates.repos_updates.length + updates.aur_updates.length; uint updates_nb = updates.repos_updates.length + updates.aur_updates.length;
if (updates_nb == 0) { if (updates_nb == 0) {
@ -172,22 +147,10 @@ namespace Pamac {
stop_daemon (); stop_daemon ();
} }
void check_updates () {
var pamac_config = new Pamac.Config ("/etc/pamac.conf");
if (pamac_config.refresh_period == 0) {
return;
}
try {
daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates);
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
}
}
void show_notification (string info) { void show_notification (string info) {
try { try {
close_notification(); close_notification();
notification = new Notify.Notification (_("Update Manager"), info, "system-software-update"); notification = new Notify.Notification (_("Package Manager"), info, "system-software-update");
notification.add_action ("default", _("Details"), execute_updater); notification.add_action ("default", _("Details"), execute_updater);
notification.show (); notification.show ();
} catch (Error e) { } catch (Error e) {
@ -199,7 +162,7 @@ namespace Pamac {
try { try {
if (notification != null) { if (notification != null) {
if (notification.get_closed_reason() == -1 && notification.body != info) { if (notification.get_closed_reason() == -1 && notification.body != info) {
notification.update (_("Update Manager"), info, "system-software-update"); notification.update (_("Package Manager"), info, "system-software-update");
notification.show (); notification.show ();
} }
} else { } else {
@ -234,17 +197,7 @@ namespace Pamac {
if (run) { if (run) {
return run; return run;
} }
app = new Application ("org.manjaro.pamac.updater", 0); app = new Application ("org.manjaro.pamac.installer", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.install", 0);
try { try {
app.register (); app.register ();
} catch (GLib.Error e) { } catch (GLib.Error e) {
@ -258,11 +211,12 @@ namespace Pamac {
if (extern_lock) { if (extern_lock) {
if (!lockfile.query_exists ()) { if (!lockfile.query_exists ()) {
extern_lock = false; extern_lock = false;
// let the time to the daemon to update packages try {
Timeout.add (1000, () => { daemon.refresh_handle ();
check_updates (); } catch (IOError e) {
return false; stderr.printf ("IOError: %s\n", e.message);
}); }
check_updates ();
} }
} else { } else {
if (lockfile.query_exists ()) { if (lockfile.query_exists ()) {
@ -278,7 +232,7 @@ namespace Pamac {
refresh_timeout_id = 0; refresh_timeout_id = 0;
} }
if (refresh_period_in_hours != 0) { if (refresh_period_in_hours != 0) {
refresh_timeout_id = Timeout.add_seconds ((uint) refresh_period_in_hours*3600, start_refresh); refresh_timeout_id = Timeout.add_seconds ((uint) refresh_period_in_hours*3600, check_updates);
} }
} }
@ -304,7 +258,7 @@ namespace Pamac {
set_tooltip (noupdate_info); set_tooltip (noupdate_info);
set_icon_visible (!pamac_config.no_update_hide_icon); set_icon_visible (!pamac_config.no_update_hide_icon);
Notify.init (_("Update Manager")); Notify.init (_("Package Manager"));
start_daemon (); start_daemon ();
try { try {
@ -315,7 +269,7 @@ namespace Pamac {
lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck"); lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
} }
Timeout.add (200, check_extern_lock); Timeout.add (200, check_extern_lock);
start_refresh (); check_updates ();
launch_refresh_timeout (pamac_config.refresh_period); launch_refresh_timeout (pamac_config.refresh_period);
this.hold (); this.hold ();

View File

@ -1,105 +0,0 @@
/*
* pamac-vala
*
* Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a get of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Pamac {
class Updater : Gtk.Application {
UpdaterWindow updater_window;
bool pamac_run;
public Updater () {
application_id = "org.manjaro.pamac.updater";
flags = ApplicationFlags.FLAGS_NONE;
}
public override void startup () {
// i18n
Intl.textdomain ("pamac");
Intl.setlocale (LocaleCategory.ALL, "");
base.startup ();
pamac_run = check_pamac_running ();
if (pamac_run) {
var msg = new Gtk.MessageDialog (null,
Gtk.DialogFlags.MODAL,
Gtk.MessageType.ERROR,
Gtk.ButtonsType.OK,
dgettext (null, "Pamac is already running"));
msg.run ();
msg.destroy ();
} else {
updater_window = new UpdaterWindow (this);
// quit accel
var action = new SimpleAction ("quit", null);
action.activate.connect (() => {this.quit ();});
this.add_action (action);
string[] accels = {"<Ctrl>Q", "<Ctrl>W"};
this.set_accels_for_action ("app.quit", accels);
// back accel
action = new SimpleAction ("back", null);
action.activate.connect (() => {updater_window.on_button_back_clicked ();});
this.add_action (action);
accels = {"<Alt>Left"};
this.set_accels_for_action ("app.back", accels);
}
}
public override void activate () {
if (!pamac_run) {
updater_window.present ();
}
}
public override void shutdown () {
base.shutdown ();
if (!pamac_run) {
updater_window.transaction.stop_daemon ();
}
}
bool check_pamac_running () {
Application app;
bool run = false;
app = new Application ("org.manjaro.pamac.manager", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.install", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
return run;
}
}
static int main (string[] args) {
var updater = new Updater ();
return updater.run (args);
}
}

View File

@ -1,384 +0,0 @@
/*
* pamac-vala
*
* Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a get of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Pamac {
[GtkTemplate (ui = "/org/manjaro/pamac/updater/updater_window.ui")]
class UpdaterWindow : Gtk.ApplicationWindow {
[GtkChild]
Gtk.HeaderBar headerbar;
[GtkChild]
Gtk.Button button_back;
[GtkChild]
Gtk.ModelButton preferences_button;
[GtkChild]
Gtk.Stack stack;
[GtkChild]
Gtk.StackSwitcher stackswitcher;
[GtkChild]
Gtk.ScrolledWindow repos_scrolledwindow;
[GtkChild]
Gtk.ScrolledWindow aur_scrolledwindow;
[GtkChild]
Gtk.TreeView repos_updates_treeview;
[GtkChild]
Gtk.CellRendererToggle repos_select_update;
[GtkChild]
Gtk.TreeView aur_updates_treeview;
[GtkChild]
Gtk.CellRendererToggle aur_select_update;
[GtkChild]
Gtk.Box transaction_infobox;
[GtkChild]
Gtk.Button details_button;
[GtkChild]
Gtk.Button apply_button;
[GtkChild]
Gtk.Button cancel_button;
Gtk.ListStore repos_updates_list;
Gtk.ListStore aur_updates_list;
public Pamac.Transaction transaction;
bool transaction_running;
bool generate_mirrors_list;
bool important_details;
string previous_visible_child_name;
public UpdaterWindow (Gtk.Application application) {
Object (application: application);
button_back.visible = false;
apply_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
apply_button.sensitive = false;
stackswitcher.visible = false;
aur_scrolledwindow.visible = false;
transaction_running = false;
important_details = false;
generate_mirrors_list = false;
headerbar.title = dgettext (null, "Update Manager");
Timeout.add (100, populate_window);
}
bool populate_window () {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
while (Gtk.events_pending ()) {
Gtk.main_iteration ();
}
repos_updates_list = new Gtk.ListStore (7, typeof (bool), typeof (string), typeof (string), typeof (string),typeof (string), typeof (string), typeof (uint64));
repos_updates_treeview.set_model (repos_updates_list);
aur_updates_list = new Gtk.ListStore (4, typeof (bool), typeof (string), typeof (string), typeof (string));
aur_updates_treeview.set_model (aur_updates_list);
transaction = new Transaction (this as Gtk.ApplicationWindow);
transaction.mode = Mode.UPDATER;
transaction.start_waiting.connect (on_start_waiting);
transaction.stop_waiting.connect (on_stop_waiting);
transaction.start_downloading.connect (on_start_downloading);
transaction.stop_downloading.connect (on_stop_downloading);
transaction.start_building.connect (on_start_building);
transaction.stop_building.connect (on_stop_building);
transaction.important_details_outpout.connect (on_important_details_output);
transaction.finished.connect (populate_updates_list);
transaction.get_updates_finished.connect (on_get_updates_finished);
transaction.generate_mirrors_list.connect (on_generate_mirrors_list);
// integrate progress box and term widget
stack.add_named (transaction.term_window, "term");
transaction_infobox.pack_start (transaction.progress_box);
// A timeout is needed to let the time to the daemon to deal
// with potential other package manager process running.
Timeout.add (500, () => {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
transaction_infobox.show_all ();
details_button.sensitive = true;
cancel_button.sensitive = true;
transaction.start_refresh (false);
return false;
});
stack.notify["visible-child"].connect (on_stack_visible_child_changed);
return false;
}
void set_transaction_infobox_visible () {
if (important_details) {
transaction_infobox.show_all ();
return;
}
if (!generate_mirrors_list) {
bool visible = false;
uint64 total_dsize = 0;
repos_updates_list.foreach ((model, path, iter) => {
bool selected;
uint64 dsize;
repos_updates_list.get (iter, 0, out selected, 6, out dsize);
visible |= selected;
if (selected) {
total_dsize += dsize;
}
return false;
});
if (!visible) {
aur_updates_list.foreach ((model, path, iter) => {
bool selected;
aur_updates_list.get (iter, 0, out selected);
visible |= selected;
return visible;
});
}
if (visible) {
if (total_dsize != 0) {
transaction.progress_box.action_label.set_markup("<b>%s: %s</b>".printf (dgettext (null, "Total download size"), format_size (total_dsize)));
} else {
transaction.progress_box.action_label.label = "";
}
// fix an possible visibility issue
transaction_infobox.show_all ();
} else {
transaction_infobox.visible = false;
}
}
}
[GtkCallback]
void on_repos_select_update_toggled (string path) {
if (!transaction_running) {
Gtk.TreePath treepath = new Gtk.TreePath.from_string (path);
Gtk.TreeIter iter;
string pkgname;
repos_updates_list.get_iter (out iter, treepath);
repos_updates_list.get (iter, 1, out pkgname);
if (repos_select_update.active) {
repos_updates_list.set (iter, 0, false);
transaction.temporary_ignorepkgs.add (pkgname);
} else {
repos_updates_list.set (iter, 0, true);
transaction.temporary_ignorepkgs.remove (pkgname);
}
set_transaction_infobox_visible ();
}
}
[GtkCallback]
void on_aur_select_update_toggled (string path) {
if (!transaction_running) {
Gtk.TreePath treepath = new Gtk.TreePath.from_string (path);
Gtk.TreeIter iter;
string pkgname;
aur_updates_list.get_iter (out iter, treepath);
aur_updates_list.get (iter, 1, out pkgname);
if (aur_select_update.active) {
aur_updates_list.set (iter, 0, false);
transaction.temporary_ignorepkgs.add (pkgname);
} else {
aur_updates_list.set (iter, 0, true);
transaction.temporary_ignorepkgs.remove (pkgname);
}
set_transaction_infobox_visible ();
}
}
[GtkCallback]
public void on_button_back_clicked () {
if (aur_scrolledwindow.visible) {
stackswitcher.visible = true;
stack.visible_child_name = previous_visible_child_name;
} else {
stack.visible_child_name = "repos";
}
}
void on_stack_visible_child_changed () {
if (stack.visible_child_name == "term") {
button_back.visible = true;
}
}
[GtkCallback]
void on_menu_button_toggled () {
preferences_button.sensitive = !transaction_running;
}
[GtkCallback]
void on_preferences_button_clicked () {
transaction.run_preferences_dialog.begin (() => {
if (!generate_mirrors_list) {
populate_updates_list ();
}
});
}
[GtkCallback]
void on_apply_button_clicked () {
transaction_running = true;
transaction.sysupgrade (false);
apply_button.sensitive = false;
details_button.sensitive = true;
cancel_button.sensitive = true;
}
[GtkCallback]
void on_refresh_button_clicked () {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
transaction_infobox.show_all ();
apply_button.sensitive = false;
details_button.sensitive = true;
cancel_button.sensitive = true;
transaction.start_refresh (true);
}
[GtkCallback]
void on_history_button_clicked () {
transaction.run_history_dialog ();
}
[GtkCallback]
void on_about_button_clicked () {
transaction.run_about_dialog ();
}
[GtkCallback]
void on_details_button_clicked () {
details_button.get_style_context ().remove_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
important_details = false;
previous_visible_child_name = stack.visible_child_name;
stack.visible_child_name = "term";
}
[GtkCallback]
void on_cancel_button_clicked () {
transaction.cancel ();
}
void on_start_waiting () {
cancel_button.sensitive = true;
}
void on_stop_waiting () {
populate_updates_list ();
}
void on_start_downloading () {
cancel_button.sensitive = true;
}
void on_stop_downloading () {
cancel_button.sensitive = false;
}
void on_start_building () {
cancel_button.sensitive = true;
}
void on_stop_building () {
cancel_button.sensitive = false;
}
void on_important_details_output (bool must_show) {
if (must_show) {
stackswitcher.visible = false;
previous_visible_child_name = stack.visible_child_name;
stack.visible_child_name = "term";
button_back.visible = false;
} else if (stack.visible_child_name != "term") {
important_details = true;
details_button.sensitive = true;
details_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
}
}
void on_generate_mirrors_list () {
generate_mirrors_list = true;
apply_button.sensitive = false;
transaction_infobox.show_all ();
}
void populate_updates_list () {
transaction_running = false;
generate_mirrors_list = false;
apply_button.grab_default ();
if (!important_details) {
details_button.sensitive = false;
}
cancel_button.sensitive = false;
if (stack.visible_child_name == "term") {
button_back.visible = true;
}
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
transaction.progress_box.action_label.label = "";
transaction.start_get_updates ();
}
void on_get_updates_finished (Updates updates) {
headerbar.title = dgettext (null, "Update Manager");
repos_updates_list.clear ();
stackswitcher.visible = false;
repos_scrolledwindow.visible = true;
aur_updates_list.clear ();
aur_scrolledwindow.visible = false;
uint repos_updates_nb = 0;
uint aur_updates_nb = 0;
foreach (unowned UpdateInfos infos in updates.repos_updates) {
string size = infos.download_size != 0 ? format_size (infos.download_size) : "";
repos_updates_nb++;
repos_updates_list.insert_with_values (null, -1,
0, !transaction.temporary_ignorepkgs.contains (infos.name),
1, infos.name,
2, infos.new_version,
3, "(%s)".printf (infos.old_version),
4, infos.repo,
5, size,
6, infos.download_size);
}
foreach (unowned UpdateInfos infos in updates.aur_updates) {
aur_updates_nb++;
aur_updates_list.insert_with_values (null, -1,
0, !transaction.temporary_ignorepkgs.contains (infos.name),
1, infos.name,
2, infos.new_version,
3, "(%s)".printf (infos.old_version));
}
uint updates_nb = repos_updates_nb + aur_updates_nb;
if (updates_nb == 0) {
headerbar.title = dgettext (null, "Your system is up-to-date");
apply_button.sensitive = false;
} else {
headerbar.title = dngettext (null, "%u available update", "%u available updates", updates_nb).printf (updates_nb);
apply_button.sensitive = true;
}
set_transaction_infobox_visible ();
if (aur_updates_nb != 0) {
aur_scrolledwindow.visible = true;
if (repos_updates_nb == 0) {
repos_scrolledwindow.visible = false;
}
if (stack.visible_child_name != "term") {
stackswitcher.visible = true;
}
}
this.get_window ().set_cursor (null);
}
}
}

967
src/user_daemon.vala Normal file
View File

@ -0,0 +1,967 @@
/*
* pamac-vala
*
* Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a get of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// i18n
const string GETTEXT_PACKAGE = "pamac";
Pamac.UserDaemon user_daemon;
MainLoop loop;
private int alpm_pkg_compare_name (Alpm.Package pkg_a, Alpm.Package pkg_b) {
return strcmp (pkg_a.name, pkg_b.name);
}
private string global_search_string;
private int alpm_pkg_sort_search_by_relevance (Alpm.Package pkg_a, Alpm.Package pkg_b) {
if (global_search_string != null) {
// display exact match first
if (pkg_a.name == global_search_string) {
return 0;
}
if (pkg_b.name == global_search_string) {
return 1;
}
if (pkg_a.name.has_prefix (global_search_string + "-")) {
if (pkg_b.name.has_prefix (global_search_string + "-")) {
return strcmp (pkg_a.name, pkg_b.name);
}
return 0;
}
if (pkg_b.name.has_prefix (global_search_string + "-")) {
if (pkg_a.name.has_prefix (global_search_string + "-")) {
return strcmp (pkg_a.name, pkg_b.name);
}
return 1;
}
if (pkg_a.name.has_prefix (global_search_string)) {
if (pkg_b.name.has_prefix (global_search_string)) {
return strcmp (pkg_a.name, pkg_b.name);
}
return 0;
}
if (pkg_b.name.has_prefix (global_search_string)) {
if (pkg_a.name.has_prefix (global_search_string)) {
return strcmp (pkg_a.name, pkg_b.name);
}
return 1;
}
if (pkg_a.name.contains (global_search_string)) {
if (pkg_b.name.contains (global_search_string)) {
return strcmp (pkg_a.name, pkg_b.name);
}
return 0;
}
if (pkg_b.name.contains (global_search_string)) {
if (pkg_a.name.contains (global_search_string)) {
return strcmp (pkg_a.name, pkg_b.name);
}
return 1;
}
}
return strcmp (pkg_a.name, pkg_b.name);
}
namespace Pamac {
[DBus (name = "org.manjaro.pamac.user")]
public class UserDaemon: Object {
private AlpmConfig alpm_config;
private Alpm.Handle? alpm_handle;
private Alpm.Handle? files_handle;
private bool check_aur_updates;
private bool aur_updates_checked;
private Json.Array aur_updates_results;
private HashTable<string, Json.Array> aur_search_results;
private HashTable<string, Json.Object> aur_infos;
public signal void get_updates_finished (Updates updates);
public UserDaemon () {
alpm_config = new AlpmConfig ("/etc/pacman.conf");
aur_updates_results = new Json.Array ();
aur_search_results = new HashTable<string, Json.Array> (str_hash, str_equal);
aur_infos = new HashTable<string, Json.Object> (str_hash, str_equal);
refresh_handle ();
}
public void refresh_handle () {
alpm_handle = alpm_config.get_handle ();
if (alpm_handle == null) {
return;
} else {
files_handle = alpm_config.get_handle (true);
}
}
public bool get_checkspace () {
return alpm_handle.checkspace == 1 ? true : false;
}
public string get_lockfile () {
return alpm_handle.lockfile;
}
public string[] get_ignorepkgs () {
string[] result = {};
unowned Alpm.List<unowned string> ignorepkgs = alpm_handle.ignorepkgs;
while (ignorepkgs != null) {
unowned string ignorepkg = ignorepkgs.data;
result += ignorepkg;
ignorepkgs.next ();
}
return result;
}
public bool should_hold (string pkgname) {
if (alpm_config.get_holdpkgs ().find_custom (pkgname, strcmp) != null) {
return true;
}
return false;
}
public uint get_pkg_reason (string pkgname) {
unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (pkgname);
if (pkg != null) {
return pkg.reason;
}
return 0;
}
public uint get_pkg_origin (string pkgname) {
unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (pkgname);
if (pkg != null) {
return pkg.origin;
} else {
pkg = get_syncpkg (pkgname);
if (pkg != null) {
return pkg.origin;
}
}
return 0;
}
private AlpmPackage initialise_pkg_struct (Alpm.Package? alpm_pkg) {
if (alpm_pkg != null) {
string installed_version = "";
string repo_name = "";
if (alpm_pkg.origin == Alpm.Package.From.LOCALDB) {
installed_version = alpm_pkg.version;
unowned Alpm.Package? sync_pkg = get_syncpkg (alpm_pkg.name);
if (sync_pkg != null) {
repo_name = sync_pkg.db.name;
}
} else if (alpm_pkg.origin == Alpm.Package.From.SYNCDB) {
unowned Alpm.Package? local_pkg = alpm_handle.localdb.get_pkg (alpm_pkg.name);
if (local_pkg != null) {
installed_version = local_pkg.version;
}
repo_name = alpm_pkg.db.name;
}
return AlpmPackage () {
name = alpm_pkg.name,
version = alpm_pkg.version,
installed_version = (owned) installed_version,
// desc can be null
desc = alpm_pkg.desc ?? "",
repo = (owned) repo_name,
size = alpm_pkg.isize,
download_size = alpm_pkg.download_size,
origin = (uint) alpm_pkg.origin
};
} else {
return AlpmPackage () {
name = "",
version = "",
installed_version = "",
desc = "",
repo = ""
};
}
}
public async AlpmPackage[] get_installed_pkgs () {
AlpmPackage[] pkgs = {};
unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
while (pkgcache != null) {
unowned Alpm.Package alpm_pkg = pkgcache.data;
pkgs += initialise_pkg_struct (alpm_pkg);
pkgcache.next ();
}
return pkgs;
}
public async AlpmPackage[] get_explicitly_installed_pkgs () {
AlpmPackage[] pkgs = {};
unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
while (pkgcache != null) {
unowned Alpm.Package alpm_pkg = pkgcache.data;
if (alpm_pkg.reason == Alpm.Package.Reason.EXPLICIT) {
pkgs += initialise_pkg_struct (alpm_pkg);
}
pkgcache.next ();
}
return pkgs;
}
public async AlpmPackage[] get_foreign_pkgs () {
AlpmPackage[] pkgs = {};
unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
while (pkgcache != null) {
unowned Alpm.Package alpm_pkg = pkgcache.data;
bool sync_found = false;
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
unowned Alpm.Package? sync_pkg = db.get_pkg (alpm_pkg.name);
if (sync_pkg != null) {
sync_found = true;
break;
}
syncdbs.next ();
}
if (sync_found == false) {
pkgs += initialise_pkg_struct (alpm_pkg);
}
pkgcache.next ();
}
return pkgs;
}
public async AlpmPackage[] get_orphans () {
AlpmPackage[] pkgs = {};
unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
while (pkgcache != null) {
unowned Alpm.Package alpm_pkg = pkgcache.data;
if (alpm_pkg.reason == Alpm.Package.Reason.DEPEND) {
Alpm.List<string> requiredby = alpm_pkg.compute_requiredby ();
if (requiredby.length == 0) {
Alpm.List<string> optionalfor = alpm_pkg.compute_optionalfor ();
if (optionalfor.length == 0) {
pkgs += initialise_pkg_struct (alpm_pkg);
} else {
optionalfor.free_inner (GLib.free);
}
} else {
requiredby.free_inner (GLib.free);
}
}
pkgcache.next ();
}
return pkgs;
}
public AlpmPackage get_installed_pkg (string pkgname) {
return initialise_pkg_struct (alpm_handle.localdb.get_pkg (pkgname));
}
public AlpmPackage find_installed_satisfier (string depstring) {
return initialise_pkg_struct (Alpm.find_satisfier (alpm_handle.localdb.pkgcache, depstring));
}
private unowned Alpm.Package? get_syncpkg (string name) {
unowned Alpm.Package? pkg = null;
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
pkg = db.get_pkg (name);
if (pkg != null) {
break;
}
syncdbs.next ();
}
return pkg;
}
public AlpmPackage get_sync_pkg (string pkgname) {
return initialise_pkg_struct (get_syncpkg (pkgname));
}
private unowned Alpm.Package? find_dbs_satisfier (string depstring) {
unowned Alpm.Package? pkg = null;
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
pkg = Alpm.find_satisfier (db.pkgcache, depstring);
if (pkg != null) {
break;
}
syncdbs.next ();
}
return pkg;
}
public AlpmPackage find_sync_satisfier (string depstring) {
return initialise_pkg_struct (find_dbs_satisfier (depstring));
}
private Alpm.List<unowned Alpm.Package> search_all_dbs (string search_string) {
Alpm.List<unowned string> needles = null;
string[] splitted = search_string.split (" ");
foreach (unowned string part in splitted) {
needles.add (part);
}
Alpm.List<unowned Alpm.Package> result = alpm_handle.localdb.search (needles);
Alpm.List<unowned Alpm.Package> syncpkgs = null;
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
if (syncpkgs.length == 0) {
syncpkgs = db.search (needles);
} else {
syncpkgs.join (db.search (needles).diff (syncpkgs, (Alpm.List.CompareFunc) alpm_pkg_compare_name));
}
syncdbs.next ();
}
result.join (syncpkgs.diff (result, (Alpm.List.CompareFunc) alpm_pkg_compare_name));
// use custom sort function
global_search_string = search_string;
result.sort (result.length, (Alpm.List.CompareFunc) alpm_pkg_sort_search_by_relevance);
return result;
}
public async AlpmPackage[] search_pkgs (string search_string) {
AlpmPackage[] result = {};
Alpm.List<unowned Alpm.Package> alpm_pkgs = search_all_dbs (search_string);
unowned Alpm.List<unowned Alpm.Package> list = alpm_pkgs;
while (list != null) {
unowned Alpm.Package alpm_pkg = list.data;
result += initialise_pkg_struct (alpm_pkg);
list.next ();
}
return result;
}
private AURPackage initialise_aur_struct (Json.Object json_object) {
string installed_version = "";
unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (json_object.get_string_member ("Name"));
if (pkg != null) {
installed_version = pkg.version;
}
return AURPackage () {
name = json_object.get_string_member ("Name"),
version = json_object.get_string_member ("Version"),
installed_version = (owned) installed_version,
// desc can be null
desc = json_object.get_null_member ("Description") ? "" : json_object.get_string_member ("Description"),
popularity = json_object.get_double_member ("Popularity")
};
}
public async AURPackage[] search_in_aur (string search_string) {
if (!aur_search_results.contains (search_string)) {
Json.Array pkgs = yield AUR.search (search_string.split (" "));
aur_search_results.insert (search_string, pkgs);
}
AURPackage[] result = {};
Json.Array aur_pkgs = aur_search_results.get (search_string);
aur_pkgs.foreach_element ((array, index, node) => {
Json.Object aur_pkg = node.get_object ();
// remove results which exist in repos
if (get_syncpkg (aur_pkg.get_string_member ("Name")) == null) {
result += initialise_aur_struct (node.get_object ());
}
});
return result;
}
public async AURPackageDetails get_aur_details (string pkgname) {
string name = "";
string version = "";
string desc = "";
double popularity = 0;
string packagebase = "";
string url = "";
string maintainer = "";
int64 firstsubmitted = 0;
int64 lastmodified = 0;
int64 outofdate = 0;
int64 numvotes = 0;
string[] licenses = {};
string[] depends = {};
string[] makedepends = {};
string[] checkdepends = {};
string[] optdepends = {};
string[] provides = {};
string[] replaces = {};
string[] conflicts = {};
var details = AURPackageDetails ();
if (!aur_infos.contains (pkgname)) {
Json.Array results = yield AUR.multiinfo ({pkgname});
if (results.get_length () > 0) {
aur_infos.insert (pkgname, results.get_object_element (0));
}
}
unowned Json.Object? json_object = aur_infos.lookup (pkgname);
if (json_object != null) {
// name
name = json_object.get_string_member ("Name");
// version
version = json_object.get_string_member ("Version");
// desc can be null
if (!json_object.get_null_member ("Description")) {
desc = json_object.get_string_member ("Description");
}
popularity = json_object.get_double_member ("Popularity");
// packagebase
packagebase = json_object.get_string_member ("PackageBase");
// url can be null
unowned Json.Node? node = json_object.get_member ("URL");
if (!node.is_null ()) {
url = node.get_string ();
}
// maintainer can be null
node = json_object.get_member ("Maintainer");
if (!node.is_null ()) {
maintainer = node.get_string ();
}
// firstsubmitted
firstsubmitted = json_object.get_int_member ("FirstSubmitted");
// lastmodified
lastmodified = json_object.get_int_member ("LastModified");
// outofdate can be null
node = json_object.get_member ("OutOfDate");
if (!node.is_null ()) {
outofdate = node.get_int ();
}
//numvotes
numvotes = json_object.get_int_member ("NumVotes");
// licenses
node = json_object.get_member ("License");
if (!node.is_null ()) {
node.get_array ().foreach_element ((array, index, _node) => {
licenses += _node.get_string ();
});
} else {
licenses += _("Unknown");
}
// depends
node = json_object.get_member ("Depends");
if (node != null) {
node.get_array ().foreach_element ((array, index, _node) => {
depends += _node.get_string ();
});
}
// optdepends
node = json_object.get_member ("OptDepends");
if (node != null) {
node.get_array ().foreach_element ((array, index, _node) => {
optdepends += _node.get_string ();
});
}
// makedepends
node = json_object.get_member ("MakeDepends");
if (node != null) {
node.get_array ().foreach_element ((array, index, _node) => {
makedepends += _node.get_string ();
});
}
// checkdepends
node = json_object.get_member ("CheckDepends");
if (node != null) {
node.get_array ().foreach_element ((array, index, _node) => {
checkdepends += _node.get_string ();
});
}
// provides
node = json_object.get_member ("Provides");
if (node != null) {
node.get_array ().foreach_element ((array, index, _node) => {
provides += _node.get_string ();
});
}
// replaces
node = json_object.get_member ("Replaces");
if (node != null) {
node.get_array ().foreach_element ((array, index, _node) => {
replaces += _node.get_string ();
});
}
// conflicts
node = json_object.get_member ("Conflicts");
if (node != null) {
node.get_array ().foreach_element ((array, index, _node) => {
conflicts += _node.get_string ();
});
}
}
details.name = (owned) name;
details.version = (owned) version ;
details.desc = (owned) desc;
details.popularity = popularity;
details.packagebase = (owned) packagebase;
details.url = (owned) url;
details.maintainer = (owned) maintainer ;
details.firstsubmitted = firstsubmitted;
details.lastmodified = lastmodified;
details.outofdate = outofdate;
details.numvotes = numvotes;
details.licenses = (owned) licenses;
details.depends = (owned) depends;
details.optdepends = (owned) optdepends;
details.checkdepends = (owned) checkdepends;
details.makedepends = (owned) makedepends;
details.provides = (owned) provides;
details.replaces = (owned) replaces;
details.conflicts = (owned) conflicts;
return details;
}
public string[] get_repos_names () {
string[] repos_names = {};
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
repos_names += db.name;
syncdbs.next ();
}
return repos_names;
}
public async AlpmPackage[] get_repo_pkgs (string repo) {
AlpmPackage[] pkgs = {};
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
if (db.name == repo) {
unowned Alpm.List<unowned Alpm.Package> pkgcache = db.pkgcache;
while (pkgcache != null) {
unowned Alpm.Package sync_pkg = pkgcache.data;
unowned Alpm.Package? local_pkg = alpm_handle.localdb.get_pkg (sync_pkg.name);
if (local_pkg != null) {
pkgs += initialise_pkg_struct (local_pkg);
} else {
pkgs += initialise_pkg_struct (sync_pkg);
}
pkgcache.next ();
}
break;
}
syncdbs.next ();
}
return pkgs;
}
public string[] get_groups_names () {
string[] groups_names = {};
unowned Alpm.List<unowned Alpm.Group> groupcache = alpm_handle.localdb.groupcache;
while (groupcache != null) {
unowned Alpm.Group group = groupcache.data;
if (!(group.name in groups_names)) {
groups_names += group.name;
}
groupcache.next ();
}
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
groupcache = db.groupcache;
while (groupcache != null) {
unowned Alpm.Group group = groupcache.data;
if (!(group.name in groups_names)) {
groups_names += group.name;
}
groupcache.next ();
}
syncdbs.next ();
}
return groups_names;
}
private Alpm.List<unowned Alpm.Package> group_pkgs (string group_name) {
Alpm.List<unowned Alpm.Package> result = null;
unowned Alpm.Group? grp = alpm_handle.localdb.get_group (group_name);
if (grp != null) {
unowned Alpm.List<unowned Alpm.Package> packages = grp.packages;
while (packages != null) {
unowned Alpm.Package pkg = packages.data;
result.add (pkg);
packages.next ();
}
}
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
grp = db.get_group (group_name);
if (grp != null) {
unowned Alpm.List<unowned Alpm.Package> packages = grp.packages;
while (packages != null) {
unowned Alpm.Package pkg = packages.data;
if (result.find (pkg, (Alpm.List.CompareFunc) alpm_pkg_compare_name) == null) {
result.add (pkg);
}
packages.next ();
}
}
syncdbs.next ();
}
return result;
}
public async AlpmPackage[] get_group_pkgs (string groupname) {
AlpmPackage[] pkgs = {};
Alpm.List<unowned Alpm.Package> alpm_pkgs = group_pkgs (groupname);
unowned Alpm.List<unowned Alpm.Package> list = alpm_pkgs;
while (list != null) {
unowned Alpm.Package alpm_pkg = list.data;
pkgs += initialise_pkg_struct (alpm_pkg);
list.next ();
}
return pkgs;
}
public string[] get_pkg_uninstalled_optdeps (string pkgname) {
string[] optdeps = {};
unowned Alpm.Package? alpm_pkg = alpm_handle.localdb.get_pkg (pkgname);
if (alpm_pkg == null) {
alpm_pkg = get_syncpkg (pkgname);
}
if (alpm_pkg != null) {
unowned Alpm.List<unowned Alpm.Depend> optdepends = alpm_pkg.optdepends;
while (optdepends != null) {
unowned Alpm.Depend optdep = optdepends.data;
if (Alpm.find_satisfier (alpm_handle.localdb.pkgcache, optdep.name) == null) {
optdeps += optdep.compute_string ();
}
optdepends.next ();
}
}
return optdeps;
}
public AlpmPackageDetails get_pkg_details (string pkgname) {
string name = "";
string version = "";
string desc = "";
string url = "";
string repo = "";
string has_signature = "";
string reason = "";
string packager = "";
string builddate = "";
string installdate = "";
string[] groups = {};
string[] backups = {};
string[] licenses = {};
string[] depends = {};
string[] optdepends = {};
string[] requiredby = {};
string[] optionalfor = {};
string[] provides = {};
string[] replaces = {};
string[] conflicts = {};
var details = AlpmPackageDetails ();
unowned Alpm.Package? alpm_pkg = alpm_handle.localdb.get_pkg (pkgname);
if (alpm_pkg == null) {
alpm_pkg = get_syncpkg (pkgname);
}
if (alpm_pkg != null) {
// name
name = alpm_pkg.name;
// version
version = alpm_pkg.version;
// desc can be null
if (alpm_pkg.desc != null) {
desc = alpm_pkg.desc;
}
details.origin = (uint) alpm_pkg.origin;
// url can be null
if (alpm_pkg.url != null) {
url = alpm_pkg.url;
}
// packager can be null
packager = alpm_pkg.packager ?? "";
// groups
unowned Alpm.List list = alpm_pkg.groups;
while (list != null) {
groups += ((Alpm.List<unowned string>) list).data;
list.next ();
}
// licenses
list = alpm_pkg.licenses;
while (list != null) {
licenses += ((Alpm.List<unowned string>) list).data;
list.next ();
}
// build_date
GLib.Time time = GLib.Time.local ((time_t) alpm_pkg.builddate);
builddate = time.format ("%a %d %b %Y %X %Z");
// local pkg
if (alpm_pkg.origin == Alpm.Package.From.LOCALDB) {
// repo
unowned Alpm.Package? sync_pkg = get_syncpkg (alpm_pkg.name);
if (sync_pkg != null) {
repo = sync_pkg.db.name;
}
// reason
if (alpm_pkg.reason == Alpm.Package.Reason.EXPLICIT) {
reason = _("Explicitly installed");
} else if (alpm_pkg.reason == Alpm.Package.Reason.DEPEND) {
reason = _("Installed as a dependency for another package");
} else {
reason = _("Unknown");
}
// install_date
time = GLib.Time.local ((time_t) alpm_pkg.installdate);
installdate = time.format ("%a %d %b %Y %X %Z");
// backups
list = alpm_pkg.backups;
while (list != null) {
backups += "/" + ((Alpm.List<unowned Alpm.Backup>) list).data.name;
list.next ();
}
// requiredby
Alpm.List<string> pkg_requiredby = alpm_pkg.compute_requiredby ();
list = pkg_requiredby;
while (list != null) {
requiredby += ((Alpm.List<unowned string>) list).data;
list.next ();
}
pkg_requiredby.free_inner (GLib.free);
// optionalfor
Alpm.List<string> pkg_optionalfor = alpm_pkg.compute_optionalfor ();
list = pkg_optionalfor;
while (list != null) {
optionalfor += ((Alpm.List<unowned string>) list).data;
list.next ();
}
pkg_optionalfor.free_inner (GLib.free);
// sync pkg
} else if (alpm_pkg.origin == Alpm.Package.From.SYNCDB) {
// repos
repo = alpm_pkg.db.name;
// signature
has_signature = alpm_pkg.base64_sig != null ? _("Yes") : _("No");
}
// depends
list = alpm_pkg.depends;
while (list != null) {
depends += ((Alpm.List<unowned Alpm.Depend>) list).data.compute_string ();
list.next ();
}
// optdepends
list = alpm_pkg.optdepends;
while (list != null) {
optdepends += ((Alpm.List<unowned Alpm.Depend>) list).data.compute_string ();
list.next ();
}
// provides
list = alpm_pkg.provides;
while (list != null) {
provides += ((Alpm.List<unowned Alpm.Depend>) list).data.compute_string ();
list.next ();
}
// replaces
list = alpm_pkg.replaces;
while (list != null) {
replaces += ((Alpm.List<unowned Alpm.Depend>) list).data.compute_string ();
list.next ();
}
// conflicts
list = alpm_pkg.conflicts;
while (list != null) {
conflicts += ((Alpm.List<unowned Alpm.Depend>) list).data.compute_string ();
list.next ();
}
}
details.name = (owned) name;
details.version = (owned) version;
details.desc = (owned) desc;
details.repo = (owned) repo;
details.url = (owned) url;
details.packager = (owned) packager;
details.builddate = (owned) builddate;
details.installdate = (owned) installdate;
details.reason = (owned) reason;
details.has_signature = (owned) has_signature;
details.licenses = (owned) licenses;
details.depends = (owned) depends;
details.optdepends = (owned) optdepends;
details.requiredby = (owned) requiredby;
details.optionalfor = (owned) optionalfor;
details.provides = (owned) provides;
details.replaces = (owned) replaces;
details.conflicts = (owned) conflicts;
details.groups = (owned) groups;
details.backups = (owned) backups;
return details;
}
public string[] get_pkg_files (string pkgname) {
string[] files = {};
unowned Alpm.Package? alpm_pkg = alpm_handle.localdb.get_pkg (pkgname);
if (alpm_pkg != null) {
unowned Alpm.FileList filelist = alpm_pkg.files;
Alpm.File* file_ptr = filelist.files;
for (size_t i = 0; i < filelist.count; i++, file_ptr++) {
if (!file_ptr->name.has_suffix ("/")) {
files += "/" + file_ptr->name;
}
}
} else {
unowned Alpm.List<unowned Alpm.DB> syncdbs = files_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
unowned Alpm.Package? files_pkg = db.get_pkg (pkgname);
if (files_pkg != null) {
unowned Alpm.FileList filelist = files_pkg.files;
Alpm.File* file_ptr = filelist.files;
for (size_t i = 0; i < filelist.count; i++, file_ptr++) {
if (!file_ptr->name.has_suffix ("/")) {
files += "/" + file_ptr->name;
}
}
break;
}
syncdbs.next ();
}
}
return files;
}
private int get_updates () {
AlpmPackage[] updates_infos = {};
unowned Alpm.Package? pkg = null;
unowned Alpm.Package? candidate = null;
// use a tmp handle
var tmp_handle = alpm_config.get_handle (false, true);
// refresh tmp dbs
unowned Alpm.List<unowned Alpm.DB> syncdbs = tmp_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
db.update (0);
syncdbs.next ();
}
string[] local_pkgs = {};
unowned Alpm.List<unowned Alpm.Package> pkgcache = tmp_handle.localdb.pkgcache;
while (pkgcache != null) {
unowned Alpm.Package installed_pkg = pkgcache.data;
// check if installed_pkg is in IgnorePkg or IgnoreGroup
if (tmp_handle.should_ignore (installed_pkg) == 0) {
candidate = installed_pkg.sync_newversion (tmp_handle.syncdbs);
if (candidate != null) {
var infos = initialise_pkg_struct (candidate);
infos.installed_version = installed_pkg.version;
updates_infos += (owned) infos;
} else {
if (check_aur_updates && (!aur_updates_checked)) {
// check if installed_pkg is a local pkg
syncdbs = tmp_handle.syncdbs;
while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data;
pkg = Alpm.find_satisfier (db.pkgcache, installed_pkg.name);
if (pkg != null) {
break;
}
syncdbs.next ();
}
if (pkg == null) {
local_pkgs += installed_pkg.name;
}
}
}
}
pkgcache.next ();
}
if (check_aur_updates) {
// get aur updates
if (!aur_updates_checked) {
AUR.multiinfo.begin (local_pkgs, (obj, res) => {
aur_updates_results = AUR.multiinfo.end (res);
aur_updates_checked = true;
var updates = Updates () {
repos_updates = (owned) updates_infos,
aur_updates = get_aur_updates_infos ()
};
get_updates_finished (updates);
});
} else {
var updates = Updates () {
repos_updates = (owned) updates_infos,
aur_updates = get_aur_updates_infos ()
};
get_updates_finished (updates);
}
} else {
var updates = Updates () {
repos_updates = (owned) updates_infos,
aur_updates = {}
};
get_updates_finished (updates);
}
return 0;
}
private AURPackage[] get_aur_updates_infos () {
AURPackage[] aur_updates_infos = {};
aur_updates_results.foreach_element ((array, index, node) => {
unowned Json.Object pkg_info = node.get_object ();
unowned string name = pkg_info.get_string_member ("Name");
unowned string new_version = pkg_info.get_string_member ("Version");
unowned string old_version = alpm_handle.localdb.get_pkg (name).version;
if (Alpm.pkg_vercmp (new_version, old_version) == 1) {
var infos = initialise_aur_struct (pkg_info);
infos.installed_version = old_version;
aur_updates_infos += (owned) infos;
}
});
return aur_updates_infos;
}
public void start_get_updates (bool check_aur_updates_) {
check_aur_updates = check_aur_updates_;
new Thread<int> ("get updates thread", get_updates);
}
[DBus (no_reply = true)]
public void quit () {
loop.quit ();
}
// End of Daemon Object
}
}
void on_bus_acquired (DBusConnection conn) {
user_daemon = new Pamac.UserDaemon ();
try {
conn.register_object ("/org/manjaro/pamac/user", user_daemon);
}
catch (IOError e) {
stderr.printf ("Could not register service\n");
loop.quit ();
}
}
void main () {
// i18n
Intl.setlocale (LocaleCategory.ALL, "");
Intl.textdomain (GETTEXT_PACKAGE);
Bus.own_name (BusType.SESSION,
"org.manjaro.pamac.user",
BusNameOwnerFlags.NONE,
on_bus_acquired,
null,
() => {
stderr.printf ("Could not acquire name\n");
loop.quit ();
});
loop = new MainLoop ();
loop.run ();
}

View File

@ -550,6 +550,7 @@ namespace Alpm {
public ulong name_hash; public ulong name_hash;
public Mode mod; public Mode mod;
[CCode (cname = "alpm_dep_from_string")]
public static Depend from_string(string depstring); public static Depend from_string(string depstring);
[CCode (cname = "alpm_dep_compute_string")] [CCode (cname = "alpm_dep_compute_string")]