Ticket #12436: eitfixup-greek-2015-04-25.diff

diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp
index 66881c6..c486a6b 100644
--- a/mythtv/libs/libmythtv/eitfixup.cpp
+++ b/mythtv/libs/libmythtv/eitfixup.cpp
@@ -31,7 +31,7 @@ const QString longSeasEp = QString("\\(?(?:%1)?\\s*%2").arg(season, longEp);
 // Matches long seas/ep with surrounding parenthesis & trailing period
 // cap1 = season, cap2 = ep, cap3 = total
 const QString longContext = QString("\\(*%1\\s*\\)?\\s*\\.?").arg(longSeasEp);
-
+    
 // Matches 3/4, 3 of 4
 // cap1 = ep, cap2 = total
 const QString shortEp = "(\\d+)\\s*(?:/|of)\\s*(\\d+)";
@@ -133,7 +133,7 @@ EITFixUp::EITFixUp()
       m_RTLSubtitle4("^Thema.{0,5}:\\s([^\\.]+)\\.\\s*"),
       m_RTLSubtitle5("^'(.+)'\\.\\s*"),
       m_RTLEpisodeNo1("^(Folge\\s\\d{1,4})\\.*\\s*"),
-      m_RTLEpisodeNo2("^(\\d{1,2}\\/[IVX]+)\\.*\\s*"),
+      m_RTLEpisodeNo2("^(\\d{1,2grlongEp}\\/[IVX]+)\\.*\\s*"),
       m_fiRerun("\\ ?Uusinta[a-zA-Z\\ ]*\\.?"),
       m_fiRerun2("\\([Uu]\\)"),
       m_dePremiereInfos("([^.]+)?\\s?([0-9]{4})\\.\\s[0-9]+\\sMin\\.(?:\\sVon"
@@ -184,7 +184,51 @@ EITFixUp::EITFixUp()
       m_AUFreeviewSY("(.*) \\((.+)\\) \\(([12][0-9][0-9][0-9])\\)$"),
       m_AUFreeviewY("(.*) \\(([12][0-9][0-9][0-9])\\)$"),
       m_AUFreeviewYC("(.*) \\(([12][0-9][0-9][0-9])\\) \\((.+)\\)$"),
-      m_AUFreeviewSYC("(.*) \\((.+)\\) \\(([12][0-9][0-9][0-9])\\) \\((.+)\\)$")
+      m_AUFreeviewSYC("(.*) \\((.+)\\) \\(([12][0-9][0-9][0-9])\\) \\((.+)\\)$"),
+      m_grReplay("\\([ΕE]\\)"),
+      m_grDescriptionFinale("\\s*΀ελευταίο\\sΕπεισόΎιο\\.\\s*"),
+      m_grActors("(?:[Ππ]α[ιί]ζουΜ:|[ΜΌ]ε τους:|ΠρωταγωΜιστο[υύ]Îœ:|ΠρωταγωΜιστε[ιί]:?)(?:\\s+στο ρόλο(?: του| της)?\\s(?:\\w+\\s[οη]\\s))?([-\\w\\s']+(?:,[-\\w\\s']+)*)(?:κ\\.[αά])?(?:\\W?)"),
+      // cap(1) actors, just names
+      m_grFixnofullstopActors("(\\w\\s(ΠαίζουΜ:|ΠρωταγωΜ))"),
+      m_grFixnofullstopDirectors("((\\w\\s(ΣκηΜοΞ[εέ]))"),
+      m_grPeopleSeparator("(,\\s+)"),
+      m_grDirector("(?:ΣκηΜοΞεσία: |ΣκηΜοΞέτης: )(\\w+\\s\\w+\\s?)(?:\\W?)"),
+      m_grPres("(?:Παρουσ[ιί]αση:(?:\\b)*|Παρουσι[αά]ζ(?:ουΜ|ει)(?::|\\sο|\\sη)|Με τ(?:οΜ |ηΜ )(?:[\\s|:|ο|η])*(?:\\b)*)([-\\w\\s]+(?:,[-\\w\\s]+)*)(?:\\W?)"),
+      m_grYear("(?:\\W?)(?:\\s?παραγωγ[ηή]ς|\\s?-|,)\\s*([1-2]{1}[0-9]{3})(?:-\\d{1,4})?",Qt::CaseInsensitive),
+      m_grCountry("(?:\\W|\\b)(?:(ελληΜ|τουρκ|αΌερικ[αά]Îœ|γαλλ|αγγλ|βρεττ?αΜ|γερΌαΜ|ρωσσ?|ιταλ|ελβετ|σουηΎ|ισπαΜ|πορτογαλ|ΌεΟικ[αά]Îœ|κιΜ[εέ]ζικ|ιαπωΜ|καΜαΎ|βραζιλι[αά]Îœ)(ικ[ηή][ςσ]))",Qt::CaseInsensitive),
+      m_grlongEp("\\b(?:Επ.|επεισ[οό]Ύιο:?)\\s*(\\d+)(?:\\W?)",Qt::CaseInsensitive),
+      m_grSeason("(?:-\\s)?\\b((\\D{1,2})(?:')?|(\\d{1,2})(?:ος|ου)?)(?:\\sκ[υύ]κλο(?:[σς]|υ)){1}\\s?",Qt::CaseInsensitive),
+      m_grRealTitleinDescription("(?:^\\()([\\w\\s\\d\\D-]+)(?:\\))(?:\\s*)"),
+      // cap1 = real title
+      // cap0 = real title in parentheses.
+      m_grRealTitleinTitle("(?:\\()([\\w\\s\\d\\D-]+)(?:\\))(?:\\s*$)*"),
+      // cap1 = real title
+      // cap0 = real title in parentheses.
+      m_grNotPreviouslyShown("(?:\\b[Α1]['η]?\\s*(?:τηλεοπτικ[ηή]\\s*)?(?:Όετ[αά]Ύοση|προβολ[ηή]))(?:\\W?)"),
+      // Try to exctract Greek categories from keywords in description.
+      m_grEpisodeAsSubtitle("(?:^Επεισ[οό]Ύιο:\\s?)([\\w\\s-,']+)\\.(?:\\s)?"),
+      m_grCategFood("(?:\\W)?(?:εκποΌπ[ηή]\\W)?(ΓαστροΜοΌ[ιί]α[σς]?|Όαγειρικ[ηή][σς]?|chef|συΜταγ[εέηή]|Ύιατροφ|wine|ÎŒ[αά]γειρα[σς]?)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategDrama("(?:\\W)?(κοιΜωΜικ[ηήό]|ΎραΌατικ[ηή]|Ύρ[αά]Όα)(?:\\W)(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?",Qt::CaseInsensitive),
+      m_grCategComedy("(?:\\W)?(κωΌικ[ηήοό]|χιουΌοριστικ[ηήοό]|κωΌωΎ[ιί]α)(?:\\W)(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?",Qt::CaseInsensitive),
+      m_grCategChildren("(?:\\W)?(παιΎικ[ηήοό]|κιΜο[υύ]ÎŒ[εέ]Îœ(ωΜ|α)\\sσχ[εέ]ÎŽ[ιί](ωΜ|α))(?:\\W)(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?",Qt::CaseInsensitive),
+      m_grCategMystery("(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?(?:\\W)?(Όυστηρ[ιί]ου)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategFantasy("(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?(?:\\W)?(φαΜτασ[ιί]ας)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategHistory("(?:\\W)?(ιστορικ[ηήοό])(?:\\W)?(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?",Qt::CaseInsensitive),
+      m_grCategTeleMag("(?:\\W)?(εΜηΌερωτικ[ηή]|ψυχαγωγικ[ηή]|τηλεπεριοΎικ[οό]|Όαγκαζ[ιί]Μο)(?:\\W)?(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?",Qt::CaseInsensitive),
+      m_grCategTeleShop("(?:\\W)?(οΎηγ[οό][σς]?\\sαγορ[ωώ]Îœ|τηλεπ[ωώ]λ[ηή]σ|τηλεαγορ|τηλεΌ[αά]ρκετ|telemarket)(?:\\W)?(?:(?:εκποΌπ[ηή]|σειρ[αά]|ταιΜ[ιί]α)\\W)?",Qt::CaseInsensitive),
+      m_grCategGameShow("(?:\\W)?(τηλεπαιχΜ[ιί]Ύι|quiz)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategDocumentary("(?:\\W)?(Μτοκ[ιυ]ΌαΜτ[εέ]ρ)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategBiography("(?:\\W)?(βιογραφ[ιί]α|βιογραφικ[οό][σς]?)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategNews("(?:\\W)?(Ύελτ[ιί]ο\\W?|ειΎ[ηή]σε(ι[σς]|ωΜ))(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategSports("(?:\\W)?(champion|αΞλητικ[αάοόηή]|πρωτ[αά]ΞληΌα|ποΎ[οό]σφαιρο(ου)?|κολ[υύ]Όβηση|πατιΜ[αά]ζ|formula|Όπ[αά]σκετ|β[οό]λε[ιϊ])(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategMusic("(?:\\W)?(Όουσικ[οόηή]|eurovision|τραγο[υύ]Ύι)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategReality("(?:\\W)?(ρι[αά]λιτι|reality)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategReligion("(?:\\W)?(Ξρησκε[ιί]α|Ξρησκευτικ|Μα[οό][σς]?|Ξε[ιί]α λειτουργ[ιί]α)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategCulture("(?:\\W)?(τ[εέ]χΜ(η|ε[σς])|πολιτισΌ)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategNature("(?:\\W)?(φ[υύ]ση|περιβ[αά]λλο|κατασκευ|επιστ[ηή]ÎŒ(?!οΜικ[ηή]ς φαΜτασ[ιί]ας))(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategSciFi("(?:\\W)?(επιστ(.|ηΌοΜικ[ηή]ς)\\s?φαΜτασ[ιί]ας)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategHealth("(?:\\W)?(υγε[ιί]α|υγειιΜ|ιατρικ|Ύιατροφ)(?:\\W)?",Qt::CaseInsensitive),
+      m_grCategSpecial("(?:\\W)?(αφι[εέ]ρωΌα)(?:\\W)?",Qt::CaseInsensitive)
 {
 }
 
@@ -262,6 +306,15 @@ void EITFixUp::Fix(DBEventEIT &event) const
     if (kFixCategory & event.fixup)
         FixCategory(event);
 
+    if (kFixGreekSubtitle & event.fixup)
+        FixGreekSubtitle(event);
+
+    if (kFixGreekEIT & event.fixup)
+        FixGreekEIT(event);
+
+    if (kFixGreekCategories & event.fixup)
+        FixGreekCategories(event);
+
     if (event.fixup)
     {
         if (!event.title.isEmpty())
@@ -2099,6 +2152,7 @@ void EITFixUp::FixNRK_DVBT(DBEventEIT &event) const
 /** \fn EITFixUp::FixDK(DBEventEIT&) const
  *  \brief Use this to clean YouSee's DVB-C guide in Denmark.
  */
+
 void EITFixUp::FixDK(DBEventEIT &event) const
 {
     // Source: YouSee Rules of Operation v1.16
@@ -2290,3 +2344,403 @@ void EITFixUp::FixDK(DBEventEIT &event) const
     event.title       = event.title.trimmed();
     event.subtitle    = event.subtitle.trimmed();
 }
+
+// Movies the subtitle field into the description since it's just used
+// as more description field. All the sort-out will happen in the description
+// field. Also, sometimes the description is just a repeat of the title. If so,
+// we remove it. 
+void EITFixUp::FixGreekSubtitle(DBEventEIT &event) const
+{
+    if (event.title == event.description)
+    {
+        event.description = QString("");
+    }
+    if (!event.subtitle.isEmpty())
+    {
+        if (event.subtitle.trimmed().right(1) != ".'" )
+            event.subtitle = event.subtitle.trimmed() + ".";
+        event.description = event.subtitle.trimmed() + QString(" ") + event.description;
+        event.subtitle = QString("");
+    }
+}
+
+void EITFixUp::FixGreekEIT(DBEventEIT &event) const
+{
+    //Live show
+    int position;
+    QRegExp tmpRegEx;
+    position = event.title.indexOf("(Ζ)");
+    if (position != -1)
+    {
+        event.title = event.title.replace("(Ζ)", "");
+        event.description.prepend("ΖωΜταΜή ΜετάΎοση. ");
+    }
+
+    // Greek not previously Shown
+    position = event.title.indexOf(m_grNotPreviouslyShown);
+    if (position != -1)
+    {
+        event.previouslyshown = false;
+        event.title = event.title.replace(m_grNotPreviouslyShown.cap(0), "");
+    }
+
+    // Greek Replay (Ε)
+    // it might look redundant compared to previous check but at least it helps
+    // remove the (Ε) From the title.
+    tmpRegEx = m_grReplay;
+    if (event.title.indexOf(tmpRegEx) !=  -1)
+    {
+        event.previouslyshown = true;
+        event.title = event.title.replace(tmpRegEx, "");
+    }
+
+    tmpRegEx = m_grFixnofullstopActors;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        event.description.insert(position + 1, ".");
+    }
+
+    // If they forgot the "." at the end of the sentence before the actors/directors begin, let's insert it.
+    tmpRegEx = m_grFixnofullstopDirectors;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        event.description.insert(position + 1, ".");
+    }
+
+    // Find actors and director in description
+    // I am looking for actors first and then for directors/presenters because
+    // sometimes punctuation is missing and the "ΠαίζουΜ:" label is mistaken
+    // for a director's/presenter's surname (directors/presenters are shown
+    // before actors in the description field.). So removing the text after 
+    // adding the actors AND THEN looking for dir/pres helps to clear things up.
+    tmpRegEx = m_grActors;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        QString tmpActorsString = tmpRegEx.cap(1);
+        const QStringList actors =
+            tmpActorsString.split(m_grPeopleSeparator, QString::SkipEmptyParts);
+        QStringList::const_iterator it = actors.begin();
+        for (; it != actors.end(); ++it)
+        {
+            tmpActorsString = it->split(":").last().trimmed().
+                    remove(QRegExp("\\.$"));
+            if (tmpActorsString != "")
+                event.AddPerson(DBPerson::kActor, tmpActorsString);
+        }
+        event.description.replace(tmpRegEx.cap(0), "");
+    }
+    // Director
+    tmpRegEx = m_grDirector;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        QString tmpDirectorsString = tmpRegEx.cap(1);
+        const QStringList directors =
+            tmpDirectorsString.split(m_grPeopleSeparator, QString::SkipEmptyParts);
+        QStringList::const_iterator it = directors.begin();
+        for (; it != directors.end(); ++it)
+        {
+            tmpDirectorsString = it->split(":").last().trimmed().
+                    remove(QRegExp("\\.$"));
+            if (tmpDirectorsString != "")
+            {
+                event.AddPerson(DBPerson::kDirector, tmpDirectorsString);
+            }
+        }
+        event.description.replace(tmpRegEx.cap(0), "");
+    }
+
+/*
+
+    tmpRegEx = m_grDirector;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        // director is captured in cap(1).Due to sometimes miswritten data in
+        // eit, e.g no fullstop present(!) 
+        QString tmpDirectorsString = tmpRegEx.cap(1);
+        // look for actors in director string (lack of fullstop, etc)
+        tmpRegEx = m_grActors;
+        int actposition = tmpDirectorsString.indexOf(tmpRegEx);
+        if (actposition != -1)
+        {
+            tmpDirectorsString = tmpDirectorsString.replace(tmpRegEx,""); 
+        }
+        const QStringList directors =
+            tmpDirectorsString.split(m_grPeopleSeparator, QString::SkipEmptyParts);
+        QStringList::const_iterator it = directors.begin();
+        for (; it != directors.end(); ++it)
+        {
+            tmpDirectorsString = it->split(":").last().trimmed().
+                    remove(QRegExp("\\.$"));
+            if (tmpDirectorsString != "")
+                event.AddPerson(DBPerson::kDirector, tmpDirectorsString);
+            
+        }
+        event.description.replace(tmpRegEx.cap(0), "");
+       // directorPresent = true;
+    }
+*/
+    //Try to find presenter
+    tmpRegEx = m_grPres;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        QString tmpPresentersString = tmpRegEx.cap(1);
+        const QStringList presenters =
+            tmpPresentersString.split(m_grPeopleSeparator, QString::SkipEmptyParts);
+        QStringList::const_iterator it = presenters.begin();
+        for (; it != presenters.end(); ++it)
+        {
+            tmpPresentersString = it->split(":").last().trimmed().
+                    remove(QRegExp("\\.$"));
+            if (tmpPresentersString != "")
+            {
+                event.AddPerson(DBPerson::kPresenter, tmpPresentersString);
+            }
+        }
+        event.description.replace(tmpRegEx.cap(0), "");
+    }    
+
+    //find year e.g Παραγωγής 1966 ή Ν΀ΟΚΙΜΑΝ΀ΕΡ - 1998 Κατάλληλο για όλους
+    // Used in Private channels (not 'secret', jut not owned by Government!)
+    tmpRegEx = m_grYear;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        bool ok;
+        uint y = tmpRegEx.cap(1).toUInt(&ok);
+        if (ok)
+            event.originalairdate = QDate(y, 1, 1);
+            event.description.replace(tmpRegEx, "");
+    }
+    // Remove white spaces
+    event.description = event.description.trimmed();
+    event.title       = event.title.trimmed();
+    event.subtitle    = event.subtitle.trimmed();
+
+    //find country of origin and remove it from description. 
+    tmpRegEx = m_grCountry;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        event.description.replace(tmpRegEx, "");
+    }
+
+    // Work out the season and episode numbers (if any)
+    // Matching pattern "Επεισ[όο]Ύιο:?|Επ 3 από 14|3/14" etc
+    bool    series  = false;
+    int position1;
+    int position2;
+    QRegExp tmpSeries = m_grSeason;
+    // cap(2) is the season for ΑΒΓΔ
+    // cap(3) is the season for 1234
+    if ((position1 = tmpSeries.indexIn(event.title)) != -1
+            || (position2 = tmpSeries.indexIn(event.description)) != -1)
+    {
+        if (!tmpSeries.cap(2).isEmpty()) // we found a letter representing a number
+        {
+            //sometimes Nat. TV writes numbers as letters, i.e Α=1, Β=2, Γ=3, etc
+            //must convert them to numbers.
+            int tmpinteger = tmpSeries.cap(2).toUInt();
+            if (tmpinteger < 1)
+            {
+                if (tmpSeries.cap(2) == "Σ΀") // 6, don't ask!
+                    event.season = 6;
+                else
+                {
+                    QString LettToNumber = "0ΑΒΓΔΕ6ΖΗΘΙΚΛΜΝ";
+                    tmpinteger = LettToNumber.indexOf(tmpSeries.cap(2));
+                    if (tmpinteger != -1)
+                        event.season = tmpinteger;
+                }
+            }
+        }
+        else if (!tmpSeries.cap(3).isEmpty()) //number
+        {
+            event.season = tmpSeries.cap(3).toUInt();
+        }
+        series = true;
+        if (position1 != -1)
+            event.title.replace(tmpSeries.cap(0),"");
+        if (position2 != -1)
+            event.description.replace(tmpSeries.cap(0),"");
+    }
+
+    QRegExp tmpEpisode = m_grlongEp;
+    //tmpEpisode.setMinimal(true);
+    // cap(1) is the Episode No.
+    if ((position1 = tmpEpisode.indexIn(event.title)) != -1
+            || (position2 = tmpEpisode.indexIn(event.description)) != -1)
+    {
+        if (!tmpEpisode.cap(1).isEmpty())
+        {
+            event.episode = tmpEpisode.cap(1).toUInt();
+            series = true;
+            if (position1 != -1)
+                event.title.replace(tmpEpisode.cap(0),"");
+            if (position2 != -1)
+                event.description.replace(tmpEpisode.cap(0),"");
+        }
+    }
+
+    // Sometimes the real (mostly English) title of a movie or series is
+    // enclosed in parentheses in the event title, subtitle or description.
+    // Since the subtitle has been moved to the description field by
+    // EITFixUp::FixGreekSubtitle, I will search for it only in the description.
+    // It will replace the translated one to get better chances of metadata
+    // retrieval. The old title will be moved in the description.
+    QRegExp tmptitle = m_grRealTitleinDescription;
+    tmptitle.setMinimal(true);
+    position = event.description.indexOf(tmptitle);
+    if (position != -1)
+    {
+        event.description = event.description.replace(tmptitle, "");
+        if (QString(tmptitle.cap(0)) != event.title.trimmed())
+        {
+            event.description = "(" + event.title.trimmed() + "). " + event.description;
+        }
+        event.title = tmptitle.cap(1);
+        // Remove the real title from the description
+    }
+    else // search in title
+    {
+        tmptitle = m_grRealTitleinTitle;
+        position = event.title.indexOf(tmptitle);
+        if (position != -1) // found in title instead
+        {
+            event.title.replace(tmptitle.cap(0),"");
+            QString tmpTranslTitle = event.title;
+            //QString tmpTranslTitle = event.title.replace(tmptitle.cap(0),"");
+            event.title = tmptitle.cap(1);
+            event.description = "(" + tmpTranslTitle.trimmed() + "). " + event.description;
+        }
+    }
+    
+    // Description field: "^Episode: Lion in the cage. (Description follows)"
+    tmpRegEx = m_grEpisodeAsSubtitle;
+    position = event.description.indexOf(tmpRegEx);
+    if (position != -1)
+    {
+        event.subtitle = tmpRegEx.cap(1).trimmed();
+        event.description.replace(tmpRegEx, "");
+    }
+
+    if (series)
+        event.categoryType = ProgramInfo::kCategorySeries;
+
+    // just for luck, retrim fields.
+    event.description = event.description.trimmed();
+    event.title       = event.title.trimmed();
+    event.subtitle    = event.subtitle.trimmed();
+
+// Μα σβήσω τα κοΌΌάτια που περισσεύουΜ από τηΜ περιγραφή πχ παραγωγής χχχχ
+}
+
+void EITFixUp::FixGreekCategories(DBEventEIT &event) const
+{
+    //bool    RemoveFromDescr  = false; // if true, we will remove the category
+                                      // text from the description field.
+    // if keyword is not in the first 20 letters, don't bother.
+    if (event.description.indexOf(m_grCategComedy) != -1)
+    {
+        event.category = "ΚωΌωΎία";
+    }
+    else if (event.description.indexOf(m_grCategTeleMag) != -1)
+    {
+        event.category = "΀ηλεπεριοΎικό";
+    }
+    else if (event.description.indexOf(m_grCategNature) != -1)
+    {
+        event.category = "ΕπιστήΌη/Ίύση";
+    }
+    else if (event.description.indexOf(m_grCategHealth) != -1)
+    {
+        event.category = "Υγεία";
+    }
+    else if (event.description.indexOf(m_grCategReality) != -1)
+    {
+        event.category = "Ριάλιτι";
+    }
+    else if (event.description.indexOf(m_grCategDrama) != -1)
+    {
+        event.category = "ΚοιΜωΜικό";
+    }
+    else if (event.description.indexOf(m_grCategChildren) != -1)
+    {
+        event.category = "ΠαιΎικό";
+    }
+    else if (event.description.indexOf(m_grCategSciFi) != -1)
+    {
+        event.category = "Επιστ.ΊαΜτασίας";
+    }
+    else if ((event.description.indexOf(m_grCategFantasy) != -1)
+             && (event.description.indexOf(m_grCategMystery) != -1))
+    {
+        event.category = "ΊαΜτασίας/Μυστηρίου";
+    }                                  
+    else if (event.description.indexOf(m_grCategMystery) != -1)
+    {
+        event.category = "Μυστηρίου";
+    }
+    else if (event.description.indexOf(m_grCategFantasy) != -1)
+    {
+        event.category = "ΊαΜτασίας";
+    }
+    else if (event.description.indexOf(m_grCategHistory) != -1)
+    {
+        event.category = "Ιστορικό";
+    }                                  
+    else if (event.description.indexOf(m_grCategTeleShop) != -1
+            || event.title.indexOf(m_grCategTeleShop) != -1)
+    {
+        event.category = "΀ηλεπωλήσεις";
+    }
+    else if (event.description.indexOf(m_grCategFood) != -1)
+    {
+        event.category = "ΓαστροΜοΌία";
+    }
+    else if (event.description.indexOf(m_grCategGameShow) != -1
+             || event.title.indexOf(m_grCategGameShow) != -1)
+    {
+        event.category = "΀ηλεπαιχΜίΎι";
+    }         
+    else if (event.description.indexOf(m_grCategBiography) != -1)
+    {
+        event.category = "Βιογραφία";
+    }         
+    else if (event.title.indexOf(m_grCategNews) != -1)
+    {
+        event.category = "ΕιΎήσεις";
+    }         
+    else if (event.description.indexOf(m_grCategSports) != -1)
+    {
+        event.category = "ΑΞλητικά";
+    }         
+    else if (event.description.indexOf(m_grCategMusic) != -1
+            || event.title.indexOf(m_grCategMusic) != -1)
+    {
+        event.category = "Μουσική";
+    }      
+    else if (event.description.indexOf(m_grCategDocumentary) != -1)
+    {
+        event.category = "ΝτοκιΌαΜτέρ";
+    }
+    else if (event.description.indexOf(m_grCategReligion) != -1)
+    {
+        event.category = "Θρησκεία";
+    }
+    else if (event.description.indexOf(m_grCategCulture) != -1)
+    {
+        event.category = "΀έχΜες/ΠολιτισΌός";
+    }
+    else if (event.description.indexOf(m_grCategSpecial) != -1)
+    {
+        event.category = "ΑφιέρωΌα";
+    }
+
+}
+
diff --git a/mythtv/libs/libmythtv/eitfixup.h b/mythtv/libs/libmythtv/eitfixup.h
index 802df82..e724a82 100644
--- a/mythtv/libs/libmythtv/eitfixup.h
+++ b/mythtv/libs/libmythtv/eitfixup.h
@@ -62,6 +62,11 @@ class EITFixUp
         kEFixForceISO8859_2  = 1 << 23,
         kEFixForceISO8859_9  = 1 << 24,
         kEFixForceISO8859_15 = 1 << 25,
+        kEFixForceISO8859_7  = 1 << 26,
+
+        kFixGreekSubtitle    = 1 << 27,
+        kFixGreekEIT         = 1 << 28,
+        kFixGreekCategories  = 1 << 29,
     };
 
     EITFixUp();
@@ -102,6 +107,9 @@ class EITFixUp
     void FixNO(DBEventEIT &event) const;            // Norwegian DVB-S
     void FixNRK_DVBT(DBEventEIT &event) const;      // Norwegian NRK DVB-T
     void FixDK(DBEventEIT &event) const;            // Danish YouSee DVB-C
+    void FixGreekSubtitle(DBEventEIT &event) const; // Greek Nat TV fix
+    void FixGreekEIT(DBEventEIT &event) const;
+    void FixGreekCategories(DBEventEIT &event) const; // Greek categories from descr.
 
     static QString AddDVBEITAuthority(uint chanid, const QString &id);
 
@@ -233,6 +241,45 @@ class EITFixUp
     const QRegExp m_AUFreeviewY;//year
     const QRegExp m_AUFreeviewYC;//year, cast
     const QRegExp m_AUFreeviewSYC;//subtitle, year, cast
+    const QRegExp m_grReplay; //Greek rerun
+    const QRegExp m_grDescriptionFinale; //Greek last m_grEpisode
+    const QRegExp m_grActors; //Greek actors
+    const QRegExp m_grFixnofullstopActors; //bad punctuation makes the "ΠαίζουΜ:" and the actors' names part of the directors...
+    const QRegExp m_grFixnofullstopDirectors; //bad punctuation makes the "ΣκηΜοΞ...:" and the previous sentence.
+    const QRegExp m_grPeopleSeparator; // The comma that separates the actors.
+    const QRegExp m_grDirector;
+    const QRegExp m_grPres; // Greek Presenters for shows
+    const QRegExp m_grYear; // Greek release year.
+    const QRegExp m_grCountry; // Greek event country of origin.
+    const QRegExp m_grlongEp; // Greek Episode
+    const QRegExp m_grSeason; // Greek Season
+    const QRegExp m_grSeries;
+    const QRegExp m_grRealTitleinDescription; // The original title is often in the descr in parenthesis.
+    const QRegExp m_grRealTitleinTitle; // The original title is often in the title in parenthesis.
+    const QRegExp m_grNotPreviouslyShown; // Not previously shown on TV
+    const QRegExp m_grEpisodeAsSubtitle; // Description field: "^Episode: Lion in the cage. (Description follows)"
+    const QRegExp m_grCategFood; // Greek category food
+    const QRegExp m_grCategDrama; // Greek category social/drama
+    const QRegExp m_grCategComedy; // Greek category comedy
+    const QRegExp m_grCategChildren; // Greek category for children / cartoons
+    const QRegExp m_grCategMystery; // Greek category for mystery
+    const QRegExp m_grCategFantasy; // Greek category for fantasy
+    const QRegExp m_grCategHistory; //Greek category for historical movie/series
+    const QRegExp m_grCategTeleMag; //Greek category for Telemagazine show
+    const QRegExp m_grCategTeleShop; //Greek category for teleshopping
+    const QRegExp m_grCategGameShow; //Greek category for game show
+    const QRegExp m_grCategDocumentary; // Greek category for Documentaries
+    const QRegExp m_grCategBiography; // Greek category for biography
+    const QRegExp m_grCategNews; // Greek category for News
+    const QRegExp m_grCategSports; // Greek category for Sports
+    const QRegExp m_grCategMusic; // Greek category for Music
+    const QRegExp m_grCategReality; // Greek category for reality shows
+    const QRegExp m_grCategReligion; //Greek category for religion
+    const QRegExp m_grCategCulture; //Greek category for Arts/Culture
+    const QRegExp m_grCategNature; //Greek category for Nature/Science
+    const QRegExp m_grCategSciFi;  // Greek category for Science Fiction
+    const QRegExp m_grCategHealth; //Greek category for Health
+    const QRegExp m_grCategSpecial; //Greek category for specials.
 };
 
 #endif // EITFIXUP_H
diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp
index b48bf45..0cf155e 100644
--- a/mythtv/libs/libmythtv/eithelper.cpp
+++ b/mythtv/libs/libmythtv/eithelper.cpp
@@ -225,6 +225,7 @@ static void parse_dvb_event_descriptors(desc_list_t list, uint fix,
     // from EN 300 468, Appendix A.2 - Selection of character table
     unsigned char enc_1[3]  = { 0x10, 0x00, 0x01 };
     unsigned char enc_2[3]  = { 0x10, 0x00, 0x02 };
+    unsigned char enc_7[3]  = { 0x10, 0x00, 0x07 }; // Latin/Greek Alphabet
     unsigned char enc_9[3]  = { 0x10, 0x00, 0x09 }; // could use { 0x05 } instead
     unsigned char enc_15[3] = { 0x10, 0x00, 0x0f }; // could use { 0x0B } instead
     int enc_len = 0;
@@ -255,13 +256,21 @@ static void parse_dvb_event_descriptors(desc_list_t list, uint fix,
     }
 
     // Is this broken DVB provider in Western Europe?
-    // Use an encoding override of ISO 8859-15 (Latin6)
+    // Use an encoding override of ISO 8859-15 (Latin9)
     if (fix & EITFixUp::kEFixForceISO8859_15)
     {
         enc = enc_15;
         enc_len = sizeof(enc_15);
     }
 
+    // Is this broken DVB provider in Greece?
+    // Use an encoding override of ISO 8859-7 (Latin/Greek)
+    if (fix & EITFixUp::kEFixForceISO8859_7)
+    {
+        enc = enc_7;
+        enc_len = sizeof(enc_7);
+    }
+
     if (bestShortEvent)
     {
         ShortEventDescriptor sed(bestShortEvent);
@@ -548,6 +557,32 @@ void EITHelper::AddEIT(const DVBEventInformationTable *eit)
                 }
                 category_type = content.GetMythCategory(0);
             }
+            else if (EITFixUp::kFixGreekEIT & fix)//Greek 
+            {
+                ContentDescriptor content(content_data);
+                switch (content.Nibble2(0))
+                {
+                    case 0x01:
+                        category = "΀αιΜία";       // confirmed
+                        break;
+                    case 0x02:
+                        category = "ΕΜηΌερωτικό";  // confirmed
+                        break;
+                    case 0x04:
+                        category = "ΑΞλητικό";     // confirmed
+                        break;
+                    case 0x05:
+                        category = "ΠαιΎικό";      // confirmed
+                        break;
+                    case 0x09:
+                        category = "ΝτοκιΌαΜτέρ";  // confirmed
+                        break;
+                    default:
+                        category = "";
+                        break;
+                }
+                category_type = content.GetMythCategory(2);
+            }
             else
             {
                 ContentDescriptor content(content_data);
@@ -1286,6 +1321,20 @@ static void init_fixup(QMap<uint64_t,uint> &fix)
     // DVB-C T-Kábel Hungary
     // FIXME this should be more specific. Is the encoding really wrong for all services?
     fix[  100 << 16] = EITFixUp::kEFixForceISO8859_2;
+
+    // Greece
+    // Pelion Transmitter
+    // transport_id<<32 | netword_id<<16 | service_id
+    fix[  100LL << 32 |  8492LL << 16 ] = // Ant1,Alpha,Art,10E
+    fix[  102LL << 32 |  8492LL << 16 ] = // Mega,Star,SKAI,M.tv
+    fix[  320LL << 32 |  8492LL << 16 ] = // Astra,Thessalia,TRT,TV10,ZEYS
+        EITFixUp::kFixGreekEIT | 
+        EITFixUp::kFixGreekCategories;
+    fix[    2LL << 32 |  8492LL << 16 ] = // N1,Nplus,NHD,Vouli
+        EITFixUp::kEFixForceISO8859_7 |   // it is encoded in cp-1253
+        EITFixUp::kFixGreekSubtitle |     // Subtitle has too much info and is 
+        EITFixUp::kFixGreekEIT |              // cut in db. Will move to descr.           
+        EITFixUp::kFixGreekCategories; 
 }
 
 /** \fn EITHelper::RescheduleRecordings(void)
diff --git a/mythtv/themes/default/categories.xml b/mythtv/themes/default/categories.xml
index f098171..3565cfe 100644
--- a/mythtv/themes/default/categories.xml
+++ b/mythtv/themes/default/categories.xml
@@ -474,4 +474,69 @@
   <catcolor category="Weather" color="DarkOrange3"></catcolor> 
   <catcolor category="Wrestling" color="DarkCyan"></catcolor>
 
-</categorycolors>
+  <!-- Categories introduced by Greek DVB-T channels --> 
+  <catcolor category="ΕΜηΌερωτικό" color="DarkOrange3"></catcolor>
+  <catcolor category="΀αιΜία" color="Blue"></catcolor>
+  <catcolor category="ΑΞλητικά" color="DarkCyan"></catcolor>
+  <catcolor category="ΠοΎόσφαιρο" color="DarkCyan"></catcolor>
+  <catcolor category="ΠαιΎικό" color="MediumSlateBlue"></catcolor>
+  <catcolor category="ΝτοκιΌαΜτέρ" color="goldenrod"></catcolor>
+  <catcolor category="ΕκπαιΎευτικό" color="CornflowerBlue"></catcolor>
+  <catcolor category="Για ΕΜήλικες" color="thistle3"></catcolor>
+  <catcolor category="Μιούζικαλ" color="turquoise3"></catcolor>
+  <catcolor category="΀ηλεπεριοΎικό" color="DarkOrange3"></catcolor>
+  <catcolor category="Ριάλιτι" color="sienna"></catcolor>
+  <catcolor category="ΓαστροΜοΌία" color="tan3"></catcolor>
+  <catcolor category="Ιατρικό" color="goldenrod"></catcolor>
+  <catcolor category="Μυστηρίου" color="SlateGrey"></catcolor>
+  <catcolor category="ΑστυΜοΌικό/Μυστηρίου" color="SlateGrey"></catcolor>
+  <catcolor category="Μουσική" color="DarkRed"></catcolor>
+  <catcolor category="Μουσικό αφιέρωΌα" color="#aa0000"></catcolor>
+  <catcolor category="ΔραΌατικό" color="rosybrown3"></catcolor>
+  <catcolor category="ΚοιΜωΜικό" color="rosybrown3"></catcolor>
+  <catcolor category="Κλασσικό" color="grey62"></catcolor>
+  <catcolor category="ΑστυΜοΌικό" color="MediumVioletRed"></catcolor>
+  <catcolor category="ΑστυΜοΌικό ΔράΌα" color="MediumVioletRed"></catcolor>
+  <catcolor category="Συζήτηση" color="MediumTurquoise"></catcolor>
+  <catcolor category="Ζωα" color="ForestGreen"></catcolor>
+  <catcolor category="ΓουέστερΜ" color="#bbbb00"></catcolor>
+  <catcolor category="ΠολεΌικό" color="#dddd00"></catcolor>
+  <catcolor category="ΑφιέρωΌα" color="#ee0000"></catcolor>
+  <catcolor category="ΚωΌωΎία" color="DarkOrchid"></catcolor>
+  <catcolor category="ΚωΌωΎία-ΎράΌα" color="#880099"></catcolor>
+  <catcolor category="ΑισΞηΌατική κοΌεΜτί" color="#bbaa00"></catcolor>
+  <catcolor category="ΚωΌική σειρά" color="#880088"></catcolor>
+  <catcolor category="Ζωα" color="#00ff44"></catcolor>
+  <catcolor category="Ίύση" color="#33ff99"></catcolor>
+  <catcolor category="ΕπιστήΌη/Ίύση" color="#33ff99"></catcolor>
+  <catcolor category="Επιστ.ΊαΜτασίας" color="#DD00DD"></catcolor>
+  <catcolor category="ΊαΜτασίας/Επιστ.ΊαΜτασίας" color="DarkBlue"></catcolor>
+  <catcolor category="ΊαΜτασίας" color="#996666"></catcolor>
+  <catcolor category="ΊαΜτασίας/Μυστηρίου" color="#996666"></catcolor>
+  <catcolor category="΀ρόΌου" color="firebrick3"></catcolor>
+  <catcolor category="ΑγωΜίας" color="firebrick3"></catcolor>
+  <catcolor category="Περιπέτεια" color="maroon"></catcolor>
+  <catcolor category="ΑισΞηΌατικό" color="#ff9999"></catcolor>
+  <catcolor category="ΓαστροΜοΌία/΀αΟίΎια" color="#aa00aa"></catcolor>
+  <catcolor category="΀ουρισΌός/΀αΟίΎια" color="#aa00aa"></catcolor>
+  <catcolor category="Υγεία" color="#00ffaa"></catcolor>
+  <catcolor category="Σπίτι/ΊτιάΟτο ΌόΜος σου" color="Red"></catcolor>
+  <catcolor category="Σπιτικές Βελτιώσεις" color="#00cc00"></catcolor>
+  <catcolor category="ΊτιάΟτο ΌόΜος σου" color="#00aa00"></catcolor>
+  <catcolor category="Σπίτι/κηπουρική" color="#00ee00"></catcolor>
+  <catcolor category="ΠαιχΜίΎι" color="orchid"></catcolor>
+  <catcolor category="ΑΜΞολογία" color="DarkOrchid"></catcolor>
+  <catcolor category="ΚιΜ.ΣχέΎια" color="#3333aa"></catcolor>
+  <catcolor category="΀ηλεπαιχΜίΎι" color="orchid"></catcolor>
+  <catcolor category="ΓυΌΜαστική" color="#00dd99"></catcolor>
+  <catcolor category="ΕΌπόριο/ΟικοΜοΌία" color="DarkOrange3"></catcolor>
+  <catcolor category="ΑυτοκίΜητο" color="#a8bde8"></catcolor>
+  <catcolor category="Βιογραφία" color="#e9ecf3"></catcolor>
+  <catcolor category="ΜόΎα" color="#a8cdea"></catcolor>
+  <catcolor category="ΣαπουΜόπερα" color="DarkOrchid"></catcolor>
+  <catcolor category="Ιστορικό" color="DarkOrange1"></catcolor>    
+  <catcolor category="΀ηλεπωλήσεις" color="#222200"></catcolor>
+  <catcolor category="ΕιΎήσεις" color="DarkOrange3"></catcolor>
+  <catcolor category="Θρησκεία" color="goldenrod"></catcolor>
+  <catcolor category="΀έχΜες/ΠολιτισΌός" color="goldenrod"></catcolor>
+  </categorycolors>