From 9debafde0382088b9c090bf0c430c186b15194a3 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 21 Dec 2018 18:15:43 +0100 Subject: [PATCH] Remove Hildon support and Masstransit application An unfortunate commit. I am not aware of anyone still using a N900 or similar. The Hildon library is not maintained anymore. Blame Sephen Elop. --- contrib/fork.py | 1 - desktop/masstransit.desktop | 10 - icons/masstransit.png | Bin 9752 -> 0 bytes man/masstransit.1 | 114 ------- scripts/masstransit | 28 -- setup.py | 21 +- weboob/applications/masstransit/__init__.py | 23 -- .../applications/masstransit/masstransit.py | 289 ------------------ 8 files changed, 1 insertion(+), 485 deletions(-) delete mode 100644 desktop/masstransit.desktop delete mode 100644 icons/masstransit.png delete mode 100644 man/masstransit.1 delete mode 100755 scripts/masstransit delete mode 100644 weboob/applications/masstransit/__init__.py delete mode 100644 weboob/applications/masstransit/masstransit.py diff --git a/contrib/fork.py b/contrib/fork.py index e828f22a6f..39e02e66e9 100755 --- a/contrib/fork.py +++ b/contrib/fork.py @@ -27,7 +27,6 @@ ('geolooc', 'geolooc'), ('handjoob', 'handjisou'), ('havedate', 'havedate'), - ('masstransit', 'masstransit'), ('monboob', 'monbisou'), ('parceloob', 'parcelisou'), ('pastoob', 'pastisou'), diff --git a/desktop/masstransit.desktop b/desktop/masstransit.desktop deleted file mode 100644 index df8458c4a1..0000000000 --- a/desktop/masstransit.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Masstransit -Comment=Search for train stations and departure times -Exec=masstransit -Icon=masstransit -Terminal=false -Type=Application -StartupNotify=true -Categories=Network;GTK; -Keywords=departures;train;stations;timetable;travel; diff --git a/icons/masstransit.png b/icons/masstransit.png deleted file mode 100644 index 47f8271376910abad7af64e3d033de1b02c7684d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9752 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 -Test if object.field is greater than the value. If object.field is date, return true if value is before that object.field. -.TP -< -Test if object.field is less than the value. If object.field is date, return true if value is after that object.field. -.TP -| -This operator is available only for string fields. It works like the Unix standard \fBgrep\fR command, and returns True if the pattern specified in the value is in object.field. -.SS Expression combination -.LP -You can make a expression combinations with the keywords \fB" AND "\fR, \fB" OR "\fR an \fB" LIMIT "\fR. -.LP -The \fBLIMIT\fR keyword can be used to limit the number of items upon which running the expression. \fBLIMIT\fR can only be placed at the end of the expression followed by the number of elements you want. -.SS Examples: -.nf -.B boobank ls \-\-condition 'label=Livret A' -.fi -Display only the "Livret A" account. -.PP -.nf -.B boobank ls \-\-condition 'balance>10000' -.fi -Display accounts with a lot of money. -.PP -.nf -.B boobank history account@backend \-\-condition 'label|rewe' -.fi -Get transactions containing "rewe". -.PP -.nf -.B boobank history account@backend \-\-condition 'date>2013\-12\-01 AND date<2013\-12\-09' -.fi -Get transactions betweens the 2th December and 8th December 2013. -.PP -.nf -.B boobank history account@backend \-\-condition 'date>2013\-12\-01 LIMIT 10' -.fi -Get transactions after the 2th December in the last 10 transactions - -.SH COPYRIGHT -Copyright(C) 2010-2017 Julien Hébert -.LP -For full copyright information see the COPYING file in the weboob package. -.LP -.RE -.SH FILES -"~/.config/weboob/backends" - -.SH SEE ALSO -Home page: http://weboob.org/applications/masstransit diff --git a/scripts/masstransit b/scripts/masstransit deleted file mode 100755 index 4a67d147a7..0000000000 --- a/scripts/masstransit +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai - -# Copyright(C) 2010-2011 Julien Hébert -# -# This file is part of weboob. -# -# weboob is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# weboob 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with weboob. If not, see . - - -from __future__ import absolute_import -from weboob.applications.masstransit import Masstransit - - -if __name__ == '__main__': - Masstransit.run() diff --git a/setup.py b/setup.py index c3fec85c31..51ee9b56ba 100755 --- a/setup.py +++ b/setup.py @@ -63,7 +63,6 @@ def install_weboob(): scripts = set(os.listdir('scripts')) packages = set(find_packages(exclude=['modules', 'modules.*'])) - hildon_scripts = set(('masstransit',)) qt_scripts = set(('qboobmsg', 'qhavedate', 'qgalleroob', @@ -76,16 +75,11 @@ def install_weboob(): 'qbooblyrics', 'qhandjoob')) - if not options.hildon: - scripts = scripts - hildon_scripts if options.qt: build_qt() else: scripts = scripts - qt_scripts - hildon_packages = set(( - 'weboob.applications.masstransit', - )) qt_packages = set(( 'weboob.applications.qboobmsg', 'weboob.applications.qboobmsg.ui', @@ -111,8 +105,6 @@ def install_weboob(): 'weboob.applications.qgalleroob.ui', )) - if not options.hildon: - packages = packages - hildon_packages if not options.qt: packages = packages - qt_packages @@ -187,20 +179,17 @@ def install_weboob(): class Options(object): - hildon = False qt = False xdg = True deps = True + options = Options() if os.getenv('WEBOOB_SETUP'): args = os.getenv('WEBOOB_SETUP').split() else: args = sys.argv[1:] -if '--hildon' in args and '--no-hildon' in args: - print('--hildon and --no-hildon options are incompatible', file=sys.stderr) - sys.exit(1) if '--qt' in args and '--no-qt' in args: print('--qt and --no-qt options are incompatible', file=sys.stderr) sys.exit(1) @@ -208,14 +197,6 @@ class Options(object): print('--xdg and --no-xdg options are incompatible', file=sys.stderr) sys.exit(1) -if '--hildon' in args or os.environ.get('HILDON') == 'true': - options.hildon = True - if '--hildon' in args: - args.remove('--hildon') -elif '--no-hildon' in args: - options.hildon = False - args.remove('--no-hildon') - if '--qt' in args: options.qt = True args.remove('--qt') diff --git a/weboob/applications/masstransit/__init__.py b/weboob/applications/masstransit/__init__.py deleted file mode 100644 index 9d07fccb20..0000000000 --- a/weboob/applications/masstransit/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright(C) 2010-2011 Romain Bignon -# -# This file is part of weboob. -# -# weboob is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# weboob 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with weboob. If not, see . - - -from .masstransit import Masstransit - -__all__ = ['Masstransit'] diff --git a/weboob/applications/masstransit/masstransit.py b/weboob/applications/masstransit/masstransit.py deleted file mode 100644 index 67f0f7c0ac..0000000000 --- a/weboob/applications/masstransit/masstransit.py +++ /dev/null @@ -1,289 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright(C) 2010-2011 Julien Hébert -# -# This file is part of weboob. -# -# weboob is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# weboob 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with weboob. If not, see . - - -from weboob.capabilities.travel import CapTravel -from weboob.tools.application.base import Application -from logging import warning - -import gtk - - -class FakeConic(object): - STATUS_CONNECTED = None - STATUS_DISCONNECTED = None - CONNECT_FLAG_NONE = None - - def Connection(self): - raise NotImplementedError() -try: - import hildon -except ImportError: - toolkit = gtk -else: - toolkit = hildon - -try: - import conic -except ImportError: - warning("conic is not found") - conic = FakeConic() - - -from logging import debug - - -__all__ = ['Masstransit'] - - -class MasstransitHildon(object): - "hildon interface" - - def connect_event(self, connection, event=None, c=None, d=None): - debug("DBUS-DEBUG a: %s, b:%s, c:%s,d: %s" % (connection, event, c, d)) - status = event.get_status() - if status == conic.STATUS_CONNECTED: - self.connected = True - if not self.touch_selector_entry_filled: - debug("connected, now fill") - self.fill_touch_selector_entry() - if self.refresh_in_progress: - self.refresh() - elif status == conic.STATUS_DISCONNECTED: - self.connected = False - - def __init__(self, weboob): - self.touch_selector_entry_filled = False - self.refresh_in_progress = False - self.connected = False - self.weboob = weboob - try: - self.connection = conic.Connection() - self.connection.connect("connection-event", self.connect_event) - self.connection.set_property("automatic-connection-events", True) - self.connection.request_connection(conic.CONNECT_FLAG_NONE) - except NotImplementedError: - pass - - horizontal_box = gtk.HBox() - self.main_window = toolkit.Window() - try: - self.refresh_button = toolkit.Button( - gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, - hildon.BUTTON_ARRANGEMENT_HORIZONTAL, - "Actualiser" - ) - self.retour_button = hildon.Button( - gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, - hildon.BUTTON_ARRANGEMENT_HORIZONTAL, - "Retour" - ) - self.combo_source = hildon.TouchSelectorEntry(text=True) - self.combo_dest = hildon.TouchSelectorEntry(text=True) - self.picker_button_source = hildon.PickerButton( - gtk.HILDON_SIZE_AUTO, - hildon.BUTTON_ARRANGEMENT_VERTICAL) - - self.picker_button_dest = hildon.PickerButton( - gtk.HILDON_SIZE_AUTO, - hildon.BUTTON_ARRANGEMENT_VERTICAL - ) - self.picker_button_source.set_sensitive(False) - self.picker_button_dest.set_sensitive(False) - - self.picker_button_source.set_title("Gare de Depart") - self.picker_button_dest.set_title("Gare d'arrivee") - - self.picker_button_source.set_selector(self.combo_source) - self.picker_button_dest.set_selector(self.combo_dest) - horizontal_box.pack_start(self.picker_button_source) - horizontal_box.pack_start(self.picker_button_dest) - - except AttributeError: - self.refresh_button = gtk.Button("Actualiser") - self.retour_button = gtk.Button("Retour") - self.combo_source = gtk.combo_box_entry_new_text() - self.combo_dest = gtk.combo_box_entry_new_text() - horizontal_box.pack_start(self.combo_source) - horizontal_box.pack_start(self.combo_dest) - - self.main_window.set_title("Horaires des Prochains Trains") - self.main_window.connect("destroy", self.on_main_window_destroy) - - self.refresh_button.connect("clicked", self.on_refresh_button_clicked) - - self.retour_button.set_sensitive(False) - self.retour_button.connect("clicked", self.on_retour_button_clicked) - - self.treestore = gtk.TreeStore(str, str, str, str, str) - treeview = gtk.TreeView(self.treestore) - - treeview.append_column( - gtk.TreeViewColumn( - 'Train', - gtk.CellRendererText(), - text=0 - )) - - treeview.append_column( - gtk.TreeViewColumn( - 'Horaire', - gtk.CellRendererText(), - text=1 - )) - - treeview.append_column( - gtk.TreeViewColumn( - 'Destination', - gtk.CellRendererText(), - text=2 - )) - treeview.append_column( - gtk.TreeViewColumn( - 'Voie', - gtk.CellRendererText(), - text=3 - )) - treeview.append_column( - gtk.TreeViewColumn( - 'Information', - gtk.CellRendererText(), - text=4 - )) - - vertical_box = gtk.VBox() - vertical_box.pack_start(horizontal_box) - horizontal_box.pack_start(self.retour_button) - vertical_box.pack_start(treeview) - vertical_box.pack_start(self.refresh_button) - - self.main_window.add(vertical_box) - self.main_window.show_all() - self.fill_touch_selector_entry() - - if toolkit != gtk: - self.picker_button_source.connect("value-changed", - self.check_station_input, - self.picker_button_source) - self.picker_button_dest.connect("value-changed", - self.check_station_input, - self.picker_button_dest) - - def fill_touch_selector_entry(self): - liste = [] - - for backend in self.weboob.iter_backends(): - for station in backend.iter_station_search(""): - liste.append(station.name.capitalize()) - - liste.sort() - - for station in liste: - self.combo_source.append_text(station) - self.combo_dest.append_text(station) - - self.touch_selector_entry_filled = True - if toolkit != gtk: - self.picker_button_source.set_sensitive(True) - - def on_main_window_destroy(self, widget): - "exit application at the window close" - gtk.main_quit() - - def on_main_window_show(self, param): - self.fill_touch_selector_entry() - - def on_retour_button_clicked(self, widget): - "the button is clicked" - debug("on_retour_button_clicked") - self.refresh_in_progress = True - col_source = self.combo_source.get_active(0) - col_dest = self.combo_dest.get_active(0) - self.combo_source.set_active(0, col_dest) - self.combo_dest.set_active(0, col_source) - self.refresh() - - def on_refresh_button_clicked(self, widget): - "the refresh button is clicked" - debug("on_refresh_button_clicked") - self.refresh_in_progress = True - try: - self.connection.request_connection(conic.CONNECT_FLAG_NONE) - except AttributeError: - if isinstance(conic, FakeConic): - self.refresh() - else: - raise - - def check_station_input(self, widget, user_data): - if self.combo_source.get_current_text() is None: - self.picker_button_dest.set_sensitive(False) - self.refresh_button.set_sensitive(False) - self.retour_button.set_sensitive(False) - else: - self.picker_button_dest.set_sensitive(True) - if self.combo_dest.get_current_text() is None: - self.refresh_button.set_sensitive(False) - self.retour_button.set_sensitive(False) - else: - self.refresh_button.set_sensitive(True) - self.retour_button.set_sensitive(True) - - def refresh(self): - "update departures" - banner = hildon.hildon_banner_show_information(self.main_window, "", "Chargement en cours") - banner.set_timeout(10000) - hildon.hildon_gtk_window_set_progress_indicator(self.main_window, 1) - self.treestore.clear() - try: - source_text = self.combo_source.get_current_text() - dest_text = self.combo_dest.get_current_text() - except AttributeError: - source_text = self.combo_source.child.get_text() - dest_text = self.combo_dest.child.get_text() - for backend in self.weboob.iter_backends(): - for station in backend.iter_station_search(source_text): - for arrival in \ - backend.iter_station_search(dest_text): - for departure in \ - backend.iter_station_departures(station.id, arrival.id): - self.treestore.append(None, - [departure.type, - departure.time, - departure.arrival_station, - departure.plateform, - departure.information]) - - self.refresh_in_progress = False - banner.set_timeout(1) - hildon.hildon_gtk_window_set_progress_indicator(self.main_window, 0) - - -class Masstransit(Application): - "Application Class" - APPNAME = 'masstransit' - VERSION = '1.4' - COPYRIGHT = 'Copyright(C) 2010-YEAR Julien Hébert' - DESCRIPTION = "Maemo application allowing to search for train stations and get departure times." - SHORT_DESCRIPTION = "search for train stations and departures" - - def main(self, argv): - self.load_backends(CapTravel) - MasstransitHildon(self.weboob) - gtk.main() -- GitLab