Index: mythgallery/glsingleview.cpp =================================================================== --- mythgallery/glsingleview.cpp (revision 15270) +++ mythgallery/glsingleview.cpp (working copy) @@ -37,6 +37,7 @@ // MythTV plugin headers #include #include +#include // MythGallery headers #include "glsingleview.h" @@ -94,6 +95,7 @@ m_effect_cube_yrot(0.0f), m_effect_cube_zrot(0.0f) { + m_phpGalleryURL = gContext->GetSetting("PHPGalleryURL", NULL); m_slideshow_timer = new QTimer(this); RegisterEffects(); @@ -506,7 +508,13 @@ if (QFile::exists(item->GetPath())) { break; - } + } + else if (m_phpGalleryURL.startsWith("http://",false)) + { + QString url = gContext->GetSetting("PHPGalleryURL")+"?g2_view=core.DownloadItem&g2_itemId="+item->GetName(); + HttpComms::getHttpFile(item->GetPath(), url, 20000); + break; + } } if (m_pos == oldpos) { @@ -539,8 +547,19 @@ m_pos = m_slideshow_sequence->prev(); ThumbItem *item = m_itemList.at(m_pos); - if (item && QFile::exists(item->GetPath())) - break; + if (item) + { + if (QFile::exists(item->GetPath())) + { + break; + } + else if (m_phpGalleryURL.startsWith("http://",false)) + { + QString url = gContext->GetSetting("PHPGalleryURL")+"?g2_view=core.DownloadItem&g2_itemId="+item->GetName(); + HttpComms::getHttpFile(item->GetPath(), url, 20000); + break; + } + } if (m_pos == oldpos) { @@ -572,6 +591,10 @@ return; } + if (!QFile::exists(item->GetPath()) && m_phpGalleryURL.startsWith("http://",false)){ + QString url = gContext->GetSetting("PHPGalleryURL")+"?g2_view=core.DownloadItem&g2_itemId="+item->GetName(); + HttpComms::getHttpFile(item->GetPath(), url, 20000); + } QImage image(item->GetPath()); if (image.isNull()) return; Index: mythgallery/glsingleview.h =================================================================== --- mythgallery/glsingleview.h (revision 15270) +++ mythgallery/glsingleview.h (working copy) @@ -133,6 +133,7 @@ float m_effect_cube_xrot; float m_effect_cube_yrot; float m_effect_cube_zrot; + QString m_phpGalleryURL; }; #endif // USING_OPENGL Index: mythgallery/phpgalleryutil.cpp =================================================================== --- mythgallery/phpgalleryutil.cpp (revision 0) +++ mythgallery/phpgalleryutil.cpp (revision 0) @@ -0,0 +1,302 @@ +// +// C++ Implementation: PhpGalleryUtil +// +// Description: +// +// +// Author: mythtv , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// + +#include + +#include +#include + + +#include "phpgalleryutil.h" + +PhpGalleryUtil::PhpGalleryUtil() +{ + m_startURL = gContext->GetSetting("PHPGalleryURL"); + m_startDir = gContext->GetSetting("GalleryDir"); + m_refreshCache = gContext->GetNumSetting("PHPGalleryRefreshCache"); + QString response = MakeRequest("fetch-albums&g2_form%5Bno_perms%5D=yes"); + QStringList responseLines = QStringList::split("\n",response); + QString albumNumber = NULL; + for ( QStringList::Iterator it = responseLines.begin(); it != responseLines.end(); ++it ) { + QStringList nameList; + QString propValue; + ReadResponseLine(*it, nameList, propValue); + if ((nameList[0].compare("album")==0)&&((nameList.last()).compare(albumNumber)!=0)) { + QString albumName=NULL; + QString albumTitle=NULL; + QString albumParent=NULL; + albumNumber = nameList.last(); + if (nameList[1].compare("name")==0){ + albumName = propValue; + } + ReadResponseLine(*++it, nameList, propValue); + if ((nameList[1].compare("title")==0)&&((nameList.last()).compare(albumNumber)==0)) { + albumTitle = propValue; + } + it++; + ReadResponseLine(*++it, nameList, propValue); + if ((nameList[1].compare("parent")==0)&&((nameList.last()).compare(albumNumber)==0)) { + albumParent = propValue; + } + if (albumParent.compare("0")==0){ + m_rootAlbum = new Album(albumName, albumTitle, albumParent);; + } + else + { + Album *album = new Album(albumName, albumTitle, albumParent); + m_all_albums.append(album); + m_temp_album_dict.insert(album->GetName(),album); + } + + } + + } + QPtrListIterator it( m_all_albums ); + Album *thisalbum; + + while ((thisalbum = it.current()) != 0){ + thisalbum->SetPath(BuildPath(thisalbum,thisalbum->GetName())); + m_album_dict.insert(thisalbum->GetName(),thisalbum); + ++it; + } + +} + +QString PhpGalleryUtil::BuildPath(Album *album, QString path){ + if (album->GetParent().compare(m_rootAlbum->GetName())==0){ + path.prepend(m_startDir + "/"); + QDir dir(path); + if (!dir.exists()){ + dir.mkdir(path,true); + } + return path; + } else { + path.prepend(album->GetParent()+"/"); + return BuildPath(m_temp_album_dict.find(album->GetParent()),path); + } +} + + +void PhpGalleryUtil::ReadResponseLine(QString responseLine, QStringList &nameList, QString &propValue){ + QStringList propertyMap = QStringList::split("=", responseLine); + QString propName = propertyMap[0]; + propValue = propertyMap[1]; + nameList = QStringList::split(".", propName); +} + + +bool PhpGalleryUtil::LoadDirectory(ThumbList& itemList, const QString& dir, + ThumbDict *itemDict, ThumbGenerator* thumbGen) +{ + + Album *album; + QString album_name; + if (dir.compare(m_startDir)==0){ + album = m_rootAlbum; + album_name = m_rootAlbum->GetName(); + } else { + album_name = dir.section("/",-1); + album = m_album_dict.find(album_name); + } + + //go through m_all_albums and find any albums that have this album as a parent + QPtrListIterator it( m_all_albums ); + Album *thisalbum; + + while ((thisalbum = it.current()) != 0){ + if (thisalbum->GetParent().compare(album_name) == 0){ + GetItems(thisalbum, itemList, itemDict, thumbGen, true, thisalbum->GetTitle(), thisalbum->GetPath()); + } + ++it; + } + + //get Items for this album + GetItems(album, itemList, itemDict, thumbGen, false); + + return true; +} + + +bool PhpGalleryUtil::GetItems(Album *album, ThumbList& thumbList, ThumbDict *itemDict, ThumbGenerator* thumbGen, bool highlight, QString caption, QString path){ + + if (highlight){ + QDir dir(album->GetPath()); + QStringList files = dir.entryList("*-highlight.jpg"); + if (files[0] != NULL && !m_refreshCache ){ + QString itemName = files[0].section("-",0,0); + ThumbItem *thumbItem = new ThumbItem(itemName, path, true); + thumbItem->SetCaption(caption); + QImage *image = new QImage(album->GetPath()+ "/" + files[0]); + QPixmap *pixmap = new QPixmap(*image); + thumbItem->SetPixmap(pixmap); + thumbList.append(thumbItem); + if (itemDict) + itemDict->insert(thumbItem->GetName(), thumbItem); + if (thumbGen) + thumbGen->addFile(thumbItem->GetName()); + return true; + } + } + QString response = MakeRequest("fetch-album-images&g2_form%5Bset_albumName%5D=" + album->GetName()); + QStringList responseLines = QStringList::split("\n",response); + QString itemNumber = NULL; + for ( QStringList::Iterator it = responseLines.begin(); it != responseLines.end(); ++it ) { + QStringList nameList; + QString propValue; + ReadResponseLine(*it, nameList, propValue); + if ((nameList[0].compare("image")==0)&&(nameList.last().compare(itemNumber)!=0)) { + +// image.name.1=12227 +// image.raw_width.1=3008 +// image.raw_height.1=2000 +// image.raw_filesize.1=1196696 +// image.resizedName.1=12228 if exists +// image.resized_width.1=640 if exists +// image.resized_height.1=426 if exists +// image.thumbName.1=12229 +// image.thumb_width.1=150 +// image.thumb_height.1=100 +// image.forceExtension.1=jpg +// image.caption.1=DSC_0005.JPG +// image.title.1=DSC_0005.JPG +// image.hidden.1=no + + QString itemName=NULL; + QString thumbName=NULL; + QString itemTitle=NULL; + QString itemParent=NULL; + QString itemExtension=NULL; + + itemNumber = nameList.last(); + if (nameList[1].compare("name")==0){ + itemName = propValue; + } + it+=4; + ReadResponseLine(*it, nameList, propValue); + if (nameList[1].compare("resizedName")==0){ + itemName = propValue; + it+=3; + } + + ReadResponseLine(*it, nameList, propValue); + if (nameList[1].compare("thumbName")==0){ + thumbName = propValue; + } + it+=2; + ReadResponseLine(*++it, nameList, propValue); + if ((nameList[1].compare("forceExtension")==0)&&(nameList.last().compare(itemNumber)==0)) { + itemExtension = propValue; + } + ++it; + ReadResponseLine(*++it, nameList, propValue); + if ((nameList[1].compare("title")==0)&&(nameList.last().compare(itemNumber)==0)) { + itemTitle = propValue; + } + //make and set QPixmap + QDir dir(album->GetPath()); + if (!dir.exists()) + dir.mkdir(album->GetPath()); + + QString tempFile; + if (highlight){ + tempFile = album->GetPath() + "/" + itemName + "-highlight.jpg"; + } else { + tempFile = album->GetPath() + "/" + thumbName + "." + itemExtension; + } + QString url = m_startURL+"?g2_view=core.DownloadItem&g2_itemId="+thumbName; + + if (!QFile::exists(tempFile)|| m_refreshCache ){ + HttpComms::getHttpFile(tempFile, url, 20000, 3); + } + QImage *image = new QImage(tempFile); + QPixmap *pixmap = new QPixmap(*image); + + ThumbItem *thumbItem; + if (highlight){ //if album + thumbItem = new ThumbItem(itemName, path, true); + thumbItem->SetCaption(caption); + } else{ + thumbItem = new ThumbItem(itemName, album->GetPath()+"/"+itemName+"."+itemExtension, false); + thumbItem->SetCaption(itemTitle); + } + thumbItem->SetPixmap(pixmap); + thumbList.append(thumbItem); + if (itemDict) + itemDict->insert(thumbItem->GetName(), thumbItem); + + if (thumbGen) + thumbGen->addFile(thumbItem->GetName()); + if (highlight){ + return true; + } + } + } + if (highlight) //If we have gotten this far it means the album does not have any items of its own, lets check for a highlight from a subalbum recursively + { + //go through m_all_albums and find any albums that have this album as a parent + QPtrListIterator it( m_all_albums ); + Album *thisalbum; + while ((thisalbum = it.current()) != 0){ + if (thisalbum->GetParent().compare(album->GetName()) == 0){ + if (GetItems(thisalbum, thumbList, itemDict, thumbGen, true, album->GetTitle(),album->GetPath())){ + return true; + } + } + ++it; + } + return false; + } + return true; +} + +QString PhpGalleryUtil::MakeRequest(QString cmd){ + QUrl url = m_startURL; + + // Make Request to server + QByteArray aBuffer; + QTextStream os( aBuffer, IO_WriteOnly ); + os << "g2_controller=remote%3AGalleryRemote&protocol_version=2.11&g2_form%5Bcmd%5D="; + os << cmd; + QBuffer buff( aBuffer ); + QHttpRequestHeader header; + + header.setValue("Accept", "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/vnd.ms-excel, application/vnd.ms-powerpoint,application/msword, application/x-shockwave-flash, */*" ); + header.setValue("Accept-Language", "en-us"); + header.setValue("Content-Type", "application/x-www-form-urlencoded"); + header.setValue("Connection", "Keep-Alive"); + header.setValue("Cache-Control", "no-cache"); + + QString response = HttpComms::postHttp( url, + &header, + &buff, + 20000, // ms + 3, // retries + 0, // redirects + false, // allow gzip + NULL, // login + true ); + return response; + +} + +Album::Album(QString albumName, QString albumTitle, QString albumParent, QString albumPath){ + m_name = albumName; + m_title = albumTitle; + m_parent = albumParent; + m_path = albumPath; +} + +Album::Album(QString albumName, QString albumTitle, QString albumParent){ + m_name = albumName; + m_title = albumTitle; + m_parent = albumParent; +} Index: mythgallery/phpgalleryutil.h =================================================================== --- mythgallery/phpgalleryutil.h (revision 0) +++ mythgallery/phpgalleryutil.h (revision 0) @@ -0,0 +1,63 @@ +// +// C++ Interface: PhpGalleryUtil +// +// Description: +// +// +// Author: mythtv , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// + +#include +#include +#include "thumbview.h" +#include "thumbgenerator.h" + +class Album +{ +public: + Album(QString albumName, QString albumTitle, QString albumParent, QString path); + Album(QString albumName, QString albumTitle, QString albumParent); + QString GetName(){return m_name;} + QString GetTitle(){return m_title;} + QString GetParent(){return m_parent;} + QString GetPath(){return m_path;} + void SetPath(QString path){m_path = path;} + void SetItems(ThumbList *itemList){m_items = itemList;} +private: + QString m_name; + QString m_title; + QString m_parent; + QString m_path; + ThumbList *m_items; +}; + +class PhpGalleryUtil +{ + public: + PhpGalleryUtil(); + bool LoadDirectory(ThumbList &itemList, const QString &dir, + ThumbDict *itemDict, ThumbGenerator *thumbGen); + Album *GetRootAlbum(){return m_rootAlbum;} + + + + private: + void ReadResponseLine(QString responseLine, QStringList &nameList, QString &propValue); + bool GetItems(Album *album, ThumbList& thumblist, ThumbDict *itemDict, ThumbGenerator* thumbGen, bool highlight, QString caption = NULL, QString path = NULL); + + QString MakeRequest(QString cmd); + QString BuildPath(Album *album, QString path); + QString m_startURL; + QString m_startDir; + Album *m_rootAlbum; + int m_refreshCache; + QPtrList m_all_albums; + QDict m_temp_album_dict; + QDict m_album_dict; + + +}; + Index: mythgallery/singleview.cpp =================================================================== --- mythgallery/singleview.cpp (revision 15270) +++ mythgallery/singleview.cpp (working copy) @@ -34,6 +34,7 @@ // MythTV plugin headers #include #include +#include // MythGallery headers #include "singleview.h" @@ -88,6 +89,7 @@ m_effect_milti_circle_out_points(4), m_effect_circle_out_points(4) { + m_phpGalleryURL = gContext->GetSetting("PHPGalleryURL", NULL); m_slideshow_timer = new QTimer(this); RegisterEffects(); @@ -505,7 +507,13 @@ if (QFile::exists(item->GetPath())) { break; - } + } + else if (m_phpGalleryURL.startsWith("http://",false)) + { + QString url = gContext->GetSetting("PHPGalleryURL")+"?g2_view=core.DownloadItem&g2_itemId="+item->GetName(); + HttpComms::getHttpFile(item->GetPath(), url, 20000); + break; + } } if (m_pos == oldpos) { @@ -535,8 +543,19 @@ m_pos = m_slideshow_sequence->prev(); ThumbItem *item = m_itemList.at(m_pos); - if (item && QFile::exists(item->GetPath())) - break; + if (item) + { + if (QFile::exists(item->GetPath())) + { + break; + } + else if (m_phpGalleryURL.startsWith("http://",false)) + { + QString url = gContext->GetSetting("PHPGalleryURL")+"?g2_view=core.DownloadItem&g2_itemId="+item->GetName(); + HttpComms::getHttpFile(item->GetPath(), url, 20000); + break; + } + } if (m_pos == oldpos) { @@ -567,6 +586,10 @@ m_movieState = 1; return; } + if (!QFile::exists(item->GetPath()) && m_phpGalleryURL.startsWith("http://",false)){ + QString url = gContext->GetSetting("PHPGalleryURL")+"?g2_view=core.DownloadItem&g2_itemId="+item->GetName(); + HttpComms::getHttpFile(item->GetPath(), url, 20000); + } m_image.load(item->GetPath()); if (m_image.isNull()) Index: mythgallery/mythgallery.pro =================================================================== --- mythgallery/mythgallery.pro (revision 15270) +++ mythgallery/mythgallery.pro (working copy) @@ -29,12 +29,14 @@ HEADERS += qtiffio.h galleryutil.h HEADERS += constants.h HEADERS += thumbgenerator.h thumbview.h +HEADERS += phpgalleryutil.h SOURCES += iconview.cpp singleview.cpp SOURCES += imageview.cpp SOURCES += gallerysettings.cpp dbcheck.cpp SOURCES += qtiffio.cpp galleryutil.cpp SOURCES += thumbgenerator.cpp thumbview.cpp -SOURCES += main.cpp +SOURCES += phpgalleryutil.cpp +SOURCES += main.cpp opengl { SOURCES *= glsingleview.cpp gltexture.cpp Index: mythgallery/gallerysettings.cpp =================================================================== --- mythgallery/gallerysettings.cpp (revision 15270) +++ mythgallery/gallerysettings.cpp (working copy) @@ -34,6 +34,23 @@ return gc; }; +static HostLineEdit *MythGalleryPHPGalleryURL() +{ + HostLineEdit *gc = new HostLineEdit("PHPGalleryURL"); + gc->setLabel(QObject::tr("URL of PHP Gallery")); + gc->setHelpText(QObject::tr("For example: http://www.mygallery.com/gallery2/main.php")); + return gc; +}; + +static HostCheckBox *MythGalleryRefreshPHPGalleryCache() +{ + HostCheckBox *gc = new HostCheckBox("PHPGalleryRefreshCache"); + gc->setLabel(QObject::tr("Refresh PHP Gallery Cache")); + gc->setValue(false); + gc->setHelpText(QObject::tr("Do not use existing cached PHP Gallery data. This will slow load time significantly. Must uncheck when done to start using cached data again.")); + return gc; +}; + static HostComboBox *MythGallerySortOrder() { HostComboBox *gc = new HostComboBox("GallerySortOrder"); @@ -215,6 +232,8 @@ general->setLabel(QObject::tr("MythGallery Settings (General)")); general->addChild(MythGalleryDir()); general->addChild(MythGalleryThumbnailLocation()); + general->addChild(MythGalleryPHPGalleryURL()); + general->addChild(MythGalleryRefreshPHPGalleryCache()); general->addChild(MythGallerySortOrder()); general->addChild(MythGalleryImportDirs()); general->addChild(MythGalleryMoviePlayerCmd()); Index: mythgallery/singleview.h =================================================================== --- mythgallery/singleview.h (revision 15270) +++ mythgallery/singleview.h (working copy) @@ -131,6 +131,7 @@ float m_effect_multi_circle_out_delta_alpha; QPointArray m_effect_milti_circle_out_points; QPointArray m_effect_circle_out_points; + QString m_phpGalleryURL; }; #endif /* SINGLEVIEW_H */ Index: mythgallery/iconview.cpp =================================================================== --- mythgallery/iconview.cpp (revision 15270) +++ mythgallery/iconview.cpp (working copy) @@ -87,6 +87,14 @@ ":", gContext->GetSetting("GalleryImportDirs"))), m_errorStr(QString::null) { + m_phpGalleryURL = gContext->GetSetting("PHPGalleryURL", NULL); + if (m_phpGalleryURL!= NULL){ + m_phpGalleryUtil = new PhpGalleryUtil(); + if (m_phpGalleryUtil->GetRootAlbum() == NULL){ + m_errorStr = tr("MythGallery failed any PHP Gallery items. Probably a bad URL: %1").arg(m_phpGalleryURL); + return; + } + } m_itemList.setAutoDelete(true); m_itemDict.setAutoDelete(false); @@ -892,8 +900,10 @@ item->setData(new MenuAction(&IconView::HandleSubMenuMetadata)); item = new UIListBtnTypeItem(m_menuType, tr("Marking...")); item->setData(new MenuAction(&IconView::HandleSubMenuMark)); - item = new UIListBtnTypeItem(m_menuType, tr("File...")); - item->setData(new MenuAction(&IconView::HandleSubMenuFile)); + if(!m_phpGalleryURL.startsWith("http://",false)){ + item = new UIListBtnTypeItem(m_menuType, tr("File...")); + item->setData(new MenuAction(&IconView::HandleSubMenuFile)); + } item = new UIListBtnTypeItem(m_menuType, tr("Settings")); item->setData(new MenuAction(&IconView::HandleSettings)); @@ -980,8 +990,17 @@ m_itemList.clear(); m_itemDict.clear(); - m_isGallery = GalleryUtil::LoadDirectory(m_itemList, dir, m_sortorder, + if (m_phpGalleryURL.startsWith("http://",false)) + { + //PHP Gallery installation + + m_isGallery = m_phpGalleryUtil->LoadDirectory(m_itemList, dir, &m_itemDict, m_thumbGen); + } + else + { + m_isGallery = GalleryUtil::LoadDirectory(m_itemList, dir, m_sortorder, false, &m_itemDict, m_thumbGen); + } m_lastRow = max((int)ceilf((float)m_itemList.count() / (float)m_nCols) - 1, 0); Index: mythgallery/iconview.h =================================================================== --- mythgallery/iconview.h (revision 15270) +++ mythgallery/iconview.h (working copy) @@ -28,6 +28,7 @@ // MythGallery headers #include "thumbview.h" +#include "phpgalleryutil.h" class XMLParse; class UIListBtnType; @@ -114,7 +115,8 @@ QDict m_itemDict; QStringList m_itemMarked; QString m_galleryDir; - + QString m_phpGalleryURL; + XMLParse *m_theme; QRect m_menuRect; QRect m_textRect; @@ -160,6 +162,7 @@ QStringList m_paths; QString m_errorStr; + PhpGalleryUtil *m_phpGalleryUtil; typedef void (IconView::*MenuAction)(void); Index: mythgallery/thumbgenerator.h =================================================================== --- mythgallery/thumbgenerator.h (revision 15270) +++ mythgallery/thumbgenerator.h (working copy) @@ -26,6 +26,7 @@ #include #include #include +#include class QObject; class QImage;