Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=5411dcf821e234f04eaffadb3c29cec80b262016
commit 5411dcf821e234f04eaffadb3c29cec80b262016 Author: bouleetbil <[email protected]> Date: Thu Dec 30 14:19:19 2010 +0100 *added class Tools diff --git a/frugal-tweak-vala/Makefile b/frugal-tweak-vala/Makefile index 2113bdf..bc44e67 100644 --- a/frugal-tweak-vala/Makefile +++ b/frugal-tweak-vala/Makefile @@ -2,7 +2,7 @@ VERSION = 0.1 VALAFLAG = DEBUG=1 -DAEMONSOURCES = daemon.vala pacman.vala +DAEMONSOURCES = daemon.vala pacman.vala tools.vala TERMINALSOURCES = terminal.vala mainwindow.vala BROWSERSOURCES = browser.vala VALAC = valac @@ -19,6 +19,7 @@ browser: $(VALAC) --define=$(VALAFLAG) --pkg gtk+-2.0 --pkg webkit-1.0 $(BROWSERSOURCES) -o frugalware-tweak-browser clean: - rm frugalware-tweak-terminal - rm frugalware-tweak-daemon - rm frugalware-tweak-browser + @rm *.c + @rm frugalware-tweak-terminal + @rm frugalware-tweak-daemon + @rm frugalware-tweak-browser diff --git a/frugal-tweak-vala/daemon.vala b/frugal-tweak-vala/daemon.vala index 7567935..9b401f5 100644 --- a/frugal-tweak-vala/daemon.vala +++ b/frugal-tweak-vala/daemon.vala @@ -24,9 +24,8 @@ class Deamon : GLib.Object { public static pacman pacmang2 ; public static int main(string[] args) { - #if DEBUG==1 - stdout.printf("Start Frugalware Tweak Daemon\n"); - #endif + Tools.ConsoleDebug("Start Frugalware Tweak Daemon\n"); + pacmang2 = new pacman(); UpdateAllDatabase(); @@ -45,10 +44,7 @@ class Deamon : GLib.Object { public static void UpdateAllDatabase() { - #if DEBUG==1 - stdout.printf("Updated database pacman-g2\n"); - #endif - + Tools.ConsoleDebug("Updated database pacman-g2\n"); pacmang2.UpdateAllDatabase(); } diff --git a/frugal-tweak-vala/pacman.vala b/frugal-tweak-vala/pacman.vala index 434d537..116edea 100644 --- a/frugal-tweak-vala/pacman.vala +++ b/frugal-tweak-vala/pacman.vala @@ -18,6 +18,7 @@ */ using GLib; +using Tools; using Pacman; public class pacman @@ -35,9 +36,7 @@ public class pacman Pacman.pacman_release(); if (Pacman.pacman_initialize(Pacman.PM_ROOT) != -1) { - #if DEBUG==1 - stdout.printf("Initialize pacman-g2\n"); - #endif + Tools.ConsoleDebug("Initialize pacman-g2\n"); InitDatabase(); } } @@ -45,9 +44,8 @@ public class pacman private void InitDatabase() { - #if DEBUG==1 - stdout.printf("Parse config pacman-g2\n"); - #endif + Tools.ConsoleDebug("Parse config pacman-g2\n"); + Pacman.pacman_cb_db_register callback = _db_callback; Pacman.pacman_parse_config(CFG_FILE, callback,""); Pacman.pacman_db_register(FW_LOCAL); @@ -58,20 +56,17 @@ public class pacman } private static void _db_callback (string section, PM_DB db) { - #if DEBUG==1 - stdout.printf("Find repo "+section+"\n"); - #endif + Tools.ConsoleDebug("Find repo "+section+"\n"); repos += section; return; } public void UpdateAllDatabase() { - stdout.printf("Update all repo \n"); + Tools.ConsoleDebug("Update all repo \n"); int i =0; while(i <repos.length) { - //stdout.printf(repos[i]+" \n"); this.UpdateDatabase(repos[i]); i++; } @@ -79,25 +74,32 @@ public class pacman public void UpdateDatabase(string section) { - #if DEBUG==1 - stdout.printf("Update repo "+section+" \n"); - #endif + Tools.ConsoleDebug("Update repo "+section+" \n"); int retval = 0; sync_db = Pacman.pacman_db_register(section); retval = Pacman.pacman_db_update(0,sync_db); if (retval==-1) { - stdout.printf("Update repo "+section+" failed \n"); + Tools.ConsoleDebug("Update repo "+section+" failed \n"); + return; } if (pacman_trans_init(Pacman.OptionTrans.TYPE_SYNC, 0, null, null, null) == -1) { - stdout.printf("pacman_trans_init "+section+" failed \n"); + Tools.ConsoleDebug("pacman_trans_init "+section+" failed \n"); return ; } if (Pacman.pacman_trans_sysupgrade() == -1) { - stdout.printf("pacman_trans_sysupgrade "+section+" failed \n"); + Tools.ConsoleDebug("pacman_trans_sysupgrade "+section+" failed \n"); return ; } + /*packages = pacman_trans_getinfo (PM_TRANS_PACKAGES); + if (packages == null) + { + #if DEBUG==1 + ("No new updates are available\n") + #endif + } */ + pacman_trans_release (); } diff --git a/frugal-tweak-vala/tools.vala b/frugal-tweak-vala/tools.vala new file mode 100644 index 0000000..28800f1 --- /dev/null +++ b/frugal-tweak-vala/tools.vala @@ -0,0 +1,28 @@ +/* + * + * (C) 2010 bouleetbil <[email protected]> + * + * 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 2 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 copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +public static class Tools +{ + public static void ConsoleDebug(string text) + { + #if DEBUG==1 + stdout.printf(text+"\n"); + #endif + } +} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
