hi, I attached patches of journal backup on volumenes. then, we need migrate to 0.84. From 3c28e29e44b8b30a2598ed7e90b3ca3ac809c89e Mon Sep 17 00:00:00 2001 From: Esteban Arias <<a href="mailto:earias@plan.ceibal.edu.uy" target="_blank">earias@plan.ceibal.edu.uy</a>> Date: Wed, 2 Jun 2010 12:32:59 -0300 Subject: [PATCH] Adds-JournalVolumePalette Organization: Plan Ceibal --- src/jarabe/journal/volumestoolbar.py | 42 +++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py index 74b974c..cc7ae38 100644 --- a/src/jarabe/journal/volumestoolbar.py +++ b/src/jarabe/journal/volumestoolbar.py @@ -1,4 +1,6 @@ # Copyright (C) 2007, One Laptop Per Child +# Copyright (C) 2010, Plan Ceibal <<a href="mailto:comunidad@plan.ceibal.edu.uy" target="_blank">comunidad@plan.ceibal.edu.uy</a>> +# Copyright (C) 2010, Paraguay Educa <<a href="mailto:tecnologia@paraguayeduca.org" target="_blank">tecnologia@paraguayeduca.org</a>> # # 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 @@ -22,13 +24,17 @@ import gio import gtk import gconf +from sugar.graphics.icon import Icon from sugar.graphics.radiotoolbutton import RadioToolButton from sugar.graphics.palette import Palette from sugar.graphics.xocolor import XoColor +from sugar.graphics.menuitem import MenuItem from jarabe.journal import model +from jarabe.journal.backup import Backup from jarabe.view.palettes import VolumePalette + class VolumesToolbar(gtk.Toolbar): __gtype_name__ = 'VolumesToolbar' @@ -164,7 +170,7 @@ class VolumeButton(BaseButton): self.props.xo_color = color def create_palette(self): - palette = VolumePalette(self._mount) + palette = JournalVolumePalette(self._mount) #palette.props.invoker = FrameWidgetInvoker(self) #palette.set_group_id('frame') return palette @@ -179,3 +185,37 @@ class JournalButton(BaseButton): color = XoColor(client.get_string('/desktop/sugar/user/color')) self.props.xo_color = color +class JournalVolumePalette(VolumePalette): + + __gtype_name__ = 'JournalVolumePalette' + + def __init__(self, mount): + VolumePalette.__init__(self, mount) + + journal_separator = gtk.SeparatorMenuItem() + self.menu.append(journal_separator) + journal_separator.show() + + menu_item_journal_backup = MenuItem(_('Journal Backup')) + icon = Icon(icon_name='transfer-to', icon_size=gtk.ICON_SIZE_MENU) + menu_item_journal_backup.set_image(icon) + icon.show() + menu_item_journal_backup.connect('activate', self.__journal_backup_activate_cb, mount.get_root().get_path()) + self.menu.append(menu_item_journal_backup) + menu_item_journal_backup.show() + + menu_item_journal_restore = MenuItem(_('Journal Restore')) + icon = Icon(icon_name='transfer-from', icon_size=gtk.ICON_SIZE_MENU) + menu_item_journal_restore.set_image(icon) + icon.show() + menu_item_journal_restore.connect('activate', self.__journal_restore_activate_cb, mount.get_root().get_path()) + self.menu.append(menu_item_journal_restore) + menu_item_journal_restore.show() + + def __journal_backup_activate_cb(self, menu_item, mount_path): + self._do_backup = Backup('backup', mount_path) + self._do_backup.show() + + def __journal_restore_activate_cb(self, menu_item, mount_path): + self._do_restore = Backup('restore', mount_path) + self._do_restore.show() -- 1.6.2.5 From 1e85ffa2955e7ca5761786ae63934ed9a41acffb Mon Sep 17 00:00:00 2001 From: Esteban Arias <<a href="mailto:earias@plan.ceibal.edu.uy">earias@plan.ceibal.edu.uy</a>> Date: Wed, 2 Jun 2010 12:48:03 -0300 Subject: [PATCH] Adds-view-and-scripts-for-volumes-backup-restore Organization: Plan Ceibal --- bin/Makefile.am | 2 + bin/journal-backup-volume | 65 +++++++++ bin/journal-restore-volume | 67 ++++++++++ src/jarabe/journal/Makefile.am | 3 +- src/jarabe/journal/backup.py | 231 +++++++++++++++++++++++++++++++++ src/jarabe/model/Makefile.am | 3 +- src/jarabe/model/processmanagement.py | 88 +++++++++++++ 7 files changed, 457 insertions(+), 2 deletions(-) create mode 100644 bin/journal-backup-volume create mode 100644 bin/journal-restore-volume create mode 100644 src/jarabe/journal/backup.py create mode 100644 src/jarabe/model/processmanagement.py diff --git a/bin/Makefile.am b/bin/Makefile.am index 05a9215..90f157a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -9,6 +9,8 @@ python_scripts = \ bin_SCRIPTS = \ sugar \ + journal-backup-volume \ + journal-restore-volume \ $(python_scripts) EXTRA_DIST = $(python_scripts) <a href="http://sugar.in">sugar.in</a> diff --git a/bin/journal-backup-volume b/bin/journal-backup-volume new file mode 100644 index 0000000..e4a070f --- /dev/null +++ b/bin/journal-backup-volume @@ -0,0 +1,65 @@ +#!/bin/bash +# Journal Backup +# Copyright (C) 2010 Plan Ceibal +# Copyright (C) 2010 Paraguay Educa +# +# 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 copy of the GNU General Public License +# along with this program. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. +# +# Contact information: <a href="mailto:comunidad@plan.ceibal.edu.uy">comunidad@plan.ceibal.edu.uy</a> +# Plan Ceibal <a href="http://www.ceibal.edu.uy">http://www.ceibal.edu.uy</a> + +function check_for_errors() { + if [[ $? != 0 ]]; then + echo "$1" >&2 + exit 1 + fi; +} + +function validate_path() { + if !(test -e "$1"); then + echo "No such file $1" >&2 + exit 1 + fi; +} + +DATASTORE="$HOME/.sugar/default/datastore/" +validate_path $DATASTORE + +if [ -z "$1" ]; then + echo "Backup path is not valid." >&2 + exit 1 +fi; + +PARAMS_PATH=$1 +validate_path $PARAMS_PATH + +if [ -z "$2" ]; then + echo "Backup name is not valid." >&2 + exit 1 +fi; + +SERIAL=$2 + +#TODO: Lets find a sugar-way to do this? +pkill -f -x "python /usr/bin/datastore-service" + +BACKUP_PATH=$PARAMS_PATH/.backup/$SERIAL/ +mkdir -p $BACKUP_PATH + +cd $DATASTORE; +tar -zcf "$BACKUP_PATH"datastore.tar.gz ./* + +check_for_errors + +exit 0 diff --git a/bin/journal-restore-volume b/bin/journal-restore-volume new file mode 100644 index 0000000..134be1c --- /dev/null +++ b/bin/journal-restore-volume @@ -0,0 +1,67 @@ +#!/bin/bash +# Journal Restore +# Copyright (C) 2010 Plan Ceibal +# Copyright (C) 2010 Paraguay Educa +# +# 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 copy of the GNU General Public License +# along with this program. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. +# +# Contact information: <a href="mailto:comunidad@plan.ceibal.edu.uy">comunidad@plan.ceibal.edu.uy</a> +# Plan Ceibal <a href="http://www.ceibal.edu.uy">http://www.ceibal.edu.uy</a> + +function check_for_errors() { + if [[ $? != 0 ]]; then + echo "$1" >&2 + exit 1 + fi; +} + +function validate_path() { + if !(test -e "$1"); then + echo "No such file $1" >&2 + exit 1 + fi; +} + +DATASTORE_PATH="$HOME/.sugar/default/datastore/" +validate_path $DATASTORE_PATH + +if [ -z "$1" ]; then + echo "Backup path is not valid." >&2 + exit 1 +fi; + +PARAMS_PATH=$1 +validate_path $PARAMS_PATH + +if [ -z "$2" ]; then + echo "Backup name is not valid." >&2 + exit 1 +fi; + +SERIAL=$2 + +BACKUP_FILE=$PARAMS_PATH/.backup/$SERIAL/datastore.tar.gz +validate_path $BACKUP_FILE + +#TODO: Lets find a sugar-way to do this? +pkill -f -x "python /usr/bin/datastore-service" + +cd $DATASTORE_PATH +rm -rf $DATASTORE_PATH* + +tar -xvzf $BACKUP_FILE + +check_for_errors + +exit 0 diff --git a/src/jarabe/journal/Makefile.am b/src/jarabe/journal/Makefile.am index f4bf273..6a3091e 100644 --- a/src/jarabe/journal/Makefile.am +++ b/src/jarabe/journal/Makefile.am @@ -14,4 +14,5 @@ sugar_PYTHON = \ model.py \ objectchooser.py \ palettes.py \ - volumestoolbar.py + volumestoolbar.py \ + backup.py diff --git a/src/jarabe/journal/backup.py b/src/jarabe/journal/backup.py new file mode 100644 index 0000000..1b12660 --- /dev/null +++ b/src/jarabe/journal/backup.py @@ -0,0 +1,231 @@ +#!/usr/bin/env python +# Copyright (C) 2010, Plan Ceibal <<a href="mailto:comunidad@plan.ceibal.edu.uy">comunidad@plan.ceibal.edu.uy</a>> +# Copyright (C) 2010, Paraguay Educa <<a href="mailto:tecnologia@paraguayeduca.org">tecnologia@paraguayeduca.org</a>> +# +# 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 copy of the GNU General Public License +# along with this program. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>. + +import os +import gtk +import gobject +import gconf +import logging + +from gettext import gettext as _ +from sugar.graphics import style +from sugar.graphics.icon import Icon +from sugar.graphics.xocolor import XoColor + +from jarabe.model.session import get_session_manager +from jarabe.model.processmanagement import ProcessManagement + +PATH_BACKUP = '/usr/bin/journal-backup-volume' +PATH_RESTORE = '/usr/bin/journal-restore-volume' + +class Backup(gtk.Window): + + __gtype_name__ = 'SugarJournalBackup' + + def __init__(self, type_ps, mount_path): + + self._type_ps = type_ps + self._mount_path = mount_path + + if self._isValidType(self._type_ps): + if ((not self._mount_path == "") and (not self._mount_path == None)): + self._progressBarHandler = None + + gtk.Window.__init__(self) + + self.set_border_width(style.LINE_WIDTH) + width = gtk.gdk.screen_width() + height = gtk.gdk.screen_height() + self.set_size_request(width, height) + self.set_position(gtk.WIN_POS_CENTER_ALWAYS) + self.set_decorated(False) + self.set_resizable(False) + self.set_modal(True) + + self._main_view = gtk.EventBox() + self._vbox = gtk.VBox() + self._vbox.set_spacing(style.DEFAULT_SPACING) + self._vbox.set_border_width(style.GRID_CELL_SIZE) + self._main_view.modify_bg(gtk.STATE_NORMAL, + style.COLOR_BLACK.get_gdk_color()) + self._main_view.add(self._vbox) + self._vbox.show() + + client = gconf.client_get_default() + color = XoColor(client.get_string('/desktop/sugar/user/color')) + + icon = Icon(icon_name='activity-journal', + pixel_size=style.XLARGE_ICON_SIZE, + xo_color=color) + self._vbox.pack_start(icon, False) + icon.show() + + self._title = gtk.Label() + self._title.modify_fg(gtk.STATE_NORMAL, + style.COLOR_WHITE.get_gdk_color()) + self._title.set_markup('%s' % _(self._type_ps)) + self._vbox.pack_start(self._title, False) + self._title.show() + + if self._type_ps == 'backup': + lbl_txt = _("Close all activities and do not remove the external device during the process. \n\n" + "To make the backup of the Journal, a restart is required. \n\n" + "The backup can only be restore from this computer") + elif self._type_ps == 'restore': + lbl_txt = _("The content you restore will overwrite the current contents of the Journal. \n\n" + "Do not remove the external device during the process. \n" + "To implement the restoration of the Journal, a restart is required. \n\n" + "It will restore the backup done for this computer ") + lbl_txt += self._get_serial_number() + + self._message = gtk.Label(lbl_txt) + self._message.modify_fg(gtk.STATE_NORMAL, + style.COLOR_WHITE.get_gdk_color()) + self._message.set_line_wrap(True) + self._vbox.pack_start(self._message, True) + self._message.show() + + + vbox = gtk.VBox(False, 5) + vbox.show() + hbox = gtk.HBox(True, 3) + hbox.show() + + valign = gtk.Alignment(0, 1, 0, 0) + valign.show() + vbox.pack_start(valign) + + self._accept = gtk.Button() + self._accept.set_label(_('Accept')) + self._accept.show() + self._accept.connect('clicked', self.__accept_cb) + + self._show_journal = gtk.Button() + self._show_journal.set_label(_('Close')) + self._show_journal.show() + self._show_journal.connect('clicked', self.__show_journal_cb) + + self._restart = gtk.Button() + self._restart.set_label(_('Restart')) + self._restart.hide() + self._restart.connect('clicked', self.__restart_cb) + + hbox.add(self._accept) + hbox.add(self._show_journal) + hbox.add(self._restart) + + halign = gtk.Alignment(1, 0, 0, 0) + halign.show() + halign.add(hbox) + + vbox.pack_start(halign, False, False, 3) + + self._vbox.add(vbox) + + self._progress_bar = gtk.ProgressBar(adjustment=None) + + self.add(self._main_view) + self._main_view.show() + + self.connect("realize", self.__realize_cb) + + self._process_management = ProcessManagement() + self._process_management.connect('process-management-running', self._set_update_log) + self._process_management.connect('process-management-started', self._set_status_started) + self._process_management.connect('process-management-finished', self._set_status_finished) + self._process_management.connect('process-management-failed', self._set_status_failed) + + def __realize_cb(self, widget): + self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) + self.window.set_accept_focus(True) + + def __show_journal_cb(self, button): + self.destroy() + + def __accept_cb(self, *args): + if ((not self._mount_path == "") and (not self._mount_path == None)): + if self._isValidType(self._type_ps): + if self._type_ps == 'backup': + self._process_management.do_process([PATH_BACKUP, self._mount_path, self._get_serial_number()]) + elif self._type_ps == 'restore': + self._process_management.do_process([PATH_RESTORE, self._mount_path, self._get_serial_number()]) + + def _set_status_started(self, model, data=None): + self._message.set_text(_("Is running, Please wait")) + self._accept.hide() + self._show_journal.hide() + self._showProgress() + + def _set_update_log(self, model, data): + pass + + def _set_status_finished(self, model, data=None): + self._message.set_text(_("It is done, please restart sugar")) + self._progress_bar.hide() + self._restart.show() + + def _set_status_failed(self, model, data=None): + logging.error(data) + self._showMsgError(data) + + def __restart_cb(self, *args): + session_manager = get_session_manager() + session_manager.logout() + + def _showProgress(self): + self._progress_bar.set_fraction(0.0) + self._progress_bar.show() + self._vbox.add(self._progress_bar) + if (self._progressBarHandler == None): + self._progressBarHandler = gobject.timeout_add(1000, self._timerProgressBar) + + def _timerProgressBar(self): + self._progress_bar.pulse() + return True + + def _showMsgError(self, msg): + self._title.set_markup('%s' % _("Error")) + self._message.set_text(msg) + self._show_journal.show() + self._progress_bar.hide() + + def _isValidType(self, type_ps): + return (type_ps == 'backup') | (type_ps == 'restore') + + def _get_serial_number(self): + serial_no = self._read_file('/ofw/serial-number') + if serial_no is None: + serial_no = self._get_nick() + return serial_no + + def _read_file(self, path): + if os.access(path, os.R_OK) == 0: + return None + + fd = open(path, 'r') + value = fd.read() + fd.close() + if value: + value = value.strip('\n') + return value + else: + logging.error('No information in file or directory: %s' % path) + return None + + def _get_nick(self): + client = gconf.client_get_default() + return client.get_string("/desktop/sugar/user/nick") diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am index e9f0700..a4f89a3 100644 --- a/src/jarabe/model/Makefile.am +++ b/src/jarabe/model/Makefile.am @@ -15,4 +15,5 @@ sugar_PYTHON = \ shell.py \ screen.py \ session.py \ - sound.py + sound.py \ + processmanagement.py diff --git a/src/jarabe/model/processmanagement.py b/src/jarabe/model/processmanagement.py new file mode 100644 index 0000000..d28ad64 --- /dev/null +++ b/src/jarabe/model/processmanagement.py @@ -0,0 +1,88 @@ +# Copyright (C) 2010 Paraguay Educa, Martin Abente, Bernie Innocenti +# Copyright (C) 2010, Plan Ceibal <<a href="mailto:comunidad@plan.ceibal.edu.uy">comunidad@plan.ceibal.edu.uy</a>> +# +# 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 St, Fifth Floor, Boston, MA 02110-1301 USA + +import os +import gobject +import glib +import gio + +from gettext import gettext as _ + +BYTES_TO_READ = 100 + +class ProcessManagement(gobject.GObject): + + __gtype_name__ = 'ProcessManagement' + + __gsignals__ = { + 'process-management-running' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([str])), + 'process-management-started' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])), + 'process-management-finished' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])), + 'process-management-failed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([str])) + } + + def __init__(self): + gobject.GObject.__init__(self) + self._running = False + + def do_process(self, cmd): + self._run_cmd_async(cmd) + + def _report_process_status(self, stream, result): + data = stream.read_finish(result) + + if len(data): + self.emit('process-management-running', data) + stream.read_async(BYTES_TO_READ, self._report_process_status) + + def _report_process_error(self, stream, result, concat_err=''): + data = stream.read_finish(result) + concat_err = concat_err + data + + if len(data) == 0: + self.emit('process-management-failed', concat_err) + else: + stream.read_async(BYTES_TO_READ, self._report_process_error, user_data=concat_err) + + def _notify_error(self, stderr): + stdin_stream = gio.unix.InputStream(stderr, True) + stdin_stream.read_async(BYTES_TO_READ, self._report_process_error) + + def _notify_process_status(self, stdout): + stdin_stream = gio.unix.InputStream(stdout, True) + stdin_stream.read_async(BYTES_TO_READ, self._report_process_status) + + def _run_cmd_async(self, cmd): + if self._running == False: + try: + pid, stdin, stdout, stderr = glib.spawn_async(cmd, flags=glib.SPAWN_DO_NOT_REAP_CHILD, standard_output=True, standard_error=True) + gobject.child_watch_add(pid, _handle_process_end, (self, stderr)) + except Exception: + self.emit('process-management-failed', _("Error - Call process: ") + str(cmd)) + else: + self._notify_process_status(stdout) + self._running = True + self.emit('process-management-started') + +def _handle_process_end(pid, condition, (myself, stderr)): + myself._running = False + + if os.WIFEXITED(condition) and\ + os.WEXITSTATUS(condition) == 0: + myself.emit('process-management-finished') + else: + myself._notify_error(stderr) -- 1.6.2.5 From c68f3f55bebc332643ee5d0c282fa29851cbd6a5 Mon Sep 17 00:00:00 2001 From: Esteban Arias <<a href="mailto:earias@plan.ceibal.edu.uy">earias@plan.ceibal.edu.uy</a>> Date: Wed, 2 Jun 2010 12:50:36 -0300 Subject: [PATCH] Traslate Organization: Plan Ceibal --- po/es.po | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/po/es.po b/po/es.po index 587608f..0e138a4 100644 --- a/po/es.po +++ b/po/es.po @@ -1275,6 +1275,45 @@ msgstr "Fuente del paquete de la actividad" msgid "View source: %r" msgstr "Ver código fuente: %r" +#: ../src/jarabe/journal/volumestoolbar.py:196 +msgid "Journal Backup" +msgstr "Respaldar Diario" + +#: ../src/jarabe/journal/volumestoolbar.py:208 +msgid "Journal Restore" +msgstr "Restaurar Diario" + +#: ../src/jarabe/journal/backup.py:84 +msgid "backup" +msgstr "respaldar" + +#: ../src/jarabe/journal/backup.py:84 +msgid "restore" +msgstr "restaurar" + +#: ../src/jarabe/journal/backup.py:89 +msgid "" +"Close all activities and do not remove the external device during the process. \n\n" +"To make the backup of the Journal, a restart is required. \n\n" +"The backup can only be restore from this computer" +msgstr "" +"Cierre todas las actividades y no extraiga el dispositivo externo durante el proceso. \n\n" +"Para realizar el respaldo del Diario, se requiere reiniciar. \n\n" +"El resplado sólo podrá ser recuperado desde este equipo " + +#: ../src/jarabe/journal/backup.py:94 +msgid "" +"The content you restore will overwrite the current contents of the Journal. \n\n" +"Do not remove the external device during the process. \n" +"To implement the restoration of the Journal, a restart is required. \n\n" +"It will restore the backup done for this computer " +msgstr "" +"El contenido que restaurará va a sobrescribir el contenido acutal del Diario. \n\n" +"No extraiga el dispositivo externo durante el proceso. \n" +"Para aplicar la restauración del Diario, se requiere reiniciar. \n\n" +"Se restaurará el respado realizado para este equipo " + + #~ msgid "Cannot obtain data needed for registration." #~ msgstr "No se puede obtener datos necesarios para el registro" -- 1.6.2.5 -- Esteban Arias Plan Ceibal - Área Técnica Avda. Italia 6201 Montevideo - Uruguay. Tel.: 601.57.73 Interno 2228 E-mail : <a href="mailto:earias@plan.ceibal.edu.uy" target="_blank">earias@plan.ceibal.edu.uy</a>