Ticket #3585: mythvideo-cast.3.diff

mythvideo/mythvideo/dbaccess.cpp

@@ -549 +549 @@
 
 ////////////////////////////////////////////
 
+VideoCast::VideoCast() :
+    SingleValue(new SingleValueImp("videocast", "intid", "cast"))
+{
+}
+
+VideoCast::~VideoCast()
+{
+}
+
+VideoCast &VideoCast::getCast()
+{
+    static VideoCast vc;
+    vc.load_data();
+    return vc;
+}
+
+////////////////////////////////////////////
+
 VideoGenreMap::VideoGenreMap() :
     MultiValue(new MultiValueImp("videometadatagenre", "idvideo", "idgenre"))
 {
@@ -586 +604 @@
 
 ////////////////////////////////////////////
 
+VideoCastMap::VideoCastMap() :
+    MultiValue(new MultiValueImp("videometadatacast", "idvideo",
+                                 "idcast"))
+{
+}
+
+VideoCastMap::~VideoCastMap()
+{
+}
+
+VideoCastMap &VideoCastMap::getCastMap()
+{
+    static VideoCastMap vcm;
+    vcm.load_data();
+    return vcm;
+}
+
+////////////////////////////////////////////
+
 class FileAssociationsImp
 {
   public:

mythvideo/mythvideo/dbaccess.h

@@ -107 +107 @@
     ~VideoCountryMap();
 };
 
+class VideoCast : public SingleValue
+{
+  public:
+    static VideoCast &getCast();
+
+  private:
+    VideoCast();
+    ~VideoCast();
+};
+
+class VideoCastMap : public MultiValue
+{
+  public:
+    static VideoCastMap &getCastMap();
+
+  private:
+    VideoCastMap();
+    ~VideoCastMap();
+};
+
 class FileAssociations
 {
   public:

mythvideo/mythvideo/dbcheck.cpp

@@ -13 +13 @@
     const QString lastMythDVDDBVersion = "1002";
     const QString lastMythVideoVersion = "1010";
 
-    const QString currentDatabaseVersion = "1014";
+    const QString currentDatabaseVersion = "1015";
 
     const QString OldMythVideoVersionName = "VideoDBSchemaVer";
     const QString OldMythDVDVersionName = "DVDDBSchemaVer";
@@ -622 +622 @@
             updates += "ALTER TABLE filemarkup ADD INDEX (filename(255));";
             performActualUpdate(updates, "1014", dbver, MythVideoVersionName);
         }
+ 
+        if (dbver == "1014")
+        {
+             // Add Cast tables
+             const QString updates[] = {
+ "CREATE TABLE IF NOT EXISTS videocast ( intid INT UNSIGNED AUTO_INCREMENT NOT NULL  PRIMARY KEY, cast VARCHAR(128) NOT NULL);",
+ "CREATE TABLE IF NOT EXISTS videometadatacast ( idvideo INT UNSIGNED NOT NULL,idcast INT UNSIGNED NOT NULL );",
+ ""
+             };
+ 
+             performActualUpdate(updates, "1015", dbver, MythVideoVersionName);
+         }
     }
 }
 

mythvideo/mythvideo/globals.cpp

@@ -9 +9 @@
 const QString VIDEO_COUNTRY_UNKNOWN = QObject::tr("Unknown");
 const QString VIDEO_YEAR_UNKNOWN = QObject::tr("Unknown");
 const QString VIDEO_RUNTIME_UNKNOWN = QObject::tr("Unknown");
+const QString VIDEO_CAST_UNKNOWN = QObject::tr("Unknown");
 
 const QString VIDEO_CATEGORY_DEFAULT = VIDEO_CATEGORY_UNKNOWN;
 const QString VIDEO_DIRECTOR_DEFAULT = VIDEO_DIRECTOR_UNKNOWN;
@@ -16 +17 @@
 const QString VIDEO_COVERFILE_DEFAULT = QObject::tr("No Cover");
 const QString VIDEO_RATING_DEFAULT = QObject::tr("NR");
 const QString VIDEO_PLOT_DEFAULT = QObject::tr("None");
+const QString VIDEO_CAST_DEFAULT = VIDEO_CAST_UNKNOWN;
 
 const QString JUMP_VIDEO_MANAGER = "Video Manager";
 const QString JUMP_VIDEO_BROWSER = "Video Browser";

mythvideo/mythvideo/globals.h

@@ -5 +5 @@
 extern const QString VIDEO_DIRECTOR_UNKNOWN;
 extern const QString VIDEO_GENRE_UNKNOWN;
 extern const QString VIDEO_COUNTRY_UNKNOWN;
+extern const QString VIDEO_CAST_UNKNOWN;
 extern const QString VIDEO_YEAR_UNKNOWN;
 extern const QString VIDEO_RUNTIME_UNKNOWN;
 
@@ -14 +15 @@
 extern const QString VIDEO_COVERFILE_DEFAULT;
 extern const QString VIDEO_RATING_DEFAULT;
 extern const QString VIDEO_PLOT_DEFAULT;
+extern const QString VIDEO_CAST_DEFAULT;
 
 extern const QString JUMP_VIDEO_MANAGER;
 extern const QString JUMP_VIDEO_BROWSER;

mythvideo/mythvideo/metadata.cpp

@@ -86 +86 @@
   public:
     typedef Metadata::genre_list genre_list;
     typedef Metadata::country_list country_list;
+    typedef Metadata::cast_list cast_list;
 
   public:
     MetadataImp(const QString &filename, const QString &coverfile,
@@ -97 +98 @@
              int childID, bool browse,
              const QString &playcommand, const QString &category,
              const genre_list &genres,
-             const country_list &countries) :
+             const country_list &countries,
+             const cast_list &cast) :
         m_title(title),
         m_inetref(inetref), m_director(director), m_plot(plot),
         m_rating(rating), m_playcommand(playcommand), m_category(category),
-        m_genres(genres), m_countries(countries),
+        m_genres(genres), m_countries(countries), m_cast(cast),
         m_filename(filename), m_coverfile(coverfile),
         m_categoryID(categoryID), m_childID(childID), m_year(year),
         m_length(length), m_showlevel(showlevel), m_browse(browse), m_id(id),
@@ -134 +136 @@
         m_category = rhs.m_category;
         m_genres = rhs.m_genres;
         m_countries = rhs.m_countries;
+        m_cast = rhs.m_cast;
         m_filename = rhs.m_filename;
         m_coverfile = rhs.m_coverfile;
 
@@ -204 +207 @@
     {
         m_countries = countries;
     }
+    
+    const cast_list &getCast() const { return m_cast; }
+    void setCast(const cast_list &cast) { m_cast = cast; }
 
     const QString &getFilename() const { return m_filename; }
     void setFilename(const QString &filename) { m_filename = filename; }
@@ -270 +276 @@
     void fillCountries();
     void updateCountries();
     void fillGenres();
+    void fillCast();
     void updateGenres();
+    void updateCast();
     bool removeDir(const QString &dirName);
     void fromDBRow(MSqlQuery &query);
     void saveToDatabase();
@@ -285 +293 @@
     QString m_category;
     genre_list m_genres;
     country_list m_countries;
+    cast_list m_cast;
     QString m_filename;
     QString m_coverfile;
 
@@ -369 +378 @@
 {
     VideoGenreMap::getGenreMap().remove(m_id);
     VideoCountryMap::getCountryMap().remove(m_id);
+    VideoCastMap::getCastMap().remove(m_id);
 
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("DELETE FROM videometadata WHERE intid = :ID");
@@ -395 +405 @@
                     VIDEO_INETREF_DEFAULT, VIDEO_DIRECTOR_DEFAULT,
                     VIDEO_PLOT_DEFAULT, 0.0, VIDEO_RATING_DEFAULT, 0, m_id,
                     ParentalLevel::plLowest, 0, -1, true, "", "",
-                    Metadata::genre_list(), Metadata::country_list());
+                    Metadata::genre_list(), Metadata::country_list(), Metadata::cast_list());
     tmp.m_prefix = m_prefix;
     tmp.m_flat_index = m_flat_index;
 
@@ -440 +450 @@
     }
 }
 
+void MetadataImp::fillCast()
+{
+    m_cast.clear();
+    VideoCastMap &vcm = VideoCastMap::getCastMap();
+    VideoCastMap::entry cast;
+    if (vcm.get(m_id, cast))
+    {
+        VideoCast &vc = VideoCast::getCast();
+        for (VideoCastMap::entry::values_type::iterator p =
+             cast.values.begin(); p != cast.values.end(); ++p)
+        {
+            // Just add empty string for no-name cast
+            QString name;
+            vc.get(*p, name);
+            m_cast.push_back(cast_list::value_type(*p, name));
+        }
+    }
+}
+
 /// Sets metadata from a DB row
 void MetadataImp::fromDBRow(MSqlQuery &query)
 {
@@ -471 +500 @@
 
     //Countries
     fillCountries();
+
+    // Cast
+    fillCast();
 }
 
 void MetadataImp::saveToDatabase()
@@ -570 +602 @@
 
     updateGenres();
     updateCountries();
+    updateCast();
 }
 
 void MetadataImp::dumpToDatabase()
@@ -649 +682 @@
     }
 }
 
+void MetadataImp::updateCast()
+{
+    VideoCastMap::getCastMap().remove(m_id);
+
+    // ensure that all cast we have are in the DB
+    cast_list::iterator cast = m_cast.begin();
+    while (cast != m_cast.end())
+    {
+        if (cast->second.stripWhiteSpace().length())
+        {
+            cast->first = VideoCast::getCast().add(cast->second);
+            VideoCastMap::getCastMap().add(m_id, cast->first);
+            ++cast;
+        }
+        else
+        {
+            cast = m_cast.erase(cast);
+        }
+    }
+}
+
 ////////////////////////////////////////
 //// Metadata
 ////////////////////////////////////////
@@ -854 +908 @@
              int childID, bool browse,
              const QString &playcommand, const QString &category,
              const genre_list &genres,
-             const country_list &countries)
+             const country_list &countries,
+             const cast_list &cast)
 {
     m_imp = new MetadataImp(filename, coverfile, title, year, inetref, director,
                             plot, userrating, rating, length, id, showlevel,
                             categoryID, childID, browse, playcommand, category,
-                            genres, countries);
+                            genres, countries, cast);
 }
 
 Metadata::~Metadata()
@@ -1098 +1153 @@
     m_imp->setGenres(genres);
 }
 
+const Metadata::cast_list &Metadata::Cast() const
+{
+    return m_imp->getCast();
+}
+
+QString Metadata::CastLine() const
+{
+    cast_list cast = m_imp->getCast();    
+    QString actors = "";
+    
+    if (cast.size() > 0) 
+    {         
+        cast_list::const_iterator it = cast.begin();
+          
+        int num = cast.size();
+          
+        for (int i = 0; i < (num - 1); i++)
+        {
+            actors+=it->second + ",";              
+            ++it;
+        }       
+        actors+=it->second;            
+    }
+
+    return actors;
+}
+
+void Metadata::setCast(const cast_list &cast)
+{
+    m_imp->setCast(cast);
+}
+
 const Metadata::country_list &Metadata::Countries() const
 {
     return m_imp->getCountries();

mythvideo/mythvideo/metadata.h

@@ -20 +20 @@
   public:
     typedef std::pair<int, QString> genre_entry;
     typedef std::pair<int, QString> country_entry;
+    typedef std::pair<int, QString> cast_entry;
     typedef std::vector<genre_entry> genre_list;
     typedef std::vector<country_entry> country_list;
+    typedef std::vector<cast_entry> cast_list;
 
   public:
     class SortKey
@@ -62 +64 @@
              int childID = -1, bool browse = true,
              const QString &playcommand = "", const QString &category = "",
              const genre_list &genres = genre_list(),
-             const country_list &countries = country_list());
+             const country_list &countries = country_list(),
+             const cast_list &cast = cast_list());
     ~Metadata();
     Metadata(MSqlQuery &query);
     Metadata(const Metadata &rhs);
@@ -133 +136 @@
     const genre_list &Genres() const;
     void setGenres(const genre_list &genres);
 
+    const cast_list &Cast() const;
+    QString CastLine() const;
+    void setCast(const cast_list &cast);
+
     const country_list &Countries() const;
     void setCountries(const country_list &countries);
 

mythvideo/mythvideo/scripts/get_cast.py

@@ +1 @@
+#!/usr/bin/python
+# -*- coding: utf8 -*-
+"""
+This Python script is intended to fill the cast in the database 
+This script is intended to be used by people that have an existing 
+big video collection already in the database and want to fill
+in the cast field. Perform movie data lookups using the
+imdbpy.py script.
+
+Written by William Stewart 2007
+Based on find_meta.py by Pekka JÀÀskelÀinen
+
+"""
+
+import sys
+import optparse
+import re
+import os
+import glob
+import fileinput
+import shlex
+import socket
+import urllib
+import distutils.file_util
+import imdbpy
+
+try:
+        import imdb
+except ImportError:
+        print "You need to install the IMDbPy library "\
+                "from (http://imdbpy.sourceforge.net/?page=download)"
+        sys.exit(1)
+
+try:
+        from MythTV import MythDB, MythVideo
+        mythdb = MythDB()
+        mythvideo = MythVideo()
+except:
+        mythdb = None
+        mythvideo = None
+
+from stat import *
+
+verbose=False
+
+def print_verbose(string):
+        global verbose
+        if verbose:
+                print string
+        return
+
+def main():
+        global verbose
+
+        usage = "usage: %prog [options]"
+
+        p = optparse.OptionParser(usage=usage)
+        p.add_option('--version', '-v', action="store_true", default=False,
+                help="Display 1-line describing name, version, author etc.")
+
+        options, arguments = p.parse_args()
+
+        if options.version:
+                print "MythVideo Cast Metadata Finder - William Stewart 2007"
+                sys.exit(0)
+
+        if not mythdb:
+                print "Error can not access the mythtv database"
+                sys.exit(1)
+
+        c = mythdb.cursor()
+        c.execute("""
+                SELECT intid, filename, inetref
+                FROM videometadata""")
+        
+        row = c.fetchone()
+        while row is not None:
+                intid = row[0]
+                filename = row[1]
+                imdb_id = row[2]
+                if imdb_id != '00000000':
+                        """
+                        Fetches metadata for the given IMDb id.
+                        """
+                        imdb_access = imdb.IMDb()
+                        movie = imdb_access.get_movie(imdb_id)          
+                        imdb_access.update(movie)
+
+                        castlist = movie.get('cast')
+                        if castlist is not None:
+                                print "Found cast data for %s (%s)" % (filename, imdb_id)
+                                i = 0
+                                for name in castlist:
+                                        cast=unicode(name['name'])
+                                        if i < 12:                                                               
+                                                mythvideo.setCast(cast, intid)
+                                                i+=1
+                row = c.fetchone()
+        c.close()
+
+        sys.exit(0)
+
+if __name__ == '__main__':
+        main()

mythvideo/mythvideo/scripts/imdb.pl

@@ -217 +217 @@
                                "/table>"); 
    if ($data) {
       $cast = join(',', ($data =~ m/$name_link_pat/g));
+      $cast = trim($cast);
    }
    
    
@@ -243 +244 @@
    print "MovieRating:$movierating\n";
    print "Runtime:$runtime\n";
    print "Writers: $writer\n";
-   print "Cast: $cast\n";
+   print "Cast:$cast\n";
    print "Genres: $lgenres\n";
    print "Countries: $lcountries\n";
 }

mythvideo/mythvideo/scripts/imdbpy.py

@@ -198 +198 @@
         year = None
         directors = None
         plot = None
+        cast = None
         rating = None
         mpaa_rating = None
         genres = None
@@ -236 +237 @@
                 if self.directors is not None and len(self.directors) > 0:
                         metadata += createMetadataLine("Director", unicode(self.directors[0]))
                 metadata += createMetadataLine("Plot", self.plot)
+                metadata += createMetadataLine("Cast", unicode(self.cast))
                 metadata += createMetadataLine('UserRating', self.rating)
                 metadata += createMetadataLine('MovieRating', self.mpaa_rating)
                 metadata += createMetadataLine('Genres', self.genres)
@@ -256 +258 @@
 
         imdb_access = imdb.IMDb()
         movie = imdb_access.get_movie(imdb_id)
+                
         imdb_access.update(movie)
 
         def metadataFromField(key, default=None, m=movie):
@@ -329 +332 @@
                         if shortest_found == None or len(text) < len(shortest_found):
                                 shortest_found = text
                 metadata.plot = shortest_found
+                
+        cast = movie.get('cast')
+        cast_str = ""
+        if cast is not None:
+                i = 0
+                for name in cast:
+                        if i is not 10:
+                                cast_str+=name['name']+","
+                                i+=1
 
+                cast_str = cast_str[0:-1]
+
+        metadata.cast = cast_str
         metadata.rating = metadataFromField('rating', metadata.rating)
         metadata.mpaa_rating = metadataFromField('mpaa', metadata.mpaa_rating)
         metadata.runtime = metadataFromFirst('runtimes', metadata.runtime)

mythvideo/mythvideo/scripts/MythTV.py

@@ -79 +79 @@
                                 if token == "DBHostName":
                                         if config.get_token() == "=":
                                                 db_host = config.get_token()
+                                                if config.get_token() == '.':
+                                                        db_host += '.' + config.get_token()
+                                                if config.get_token() == '.':
+                                                        db_host += '.' + config.get_token()
+                                                if config.get_token() == '.':
+                                                        db_host += '.' + config.get_token()
                                 elif token == "DBUserName":
                                         if config.get_token() == "=":
                                                 db_user = config.get_token()
@@ -93 +99 @@
                         log.debug('Using config %s' % config_file)
                         found_config = True
                         break
-        
                 if not found_config:
                         raise "Unable to find MythTV configuration file"
                 self.db = MySQLdb.connect(user=db_user, host=db_host, passwd=db_password, db=db_name)
@@ -345 +350 @@
                 
                 return newid
 
