Ticket #640: browse.patch

mythflix/mythflix.cpp

@@ -58 +58 @@
     m_InColumn     = 0;
     m_UISites      = 0;
     m_UIArticles   = 0;
-    m_TimerTimeout = 10*60*1000; 
 
     setNoErase();
     loadTheme();
@@ -89 +88 @@
             new UIListBtnTypeItem(m_UISites, site->name());
         item->setData(site);
     }
-    
-    // Now do the actual work
-    m_RetrieveTimer = new QTimer(this);
-    connect(m_RetrieveTimer, SIGNAL(timeout()),
-            this, SLOT(slotRetrieveNews()));
-    m_UpdateFreq = gContext->GetNumSetting("NewsUpdateFrequency", 30);
-    m_RetrieveTimer->start(m_TimerTimeout, false);
 
+    
+    NewsSite* site = (NewsSite*) m_NewsSites.first();
+    connect(site, SIGNAL(finished(NewsSite*)),
+            this, SLOT(slotNewsRetrieved(NewsSite*)));
+    
     slotRetrieveNews();
 
-    slotSiteSelected((NewsSite*) m_NewsSites.first());
-
     netflixShopperId = gContext->GetSetting("NetflixShopperId");
     std::cerr << "MythFlix: Using NetflixShopperId " << netflixShopperId << std::endl;
 
@@ -109 +104 @@
 
 MythFlix::~MythFlix()
 {
-    m_RetrieveTimer->stop();
     delete m_Theme;
 }
 
@@ -412 +406 @@
             cursorLeft();
         else if (action == "RIGHT")
             cursorRight();
-        else if (action == "RETRIEVENEWS")
-            slotRetrieveNews();
         else if(action == "SELECT")
             slotViewArticle();
-        else if (action == "CANCEL")
-        {
-            cancelRetrieve();
-        }
         else
             handled = false;
     }
@@ -493 +481 @@
     if (m_NewsSites.count() == 0)
         return;
 
-    cancelRetrieve();
-
-    m_RetrieveTimer->stop();
-
     for (NewsSite* site = m_NewsSites.first(); site; site = m_NewsSites.next())
     {
-        site->stop();
-        connect(site, SIGNAL(finished(NewsSite*)),
-                this, SLOT(slotNewsRetrieved(NewsSite*)));
+        site->retrieve();
     }
 
-    for (NewsSite* site = m_NewsSites.first(); site; site = m_NewsSites.next())
-    {
-        if (site->timeSinceLastUpdate() > m_UpdateFreq)
-            site->retrieve();
-        else
-            processAndShowNews(site);
-    }
-
-    m_RetrieveTimer->start(m_TimerTimeout, false);
 }
 
 void MythFlix::slotNewsRetrieved(NewsSite* site)
 {
-    unsigned int updated = site->lastUpdated().toTime_t();
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("UPDATE netflix SET updated = :UPDATED "
-                  "WHERE name = :NAME ;");
-    query.bindValue(":UPDATED", updated);
-    query.bindValue(":NAME", site->name().utf8());
-    if (!query.exec() || !query.isActive())
-        MythContext::DBError("news update time", query);
-
     processAndShowNews(site);
 }
 
-void MythFlix::cancelRetrieve()
-{
-    for (NewsSite* site = m_NewsSites.first(); site;
-         site = m_NewsSites.next()) {
-        site->stop();
-        processAndShowNews(site);
-    }
-}
-
 void MythFlix::processAndShowNews(NewsSite* site)
 {
     if (!site)
@@ -565 +519 @@
         update(m_InfoRect);
     } 
 }
-void MythFlix::slotSiteSelected(NewsSite* site)
-{
-    if(!site)
-        return;
-        
-    m_UIArticles->Reset();
 
-    for (NewsArticle* article = site->articleList().first(); article;
-         article = site->articleList().next()) {
-        UIListBtnTypeItem* item =
-            new UIListBtnTypeItem(m_UIArticles, article->title());
-        item->setData(article);
-    }
-
-    update(m_SitesRect);
-    update(m_ArticlesRect);
-    update(m_InfoRect);
-}
-
 void MythFlix::slotSiteSelected(UIListBtnTypeItem *item)
 {
     if (!item || !item->getData())
         return;
     
-    slotSiteSelected((NewsSite*) item->getData());
+    processAndShowNews((NewsSite*) item->getData());
 }
 
 void MythFlix::slotArticleSelected(UIListBtnTypeItem*)
@@ -607 +543 @@
         NewsArticle *article = (NewsArticle*) articleUIItem->getData();
         if(article)
         {
+
+//            updateAddingView();
+
             QString cmdUrl(article->articleURL());
             cmdUrl.replace('\'', "%27");
 
@@ -641 +580 @@
       //do you listen for signal done
       //delete http;
 
-     if (debug)
+    if (debug)
         cerr << "MythFlix: Redirecting to (" << location << ")..." << endl;
 
-      http = new QHttp();
-      connect(http, SIGNAL(responseHeaderReceived (const QHttpResponseHeader&)), this, SLOT(slotMovieAdded(const QHttpResponseHeader&)));
+        http = new QHttp();
+        connect(http, SIGNAL(responseHeaderReceived (const QHttpResponseHeader&)), this, SLOT(slotMovieAdded(const QHttpResponseHeader&)));
 
-      QHttpRequestHeader header( "GET", location );
-      header.setValue( "Cookie", "validReEntryCookie=Y; validReEntryConfirmed=Y; NetflixShopperId=" + netflixShopperId + ";" );
-      header.setValue( "Host", "www.netflix.com" );
-      http->setHost( "www.netflix.com" );
-      http->request( header );
+        QHttpRequestHeader header( "GET", location );
+        header.setValue( "Cookie", "validReEntryCookie=Y; validReEntryConfirmed=Y; NetflixShopperId=" + netflixShopperId + ";" );
+        header.setValue( "Host", "www.netflix.com" );
+        http->setHost( "www.netflix.com" );
+        http->request( header );
     }
     else 
     {
-
-      //How do you clean up http objects
-      //do you listen for signal done
-      //delete http;
-
-/*
-     if (debug)
-        cerr << "MythFlix: Movie Added" << endl;
-
-      LayerSet* container = m_Theme->GetSet("info");
-      UITextType* ttype =
-        (UITextType *)container->GetType("status");
-        
-      if (ttype)
-        ttype->SetText("Added");
-
-*/        
-
     }
 }

mythflix/mythflix.h

@@ -73 +73 @@
 
     NewsSite::List m_NewsSites;
 
-    QTimer        *m_RetrieveTimer;
     QHttp         *http;
 
     QString        netflixShopperId;
 
-    int            m_TimerTimeout;
-    unsigned int   m_UpdateFreq;
-
 private slots:
     void slotViewArticle();
     void slotRetrieveNews();
     void slotNewsRetrieved(NewsSite* site);
 
     void slotSiteSelected(UIListBtnTypeItem *item);
-    void slotSiteSelected(NewsSite*);
-    
     void slotArticleSelected(UIListBtnTypeItem *item);
 
     void slotMovieAdded(const QHttpResponseHeader &resp);