MythArchive: Change the video selector to use the same parental level checking that MythVideo uses.

Author: Paul Harrison

mythplugins/mytharchive/mytharchive/videoselector.cpp

@@ -28,8 +28,12 @@ VideoSelector::VideoSelector(MythScreenStack *parent, QList<ArchiveItem *> *arch
               :MythScreenType(parent, "VideoSelector")
 {
     m_archiveList = archiveList;
-    m_currentParentalLevel = 1;
+    m_currentParentalLevel = ParentalLevel::plNone;
     m_videoList = NULL;
+
+    m_parentalLevelChecker = new ParentalLevelChangeChecker();
+    connect(m_parentalLevelChecker, SIGNAL(SigResultReady(bool, ParentalLevel::Level)),
+            this, SLOT(parentalLevelChanged(bool, ParentalLevel::Level)));
 }
 
 VideoSelector::~VideoSelector(void)
@@ -40,6 +44,8 @@ VideoSelector::~VideoSelector(void)
     while (!m_selectedList.isEmpty())
          delete m_selectedList.takeFirst();
     m_selectedList.clear();
+
+    delete m_parentalLevelChecker;
 }
 
 bool VideoSelector::Create(void)
@@ -86,6 +92,8 @@ bool VideoSelector::Create(void)
 
     SetFocusWidget(m_videoButtonList);
 
+    setParentalLevel(ParentalLevel::plLowest);
+
     updateSelectedList();
     updateVideoList();
 
@@ -112,19 +120,19 @@ bool VideoSelector::keyPressEvent(QKeyEvent *event)
         }
         else if (action == "1")
         {
-            setParentalLevel(1);
+            setParentalLevel(ParentalLevel::plLowest);
         }
         else if (action == "2")
         {
-            setParentalLevel(2);
+            setParentalLevel(ParentalLevel::plLow);
         }
         else if (action == "3")
         {
-            setParentalLevel(3);
+            setParentalLevel(ParentalLevel::plMedium);
         }
         else if (action == "4")
         {
-            setParentalLevel(4);
+            setParentalLevel(ParentalLevel::plHigh);
         }
         else
             handled = false;
@@ -521,79 +529,20 @@ void VideoSelector::updateSelectedList()
     }
 }
 
-void VideoSelector::setParentalLevel(int which_level)
+void VideoSelector::setParentalLevel(ParentalLevel::Level level)
 {
-    if (which_level < 1)
-        which_level = 1;
-
-    if (which_level > 4)
-        which_level = 4;
-
-    if ((which_level > m_currentParentalLevel) && !checkParentPassword())
-        which_level = m_currentParentalLevel;
-
-
-    if (m_currentParentalLevel != which_level)
-    {
-        m_currentParentalLevel = which_level;
-        updateVideoList();
-        m_plText->SetText(QString::number(which_level));
-    }
+    m_parentalLevelChecker->Check(m_currentParentalLevel, level);
 }
 
-bool VideoSelector::checkParentPassword()
+void VideoSelector::parentalLevelChanged(bool passwordValid, ParentalLevel::Level newLevel)
 {
-    QDateTime curr_time = QDateTime::currentDateTime();
-    QString last_time_stamp = gCoreContext->GetSetting("VideoPasswordTime");
-    QString password = gCoreContext->GetSetting("VideoAdminPassword");
-    if (password.length() < 1)
+    if (passwordValid)
     {
-        return true;
-    }
-
-    //  See if we recently (and succesfully) asked for a password
-    if (last_time_stamp.length() < 1)
-    {
-        //  Probably first time used
-    }
-    else
-    {
-        QDateTime last_time = QDateTime::fromString(last_time_stamp,
-                                                    Qt::TextDate);
-        if (last_time.secsTo(curr_time) < 120)
-        {
-            //  Two minute window
-            last_time_stamp = curr_time.toString(Qt::TextDate);
-            gCoreContext->SetSetting("VideoPasswordTime", last_time_stamp);
-            gCoreContext->SaveSetting("VideoPasswordTime", last_time_stamp);
-            return true;
-        }
-    }
-
-    //  See if there is a password set
-    if (password.length() > 0)
-    {
-        bool ok = false;
-        MythPasswordDialog *pwd = new MythPasswordDialog(tr("Parental Pin:"),
-                &ok,
-                password,
-                GetMythMainWindow());
-        pwd->exec();
-        pwd->deleteLater();
-        if (ok)
-        {
-            //  All is good
-            last_time_stamp = curr_time.toString(Qt::TextDate);
-            gCoreContext->SetSetting("VideoPasswordTime", last_time_stamp);
-            gCoreContext->SaveSetting("VideoPasswordTime", last_time_stamp);
-            return true;
-        }
+        m_currentParentalLevel = newLevel;
+        updateVideoList();
+        m_plText->SetText(QString::number(newLevel));
     }
     else
-    {
-        return true;
-    }
-
-    return false;
+        ShowOkPopup(tr("You need to enter a valid password for this parental level"));
 }
 

mythplugins/mytharchive/mytharchive/videoselector.h

@@ -12,6 +12,7 @@
 
 // mythtv
 #include <mythscreentype.h>
+#include <metadata/parentalcontrols.h>
 
 // mytharchive
 #include "archiveutil.h"
@@ -22,7 +23,6 @@ class MythUIButton;
 class MythUIButtonList;
 class MythUIButtonListItem;
 
-
 typedef struct
 {
     int     id;
@@ -62,20 +62,23 @@ class VideoSelector : public MythScreenType
     void titleChanged(MythUIButtonListItem *item);
     void toggleSelected(MythUIButtonListItem *item);
 
+    void parentalLevelChanged(bool passwordValid, ParentalLevel::Level newLevel);
+
   private:
     void updateVideoList(void);
     void updateSelectedList(void);
     void getVideoList(void);
     void wireUpTheme(void);
     std::vector<VideoInfo *> *getVideoListFromDB(void);
-    bool checkParentPassword(void);
-    void setParentalLevel(int which_level);
+    void setParentalLevel(ParentalLevel::Level level);
+
+    ParentalLevelChangeChecker *m_parentalLevelChecker;
 
     QList<ArchiveItem *>     *m_archiveList;
     std::vector<VideoInfo *> *m_videoList;
     QList<VideoInfo *>        m_selectedList;
 
-    int               m_currentParentalLevel;
+    ParentalLevel::Level      m_currentParentalLevel;
 
     MythUIText       *m_plText;
     MythUIButtonList *m_videoButtonList;