+        def getCastId(self, cast_name):
+                """
+                Find the id of the given cast from MythDB.
+                
+                If the cast does not exist, insert it and return its id.
+                """
+                c = self.db.cursor()
+                # print "SELECT intid FROM videocast WHERE lower(cast) = '%s'" % (cast_name,)
+                c.execute("SELECT intid FROM videocast WHERE lower(cast) = %s", (cast_name,))
+                row = c.fetchone()
+                c.close()
+                
+                if row is not None:
+                        # print "getCastId %s %s" % (cast_name, row[0])
+                        return row[0]
+                
+                # Insert a new cast.
+                c = self.db.cursor()
+                c.execute("INSERT INTO videocast(cast) VALUES (%s)", (cast_name,))
+                #print "INSERT INTO videocast(cast) VALUES ('%s')" % (cast_name,)
+                c.close()
+
+                c = self.db.cursor()
+                c.execute("SELECT intid FROM videocast WHERE lower(cast) = %s", (cast_name,))
+                row = c.fetchone()
+                c.close()
+                
+                return row[0]
+
+        def setCast(self, cast_name, idvideo):
+                """
+                Insert the cast_name into videometadatacast if it does already exist.
+                
+                If the cast does not exist, insert it and return its id.
+                """
+                
+                idcast = self.getCastId(cast_name);
+                
+                c = self.db.cursor()
+                c.execute("SELECT * FROM videometadatacast WHERE idvideo = %s AND idcast = %s", (idvideo,idcast))
+                row = c.fetchone()
+                c.close()
+                
+                if row is None:
+                        # Insert a new cast.
+                        c = self.db.cursor()
+                        c.execute("INSERT INTO videometadatacast VALUES (%s,%s)", (idvideo,idcast))
+                        #print "INSERT INTO videometadatacast VALUES (%s,%s)" % (idvideo,idcast)
+                        c.close()
+
         def getMetadataId(self, videopath):
                 """
                 Finds the MythVideo metadata id for the given video path from the MythDB, if any.

mythvideo/mythvideo/videobrowser.cpp

@@ -131 +131 @@
             focusButton = popup->addButton(tr("Watch This Video"), this,
                                            SLOT(slotWatchVideo()));
             popup->addButton(tr("View Full Plot"), this, SLOT(slotViewPlot()));
+            popup->addButton(tr("View Cast"), this, SLOT(slotViewCast()));
         }
         else
         {
@@ -311 +312 @@
                             curitem->Director());
             checkedSetText((UITextType *)container->GetType("plot"),
                             curitem->Plot());
+            checkedSetText((UITextType *)container->GetType("cast"),
+                            curitem->CastLine());
             checkedSetText((UITextType *)container->GetType("rating"),
                             getDisplayRating(curitem->Rating()));
             checkedSetText((UITextType *)container->GetType("inetref"),

mythvideo/mythvideo/videodlg.cpp

@@ -171 +171 @@
     }
 }
 
+void VideoDialog::slotViewCast()
+{
+    cancelPopup();
+
+    if (curitem)
+    {
+        QString actors = "";
+        const Metadata::cast_list &cast = curitem->Cast();
+        
+        if (cast.size() > 0) 
+        {         
+          Metadata::cast_list::const_iterator it = cast.begin();
+          
+          int num = cast.size();
+          
+          if (num > 10)
+            num = 10;
+            
+          for (int i = 0; i < (num - 1); i++)
+          {
+              actors+=it->second + "\n";              
+              ++it;
+          }          
+          actors+=it->second;            
+        }
+        else
+        {
+          actors = "None defined";
+        }
+            
+        allowPaint = false;
+        MythPopupBox * castbox = new MythPopupBox(gContext->GetMainWindow());
+
+        QLabel *castLabel = castbox->addLabel(actors,
+                                              MythPopupBox::Small,true);
+        castLabel->setAlignment(Qt::AlignJustify | Qt::WordBreak);
+
+        QButton * okButton = castbox->addButton(tr("Ok"));
+        okButton->setFocus();
+
+        castbox->ExecPopup();
+        castbox->deleteLater();
+        allowPaint = true;
+
+    }
+    else
+    {
+        VERBOSE(VB_IMPORTANT, QString("no Item to view"));
+        slotDoCancel();
+    }
+}
 
 void VideoDialog::slotWatchVideo()
 {

mythvideo/mythvideo/videodlg.h

@@ -40 +40 @@
     void slotVideoGallery();
     void slotVideoBrowser();
     void slotViewPlot();
+    void slotViewCast();
     void slotDoFilter();
     void exitWin();
     virtual void slotParentalLevelChanged();

mythvideo/mythvideo/videofilter.cpp

@@ -27 +27 @@
     kCountryFilterUnknown = 0
 };
 
+enum CastFilter {
+    kCastFilterAll = -1,
+    kCastFilterUnknown = 0
+};
+
 enum CategoryFilter {
     kCategoryFilterAll = -1,
     kCategoryFilterUnknown = 0
@@ -66 +71 @@
 VideoFilterSettings::VideoFilterSettings(bool loaddefaultsettings,
                                          const QString& _prefix) :
     category(kCategoryFilterAll), genre(kGenreFilterAll),
-    country(kCountryFilterAll), year(kYearFilterAll),
-    runtime(kRuntimeFilterAll), userrating(kUserRatingFilterAll),
-    browse(kBrowseFilterAll), m_inetref(kInetRefFilterAll),
-    m_coverfile(kCoverFileFilterAll), orderby(kOrderByTitle),
-    m_parental_level(ParentalLevel::plNone), m_changed_state(0)
+    country(kCountryFilterAll), cast(kCastFilterAll),
+    year(kYearFilterAll), runtime(kRuntimeFilterAll), 
+    userrating(kUserRatingFilterAll), browse(kBrowseFilterAll), 
+    m_inetref(kInetRefFilterAll), m_coverfile(kCoverFileFilterAll), 
+    orderby(kOrderByTitle), m_parental_level(ParentalLevel::plNone), 
+    m_changed_state(0)
 {
     if (!_prefix)
         prefix = "VideoDefault";
@@ -86 +92 @@
                                         kGenreFilterAll);
         country = gContext->GetNumSetting(QString("%1Country").arg(prefix),
                                           kCountryFilterAll);
+        cast = gContext->GetNumSetting(QString("%1Cast").arg(prefix),
+                                        kCastFilterAll);
         year = gContext->GetNumSetting(QString("%1Year").arg(prefix),
                                        kYearFilterAll);
         runtime = gContext->GetNumSetting(QString("%1Runtime").arg(prefix),
@@ -134 +142 @@
         country = rhs.country;
     }
 
+    if (cast != rhs.cast)
+    {
+        m_changed_state |= kFilterCastChanged;
+        cast = rhs.cast;
+    }
+
     if (year != rhs.year)
     {
         m_changed_state |= kFilterYearChanged;
@@ -189 +203 @@
 {
     gContext->SaveSetting(QString("%1Category").arg(prefix), category);
     gContext->SaveSetting(QString("%1Genre").arg(prefix), genre);
+    gContext->SaveSetting(QString("%1Cast").arg(prefix), cast);
     gContext->SaveSetting(QString("%1Country").arg(prefix), country);
     gContext->SaveSetting(QString("%1Year").arg(prefix), year);
     gContext->SaveSetting(QString("%1Runtime").arg(prefix), runtime);
@@ -233 +248 @@
         }
     }
 
+    if (matches && cast != kCastFilterAll)
+    {
+        matches = false;
+
+        const Metadata::cast_list &cl = mdata.Cast();
+        for (Metadata::cast_list::const_iterator p = cl.begin();
+             p != cl.end(); ++p)
+        {
+            if ((matches = p->first == cast))
+            {
+                break;
+            }
+        }
+    }
+
     if (matches && category != kCategoryFilterAll)
     {
         matches = category == mdata.getCategoryID();
@@ -369 +399 @@
                                  const char *name_) :
     MythThemedDialog(parent_, window_name, theme_filename, name_),
     browse_select(0), orderby_select(0), year_select(0), userrating_select(0),
-    category_select(0), country_select(0), genre_select(0), runtime_select(0),
-    save_button(0), done_button(0), numvideos_text(0), m_intetref_select(0),
-    m_coverfile_select(0), m_fsp(fsp), m_video_list(video_list)
+    category_select(0), country_select(0), genre_select(0), cast_select(0), 
+        runtime_select(0), save_button(0), done_button(0), numvideos_text(0), 
+        m_intetref_select(0), m_coverfile_select(0), m_fsp(fsp), 
+        m_video_list(video_list)
 {
     //
     //  The only thing this screen does is let the
@@ -469 +500 @@
         genre_select->setToItem(m_settings.getGenre());
     }
 
+    if (cast_select)
+    {
+        cast_select->addItem(kCastFilterAll, QObject::tr("All"));
+
+        const VideoCast::entry_list &cl = VideoCast::getCast().getList();
+        for (VideoCast::entry_list::const_iterator p = cl.begin();
+             p != cl.end(); ++p)
+        {
+            cast_select->addItem(p->first, p->second);
+        }
+
+        cast_select->addItem(kCastFilterUnknown, VIDEO_CAST_UNKNOWN);
+        cast_select->setToItem(m_settings.getCast());
+    }
+
     if (country_select)
     {
         country_select->addItem(kCountryFilterAll, QObject::tr("All"));
@@ -616 +662 @@
             widget_testset(currentSelector, focued, category_select);
             widget_testset(currentSelector, focued, genre_select);
             widget_testset(currentSelector, focued, country_select);
+            widget_testset(currentSelector, focued, cast_select);
             widget_testset(currentSelector, focued, year_select);
             widget_testset(currentSelector, focued, runtime_select);
             widget_testset(currentSelector, focued, userrating_select);
@@ -704 +751 @@
         update_numvideo();
 }
 
+void VideoFilterDialog::setCast(int new_cast)
+{
+        m_settings.setCast(new_cast);
+        update_numvideo();
+}
+
 void VideoFilterDialog::setRunTime(int new_runtime)
 {
         m_settings.setRuntime(new_runtime);
@@ -762 +815 @@
         connect(genre_select,SIGNAL(pushed(int)),
                 this, SLOT(setGenre(int)));
 
+    cast_select = getUISelectorType("cast_select");
+    if (cast_select)
+        connect(cast_select,SIGNAL(pushed(int)),
+                this, SLOT(setCast(int)));
+
     runtime_select = getUISelectorType("runtime_select");
     if (runtime_select)
         connect(runtime_select, SIGNAL(pushed(int)),

mythvideo/mythvideo/videofilter.h

@@ -34 +34 @@
         kFilterBrowseChanged = (1 << 7),
         kFilterInetRefChanged = (1 << 8),
         kFilterCoverFileChanged = (1 << 9),
-        kFilterParentalLevelChanged = (1 << 8)
+        kFilterParentalLevelChanged = (1 << 0xa),
+        kFilterCastChanged = (1 << 0xb)
     };
 
   public:
@@ -75 +76 @@
         genre = lgenre;
     }
 
+    int getCast() const { return cast; }
+    void setCast(int lcast)
+    {
+        m_changed_state |= kFilterCastChanged;
+        cast = lcast;
+    }
+
     int getCountry() const { return country; }
     void setCountry(int lcountry)
     {
@@ -149 +157 @@
     int category;
     int genre;
     int country;
+    int cast;
     int year;
     int runtime;
     int userrating;
@@ -221 +230 @@
     void setCategory(int new_category);
     void setCountry(int new_country);
     void setGenre(int new_genre);
+    void setCast(int new_cast);
     void setRunTime(int new_runtime);
     void setBrowse(int new_browse);
     void setInetRef(int new_inetref);
@@ -240 +250 @@
     UISelectorType  *category_select;
     UISelectorType  *country_select;
     UISelectorType  *genre_select;
+    UISelectorType  *cast_select;
     UISelectorType  *runtime_select;
     UITextButtonType    *save_button;
     UITextButtonType    *done_button;

mythvideo/mythvideo/videogallery.cpp

@@ -500 +500 @@
             focusButton = popup->addButton(tr("Watch This Video"), this,
                                            SLOT(slotWatchVideo()));
             popup->addButton(tr("View Full Plot"), this, SLOT(slotViewPlot()));
+            popup->addButton(tr("View Cast"), this, SLOT(slotViewCast()));
             popup->addButton(tr("View Details"), this,
                              SLOT(handleVideoSelect()));
 

mythvideo/mythvideo/videomanager.cpp

@@ -1205 +1205 @@
                 checkedSetText(m_container, "video_player",
                                Metadata::getPlayer(item));
                 checkedSetText(m_container, "director", item->Director());
+                checkedSetText(m_container, "cast", item->CastLine());
                 checkedSetText(m_container, "plot", item->Plot());
                 checkedSetText(m_container, "rating", item->Rating());
                 checkedSetText(m_container, "inetref", item->InetRef());
@@ -2591 +2592 @@
 
             AutomaticParentalAdjustment(item);
 
+            // Cast
+            Metadata::cast_list movie_cast;
+            QStringList cast = QStringList::split(",", data["Cast"]);
+ 
+            for (QStringList::iterator p = cast.begin(); p != cast.end(); ++p)
+            {
+                QString cast_name = (*p).stripWhiteSpace();
+                if (cast_name.length())
+                {
+                   movie_cast.push_back(Metadata::cast_list::value_type(-1, cast_name));
+                }
+            }
+ 
+            item->setCast(movie_cast);
+            
             // Genres
             Metadata::genre_list video_genres;
             QStringList genres = QStringList::split(",", data["Genres"]);

mythvideo/mythvideo/videoselected.cpp

@@ -261 +261 @@
                           m_item->Director());
            checkedSetText((UITextType *)container->GetType("plot"),
                           m_item->Plot());
+           checkedSetText((UITextType *)container->GetType("cast"),
+                          m_item->CastLine());
            checkedSetText((UITextType *)container->GetType("rating"),
                           getDisplayRating(m_item->Rating()));
            checkedSetText((UITextType *)container->GetType("inetref"),

mythvideo/mythvideo/videotree.cpp

@@ -21 +21 @@
     UITextType *video_title;
     UITextType *video_file;
     UITextType *video_plot;
+    UITextType *video_cast;
     UITextType *video_player;
     UITextType *pl_value;
     UIImageType *video_poster;
@@ -43 +44 @@
   public:
     VideoTreeImp() :
         video_tree_list(NULL), video_title(NULL),
-        video_file(NULL), video_plot(NULL), video_player(NULL),
+        video_file(NULL), video_plot(NULL), video_cast(NULL), video_player(NULL),
         pl_value(NULL), video_poster(NULL), m_director(NULL), m_rating(NULL),
         m_inetref(NULL), m_year(NULL), m_userrating(NULL), m_length(NULL),
         m_coverfile(NULL), m_child_id(NULL), m_browseable(NULL),
@@ -88 +89 @@
         // Optional
         assign(vt, m_director, "director", false);
         assign(vt, video_plot, "plot", false);
+        assign(vt, video_cast, "cast", false);
         assign(vt, m_rating, "rating", false);
         assign(vt, m_inetref, "inetref", false);
         assign(vt, m_year, "year", false);
@@ -112 +114 @@
 
         checkedSetText(m_director, "");
         checkedSetText(video_plot, "");
+        checkedSetText(video_cast, "");
         checkedSetText(m_rating, "");
         checkedSetText(m_inetref, "");
         checkedSetText(m_year, "");
@@ -129 +132 @@
         checkedSetText(video_title, item->Title());
         checkedSetText(video_file, item->Filename().section("/", -1));
         checkedSetText(video_plot, item->Plot());
+        checkedSetText(video_cast, item->CastLine());
         checkedSetText(video_player, Metadata::getPlayer(item));
 
         if (!isDefaultCoverFile(item->CoverFile()))
@@ -454 +458 @@
             focusButton = popup->addButton(tr("Watch This Video"), this,
                                            SLOT(slotWatchVideo()));
             popup->addButton(tr("View Full Plot"), this, SLOT(slotViewPlot()));
+            popup->addButton(tr("View Cast"), this, SLOT(slotViewCast()));
         }
         else
         {
@@ -535 +540 @@
     }
 }
 
+void VideoTree::slotViewCast()
+{
+    cancelPopup();
+
+    if (curitem)
+    {
+        QString actors = "";
+        const Metadata::cast_list &cast = curitem->Cast();
+        
+        if (cast.size() > 0) 
+        {         
+          Metadata::cast_list::const_iterator it = cast.begin();
+          
+          int num = cast.size();
+          
+          if (num > 10)
+            num = 10;
+            
+          for (int i = 0; i < (num - 1); i++)
+          {
+              actors+=it->second + "\n";              
+              ++it;
+          }          
+          actors+=it->second;            
+        }
+        else
+        {
+          actors = "None defined";
+        }
+            
+        // allowPaint = false;
+        MythPopupBox * castbox = new MythPopupBox(gContext->GetMainWindow());
+
+        QLabel *castLabel = castbox->addLabel(actors,
+                                              MythPopupBox::Small,true);
+        castLabel->setAlignment(Qt::AlignJustify | Qt::WordBreak);
+
+        QButton * okButton = castbox->addButton(tr("Ok"));
+        okButton->setFocus();
+
+        castbox->ExecPopup();
+        castbox->deleteLater();
+        // allowPaint = true;
+
+    }
+    else
+    {
+        VERBOSE(VB_IMPORTANT, QString("no Item to view"));
+        slotDoCancel();
+    }
+}
+
 void VideoTree::slotWatchVideo()
 {
     cancelPopup();

mythvideo/mythvideo/videotree.h

@@ -30 +30 @@
     void slotVideoGallery();
     void slotVideoBrowser();
     void slotViewPlot();
+    void slotViewCast();
     void slotDoFilter();
     void slotWatchVideo();
 

mythvideo/theme/default/video-ui.xml

@@ -1350 +1350 @@
             <value>Country :</value>
          </textarea>
 
-         <textarea name="year_text" draworder="0" align="right">
+        <textarea name="cast_text" draworder="0" align="right">
             <area>50,174,320,34</area>
             <font>display</font>
+            <value>Actor/Actress :</value>
+        </textarea>
+
+        <textarea name="year_text" draworder="0" align="right">
+            <area>50,208,320,34</area>
+            <font>display</font>
             <value>Year :</value>
          </textarea>
 
          <textarea name="runtime_text" draworder="0" align="right">
-            <area>50,208,320,34</area>
+            <area>50,242,320,34</area>
             <font>display</font>
             <value>Runtime :</value>
          </textarea>
 
          <textarea name="userrating_text" draworder="0" align="right">
-            <area>50,242,320,34</area>
+            <area>50,276,320,34</area>
             <font>display</font>
             <value>User Rating :</value>
          </textarea>
 
          <textarea name="browse_text" draworder="0" align="right">
-            <area>50,276,320,34</area>
-            <font>display</font>
-            <value>Browse :</value>
-         </textarea>
-
-         <textarea name="inetref_text" draworder="0" align="right">
             <area>50,310,320,34</area>
             <font>display</font>
-            <value>InetRef :</value>
+            <value>Browse :</value>
          </textarea>
 
          <textarea name="coverfile_text" draworder="0" align="right">
@@ -1418 +1418 @@
             <image function="pushed" filename="leftright_pushed.png"></image>
          </selector>
 
-         <selector name="year_select" draworder="0">
+         <selector name="cast_select" draworder="0">
             <area>380,172,300,34</area>
             <font>display</font>
             <image function="on" filename="leftright_on.png"></image>
@@ -1426 +1426 @@
             <image function="pushed" filename="leftright_pushed.png"></image>
          </selector>
 
-         <selector name="runtime_select" draworder="0">
+         <selector name="year_select" draworder="0">
             <area>380,206,300,34</area>
             <font>display</font>
             <image function="on" filename="leftright_on.png"></image>
@@ -1434 +1434 @@
             <image function="pushed" filename="leftright_pushed.png"></image>
          </selector>
 
-         <selector name="userrating_select" draworder="0">
+         <selector name="runtime_select" draworder="0">
             <area>380,240,300,34</area>
             <font>display</font>
             <image function="on" filename="leftright_on.png"></image>
@@ -1442 +1442 @@
             <image function="pushed" filename="leftright_pushed.png"></image>
          </selector>
 
-         <selector name="browse_select" draworder="0">
+         <selector name="userrating_select" draworder="0">
             <area>380,274,300,34</area>
             <font>display</font>
             <image function="on" filename="leftright_on.png"></image>
@@ -1450 +1450 @@
             <image function="pushed" filename="leftright_pushed.png"></image>
          </selector>
 
-         <selector name="inetref_select" draworder="0">
+         <selector name="browse_select" draworder="0">
             <area>380,308,300,34</area>
             <font>display</font>
             <image function="on" filename="leftright_on.png"></image>

mythvideo/theme/default-wide/video-ui.xml

@@ -1350 +1350 @@
             <value>Country :</value>
          </textarea>
 
-         <textarea name="year_text" draworder="0" align="right">
+         <textarea name="cast_text" draworder="0" align="right">
             <area>0,220,572,40</area>
             <font>display</font>
-            <value>Year :</value>
+            <value>Actor/Actress :</value>
          </textarea>
 
-         <textarea name="runtime_text" draworder="0" align="right">
+         <textarea name="year_text" draworder="0" align="right">
             <area>0,260,572,40</area>
             <font>display</font>
-            <value>Runtime :</value>
+            <value>Year :</value>
          </textarea>
 
-         <textarea name="userrating_text" draworder="0" align="right">
+         <textarea name="runtime_text" draworder="0" align="right">
             <area>0,300,572,40</area>
             <font>display</font>
-            <value>User Rating :</value>
+            <value>Runtime :</value>
          </textarea>
 
-         <textarea name="browse_text" draworder="0" align="right">
+         <textarea name="userrating_text" draworder="0" align="right">
             <area>0,340,572,40</area>
             <font>display</font>
-            <value>Browse :</value>
+            <value>User Rating :</value>
          </textarea>
 
-         <textarea name="inetref_text" draworder="0" align="right">
+         <textarea name="browse_text" draworder="0" align="right">
             <area>0,380,572,40</area>
             <font>display</font>
-            <value>InetRef :</value>
+            <value>Browse :</value>
          </textarea>
 
          <textarea name="coverfile_text" draworder="0" align="right">