From 2ed54f5fd819b5ec1abae78041c7e4eb78f8dd61 Mon Sep 17 00:00:00 2001 From: Mark Washeim Date: Fri, 10 Jun 2022 12:43:32 +0200 Subject: [PATCH] New swiss backend, the changes from https://github.com/smurfy/fahrplan/pull/289/ --- fahrplan2.pro | 42 +++---- src/fahrplan_backend_manager.cpp | 1 + src/fahrplan_parser_thread.cpp | 3 + src/fahrplan_parser_thread.h | 1 + translations/fahrplan_de.ts | 189 +++++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+), 20 deletions(-) diff --git a/fahrplan2.pro b/fahrplan2.pro index 47e1a66..e0ca060 100644 --- a/fahrplan2.pro +++ b/fahrplan2.pro @@ -102,26 +102,21 @@ INCLUDEPATH += src unix:!symbian: LIBS += -lz HEADERS += \ - src/parser/parser_hafasxml.h \ - src/parser/parser_abstract.h \ - src/parser/parser_definitions.h \ - src/parser/parser_xmlrejseplanendk.h \ - src/parser/parser_xmloebbat.h \ - src/parser/parser_xmlvasttrafikse.h \ src/fahrplan.h \ src/fahrplan_backend_manager.h \ - src/parser/parser_mobilebahnde.h \ src/calendarthreadwrapper.h \ src/calendar_sfos_wrapper.h \ - src/parser/parser_xmlnri.h \ - src/parser/parser_hafasbinary.h \ src/fahrplan_parser_thread.h \ src/fahrplan_calendar_manager.h \ + src/models/backends.h \ src/models/stationslistmodel.h \ src/models/favorites.h \ src/models/stationsearchresults.h \ src/models/timetable.h \ src/models/trainrestrictions.h \ + src/parser/parser_xmlnri.h \ + src/parser/parser_hafasbinary.h \ + src/parser/parser_mobilebahnde.h \ src/parser/parser_ptvvicgovau.h \ src/parser/parser_efa.h \ src/parser/parser_ireland_efa.h \ @@ -132,29 +127,30 @@ HEADERS += \ src/parser/parser_resrobot.h \ src/parser/parser_finland_matka.h \ src/parser/parser_vrr_efa.h \ - src/models/backends.h + src/parser/parser_hafasxml.h \ + src/parser/parser_abstract.h \ + src/parser/parser_definitions.h \ + src/parser/parser_xmlrejseplanendk.h \ + src/parser/parser_xmloebbat.h \ + src/parser/parser_xmlvasttrafikse.h \ + src/parser/parser_search_ch.h SOURCES += src/main.cpp \ - src/parser/parser_hafasxml.cpp \ - src/parser/parser_abstract.cpp \ - src/parser/parser_definitions.cpp \ - src/parser/parser_xmlrejseplanendk.cpp \ - src/parser/parser_xmloebbat.cpp \ - src/parser/parser_xmlvasttrafikse.cpp \ src/fahrplan.cpp \ src/fahrplan_backend_manager.cpp \ - src/parser/parser_mobilebahnde.cpp \ src/calendarthreadwrapper.cpp \ src/calendar_sfos_wrapper.cpp \ - src/parser/parser_xmlnri.cpp \ - src/parser/parser_hafasbinary.cpp \ src/fahrplan_parser_thread.cpp \ src/fahrplan_calendar_manager.cpp \ + src/models/backends.cpp src/models/stationslistmodel.cpp \ src/models/favorites.cpp \ src/models/stationsearchresults.cpp \ src/models/timetable.cpp \ src/models/trainrestrictions.cpp \ + src/parser/parser_mobilebahnde.cpp \ + src/parser/parser_xmlnri.cpp \ + src/parser/parser_hafasbinary.cpp \ src/parser/parser_ptvvicgovau.cpp \ src/parser/parser_efa.cpp \ src/parser/parser_ireland_efa.cpp \ @@ -165,7 +161,13 @@ SOURCES += src/main.cpp \ src/parser/parser_resrobot.cpp \ src/parser/parser_finland_matka.cpp \ src/parser/parser_vrr_efa.cpp \ - src/models/backends.cpp + src/parser/parser_hafasxml.cpp \ + src/parser/parser_abstract.cpp \ + src/parser/parser_definitions.cpp \ + src/parser/parser_xmlrejseplanendk.cpp \ + src/parser/parser_xmloebbat.cpp \ + src/parser/parser_xmlvasttrafikse.cpp \ + src/parser/parser_search_ch.cpp \ LIBS += $$PWD/3rdparty/gauss-kruger-cpp/gausskruger.cpp diff --git a/src/fahrplan_backend_manager.cpp b/src/fahrplan_backend_manager.cpp index 863e83e..890c700 100644 --- a/src/fahrplan_backend_manager.cpp +++ b/src/fahrplan_backend_manager.cpp @@ -43,6 +43,7 @@ QStringList FahrplanBackendManager::getParserList() result.append(ParserResRobot::getName()); result.append(ParserFinlandMatka::getName()); result.append(ParserVRREFA::getName()); + result.append(ParserSearchCH::getName()); // Make sure the index is in bounds if (currentParserIndex > (result.count() - 1) || currentParserIndex < 0) { diff --git a/src/fahrplan_parser_thread.cpp b/src/fahrplan_parser_thread.cpp index 863f50b..bbdaafb 100644 --- a/src/fahrplan_parser_thread.cpp +++ b/src/fahrplan_parser_thread.cpp @@ -164,6 +164,9 @@ void FahrplanParserThread::run() case 13: m_parser = new ParserVRREFA(); break; + case 14: + m_parser = new ParserSearchCH(); + break; } m_name = m_parser->name(); diff --git a/src/fahrplan_parser_thread.h b/src/fahrplan_parser_thread.h index 779deb8..29300a0 100644 --- a/src/fahrplan_parser_thread.h +++ b/src/fahrplan_parser_thread.h @@ -38,6 +38,7 @@ #include "parser/parser_resrobot.h" #include "parser/parser_finland_matka.h" #include "parser/parser_vrr_efa.h" +#include "parser/parser_search_ch.h" class FahrplanParserThread : public QThread { diff --git a/translations/fahrplan_de.ts b/translations/fahrplan_de.ts index e622bc4..52a1699 100644 --- a/translations/fahrplan_de.ts +++ b/translations/fahrplan_de.ts @@ -2367,6 +2367,195 @@ Von der Fahrplan-App hinzugefügt. Bitte überprüfen Sie diese Informationen vo Salzburg + + ParserSearchCH + + + All + Alle + + + + Train + Zug + + + + Tram + Tram + + + + + Ship + Schiff + + + + + Bus + Bus + + + + Cableway + Seilbahn + + + + + Train station + Bahnhof + + + + Tram stop + Tramhaltestelle + + + + Port + Hafen + + + + Bus stop + Bushaltestelle + + + + + Funicular + Standseilbahn + + + + + Gondola + Gondel + + + + + Cablecar + Seilbahn + + + + + + Cannot parse reply from the server + Kann Antwort vom Server nicht verarbeiten + + + + + + + + Bus %1 + Bus %1 + + + + + Tram %1 + Tram %1 + + + + Cancelled + Ausfall + + + + + Departure delayed: %1' + Abfahrtsverspätung: %1' + + + + + Track %1 + Gleis %1 + + + + Train cancelled + Zugausfall + + + + No journey details found. + Verbindungsdetails nicht gefunden. + + + + Switzerland + Schweiz + + + + parser_search_ch::JourneyConnection + + + Walk + Fussweg + + + + parser_search_ch::JourneySearchResult + + + Arrivals %1 + Ankünfte %1 + + + + Departures %1 + Abfahrten %1 + + + + ddd MMM d, HH:mm + ddd MMM d, HH:mm + + + + parser_search_ch::TrainTypeList + + + + Bus + Bus + + + + Tram + Tram + + + + Funi + Funi + + + + Gondola + Gondel + + + + Cableway + Seilbahn + + + + Ship + Schiff + + + ParserSydneyEFA