Ticket #4990: mythnews_patch.patch

mythplugins/mythnews/mythnews/mythnews.cpp

@@ -946 +946 @@
                 if (!dir.exists())
                      dir.mkdir(fileprefix);
 
-                fileprefix += "/MythNews";
+                // Grabs the parent Site name and appends it to the fileprefix
 
-                dir = QDir(fileprefix);
-                if (!dir.exists())
-                    dir.mkdir(fileprefix);
+                fileprefix += "/MythNews/files/";
+                fileprefix += article->parent();
+                fileprefix.replace(" ", "_");
+                
+                // Some seriously dodgy code to grab the file name of the media file to be downloaded
+                QString filename;
 
-                QString sFilename(fileprefix + "/newstempfile");
+                filename = QRegExp::escape(article->title());
+                /* QStringList qstr = QStringList::split("/", cmdURL);
+                        for ( QStringList::Iterator it = qstr.begin(); it != qstr.end(); ++it ) {
+                                filename = QRegExp::escape(*it);
+                        } */
 
-                if (getHttpFile(sFilename, cmdURL))
-                {
-                    qApp->unlock();
-                    playVideo(sFilename);
-                    qApp->lock();
-                }
+                filename.replace(" ","_");
+                filename.replace("/","-"); // As per above, this ensures that there aren't any conflicts with linux file name formats
+                
+                QFile file(fileprefix + "/" + filename);
+                QString sFilename(fileprefix + "/" + filename);
+
+                if(!file.exists())
+                {
+                        dir = QDir(fileprefix);
+                        if (!dir.exists())
+                            dir.mkdir(fileprefix);
+
+        
+                        cout << sFilename << endl;
+
+                        if (getHttpFile(sFilename, cmdURL))
+                        {
+                            qApp->unlock();
+                                playVideo(QRegExp::escape(sFilename));
+                            qApp->lock();
+                        }
+                } else {
+                        qApp->unlock();
+                                playVideo(QRegExp::escape(sFilename));
+                        qApp->lock();
+                }
+
+
             } else {
                 QString cmdUrl(article->articleURL());
                 cmdUrl.replace('\'', "%27");
@@ -1207 +1236 @@
     }
     else
     {
+        /* This bit is causing me issues. Video and flash works fine, however audio files cause myth to lose the focus
+           and the external player is launched but doesn't have the focus, so key presses aren't being passed on.
+        */
         if (command_string.contains("%s"))
+            //command_string = "mplayer "+filename;
             command_string = command_string.replace(QRegExp("%s"), filename);
-
+                
+        cout << command_string << endl;
         myth_system(command_string);
     }
 

mythplugins/mythnews/mythnews/newsengine.cpp

@@ -55 +55 @@
 
 }
 
+const QString& NewsArticle::parent()
+{
+        //Added this function to allow for media downloads
+
+        return m_parent->name();
+}
+
+
 NewsSite::NewsSite(const QString& name,
                    const QString& url,
                    const QDateTime& updated)

mythplugins/mythnews/mythnews/newsengine.h

@@ -52 +52 @@
     const QString& thumbnail() const { return m_thumbnail; }
     const QString& mediaURL() const { return m_mediaURL; }
     const QString& enclosure() const { return m_enclosure; }
+    const QString& parent();
+    const QString& type() const {return m_enclosureType; }
 
 private: