From a4b7d609b13bbca796e5bf0dce45d91fd417ff2e Mon Sep 17 00:00:00 2001 From: Daniel Thor Kristjansson Date: Thu, 20 Dec 2012 09:56:14 -0500 Subject: [PATCH] General cleanup of videolist.cpp for readability. --- mythtv/programs/mythfrontend/videolist.cpp | 230 +++++++++++---------- 1 file changed, 122 insertions(+), 108 deletions(-) diff --git a/mythtv/programs/mythfrontend/videolist.cpp b/mythtv/programs/mythfrontend/videolist.cpp index a550a884fde..3c96397185c 100644 --- a/mythtv/programs/mythfrontend/videolist.cpp +++ b/mythtv/programs/mythfrontend/videolist.cpp @@ -1,6 +1,7 @@ #include #include #include +using namespace std; #include #include @@ -40,27 +41,27 @@ class TreeNodeDataPrivate { } - VideoMetadata *GetMetadata() + VideoMetadata *GetMetadata(void) { return m_metadata; } - const VideoMetadata *GetMetadata() const + const VideoMetadata *GetMetadata(void) const { return m_metadata; } - QString GetPath() const + QString GetPath(void) const { return m_path; } - QString GetHost() const + QString GetHost(void) const { return m_host; } - QString GetPrefix() const + QString GetPrefix(void) const { return m_prefix; } @@ -107,7 +108,7 @@ TreeNodeData::~TreeNodeData() delete m_d; } -VideoMetadata *TreeNodeData::GetMetadata() +VideoMetadata *TreeNodeData::GetMetadata(void) { if (m_d) return m_d->GetMetadata(); @@ -115,7 +116,7 @@ VideoMetadata *TreeNodeData::GetMetadata() return NULL; } -const VideoMetadata *TreeNodeData::GetMetadata() const +const VideoMetadata *TreeNodeData::GetMetadata(void) const { if (m_d) return m_d->GetMetadata(); @@ -123,21 +124,21 @@ const VideoMetadata *TreeNodeData::GetMetadata() const return NULL; } -QString TreeNodeData::GetPath() const +QString TreeNodeData::GetPath(void) const { if (m_d) return m_d->GetPath(); return QString(); } -QString TreeNodeData::GetHost() const +QString TreeNodeData::GetHost(void) const { if (m_d) return m_d->GetHost(); return QString(); } -QString TreeNodeData::GetPrefix() const +QString TreeNodeData::GetPrefix(void) const { if (m_d) return m_d->GetPrefix(); @@ -148,7 +149,7 @@ QString TreeNodeData::GetPrefix() const struct metadata_sort { metadata_sort(const VideoFilterSettings &vfs, bool sort_ignores_case) : - m_vfs(vfs), m_sic(sort_ignores_case) {} + m_vfs(vfs), m_sic(sort_ignores_case) {} bool operator()(const VideoMetadata *lhs, const VideoMetadata *rhs) { @@ -161,7 +162,7 @@ struct metadata_sort m_sic); } - private: + private: const VideoFilterSettings &m_vfs; bool m_sic; }; @@ -185,7 +186,7 @@ struct metadata_path_sort return sort(lhs->getPath(), rhs->getPath()); } - private: + private: bool sort(const VideoMetadata *lhs, const VideoMetadata *rhs) { return sort(lhs->GetFilename(), rhs->GetFilename()); @@ -233,7 +234,7 @@ static meta_dir_node *AddMetadataToDir(VideoMetadata *metadata, { start = hint; insert_chunk = - metadata->GetFilename().mid(hint->getFQPath().length()); + metadata->GetFilename().mid(hint->getFQPath().length()); } } @@ -275,7 +276,8 @@ struct to_metadata_ptr return &data; } - VideoMetadata *operator()(const VideoMetadataListManager::VideoMetadataPtr &data) + VideoMetadata *operator()( + const VideoMetadataListManager::VideoMetadataPtr &data) { return data.get(); } @@ -289,13 +291,14 @@ enum NodeOrder { kOrderItem }; -static MythGenericTree *AddDirNode(MythGenericTree *where_to_add, - QString name, QString fqPath, bool add_up_dirs, - QString host = "", QString prefix = "") +static MythGenericTree *AddDirNode( + MythGenericTree *where_to_add, + QString name, QString fqPath, bool add_up_dirs, + QString host = "", QString prefix = "") { // Add the subdir node... MythGenericTree *sub_node = - where_to_add->addNode(name, kSubFolder, false); + where_to_add->addNode(name, kSubFolder, false); sub_node->setAttribute(kNodeSort, kOrderSub); sub_node->setOrderingIndex(kNodeSort); sub_node->SetData(QVariant::fromValue(TreeNodeData(fqPath, host, prefix))); @@ -306,8 +309,8 @@ static MythGenericTree *AddDirNode(MythGenericTree *where_to_add, if (add_up_dirs) { MythGenericTree *up_node = - sub_node->addNode(where_to_add->getString(), kUpFolder, - true, false); + sub_node->addNode(where_to_add->getString(), kUpFolder, + true, false); up_node->setAttribute(kNodeSort, kOrderUp); up_node->setOrderingIndex(kNodeSort); up_node->DisplayState("subfolder", "nodetype"); @@ -354,7 +357,7 @@ static int AddFileNode(MythGenericTree *where_to_add, QString name, class VideoListImp { public: - typedef std::vector metadata_view_list; + typedef vector metadata_view_list; private: enum metadata_list_type { ltNone, ltFileSystem, ltDBMetadata, @@ -371,15 +374,16 @@ class VideoListImp void build_generic_tree(MythGenericTree *dst, meta_dir_node *src, bool include_updirs); - MythGenericTree *buildVideoList(bool filebrowser, bool flatlist, - int group_type, const ParentalLevel &parental_level, - bool include_updirs); + MythGenericTree *buildVideoList( + bool filebrowser, bool flatlist, + int group_type, const ParentalLevel &parental_level, + bool include_updirs); void refreshList(bool filebrowser, const ParentalLevel &parental_level, bool flatlist, int group_type); bool refreshNode(MythGenericTree *node); - unsigned int count() const + unsigned int count(void) const { return m_metadata_view_flat.size(); } @@ -405,12 +409,12 @@ class VideoListImp return ret; } - const VideoMetadataListManager &getListCache() const + const VideoMetadataListManager &getListCache(void) const { return m_metadata; } - unsigned int getFilterChangedState() + unsigned int getFilterChangedState(void) { return m_video_filter.getChangedState(); } @@ -428,7 +432,7 @@ class VideoListImp return ret; } - MythGenericTree *GetTreeRoot() + MythGenericTree *GetTreeRoot(void) { return video_tree_root.data(); } @@ -447,10 +451,10 @@ class VideoListImp void sort_view_data(bool flat_list); void fillMetadata(metadata_list_type whence); - void buildFsysList(); + void buildFsysList(void); void buildGroupList(metadata_list_type whence); - void buildDbList(); - void buildTVList(); + void buildDbList(void); + void buildTVList(void); void buildFileList(smart_dir_node &directory, metadata_list &metalist, const QString &prefix); @@ -483,7 +487,8 @@ VideoList::~VideoList() delete m_imp; } -MythGenericTree *VideoList::buildVideoList(bool filebrowser, bool flatlist, +MythGenericTree *VideoList::buildVideoList( + bool filebrowser, bool flatlist, int group_type, const ParentalLevel &parental_level, bool include_updirs) { @@ -503,12 +508,12 @@ bool VideoList::refreshNode(MythGenericTree *node) return m_imp->refreshNode(node); } -unsigned int VideoList::count() const +unsigned int VideoList::count(void) const { return m_imp->count(); } -const VideoFilterSettings &VideoList::getCurrentVideoFilter() const +const VideoFilterSettings &VideoList::getCurrentVideoFilter(void) const { return m_imp->getCurrentVideoFilter(); } @@ -523,12 +528,12 @@ int VideoList::TryFilter(const VideoFilterSettings &filter) const return m_imp->TryFilter(filter); } -const VideoMetadataListManager &VideoList::getListCache() const +const VideoMetadataListManager &VideoList::getListCache(void) const { return m_imp->getListCache(); } -unsigned int VideoList::getFilterChangedState() +unsigned int VideoList::getFilterChangedState(void) { return m_imp->getFilterChangedState(); } @@ -538,12 +543,12 @@ bool VideoList::Delete(int video_id) return m_imp->Delete(video_id, *this); } -MythGenericTree *VideoList::GetTreeRoot() +MythGenericTree *VideoList::GetTreeRoot(void) { return m_imp->GetTreeRoot(); } -void VideoList::InvalidateCache() +void VideoList::InvalidateCache(void) { return m_imp->InvalidateCache(); } @@ -552,7 +557,7 @@ void VideoList::InvalidateCache() // VideoListImp ////////////////////////////// VideoListImp::VideoListImp() : m_metadata_view_tree("", "top"), - m_metadata_list_type(ltNone) + m_metadata_list_type(ltNone) { m_ListUnknown = gCoreContext->GetNumSetting("VideoListUnknownFileTypes", 0); @@ -579,9 +584,10 @@ void VideoListImp::build_generic_tree(MythGenericTree *dst, meta_dir_node *src, if (!dst->getParent()) incUpDir = false; - MythGenericTree *t = AddDirNode(dst, (*dir)->getName(), - (*dir)->getFQPath(), incUpDir, (*dir)->GetHost(), - (*dir)->GetPrefix()); + MythGenericTree *t = AddDirNode( + dst, (*dir)->getName(), + (*dir)->getFQPath(), incUpDir, (*dir)->GetHost(), + (*dir)->GetPrefix()); build_generic_tree(t, dir->get(), include_updirs); } @@ -591,29 +597,36 @@ void VideoListImp::build_generic_tree(MythGenericTree *dst, meta_dir_node *src, entry != src->entries_end(); ++entry) { if (((*entry)->getData()->GetSeason() > 0) || - ((*entry)->getData()->GetEpisode() > 0)) + ((*entry)->getData()->GetEpisode() > 0)) { QString seas = QString::number((*entry)->getData()->GetSeason()); QString ep = QString::number((*entry)->getData()->GetEpisode()); QString title = (*entry)->getData()->GetTitle(); QString subtitle = (*entry)->getData()->GetSubtitle(); + if (ep.size() < 2) ep.prepend("0"); - QString displayTitle = QString("%1 %2x%3 - %4").arg(title).arg(seas) - .arg(ep) - .arg(subtitle); - if (src->getName() == title) - displayTitle = QString("%2x%3 - %4").arg(seas).arg(ep) - .arg(subtitle); + QString displayTitle = QString("%1 %2x%3 - %4") + .arg(title).arg(seas).arg(ep).arg(subtitle); + + if (src->getName() == title) + { + displayTitle = QString("%2x%3 - %4") + .arg(seas).arg(ep).arg(subtitle); + } AddFileNode(dst, displayTitle, (*entry)->getData()); } else if ((*entry)->getData()->GetSubtitle().isEmpty()) - AddFileNode(dst, (*entry)->getData()->GetTitle(), (*entry)->getData()); + { + AddFileNode( + dst, (*entry)->getData()->GetTitle(), (*entry)->getData()); + } else { - QString TitleSub = QString("%1 - %2").arg((*entry)->getData()->GetTitle()) - .arg((*entry)->getData()->GetSubtitle()); + QString TitleSub = QString("%1 - %2") + .arg((*entry)->getData()->GetTitle()) + .arg((*entry)->getData()->GetSubtitle()); AddFileNode(dst, TitleSub, (*entry)->getData()); } } @@ -632,18 +645,17 @@ void VideoListImp::build_generic_tree(MythGenericTree *dst, meta_dir_node *src, // videos found. // If false, the hierarchy present on the filesystem or in the database // is preserved. In this mode, both sub-dirs and updirs are present. -MythGenericTree *VideoListImp::buildVideoList(bool filebrowser, bool flatlist, - int group_type, - const ParentalLevel &parental_level, - bool include_updirs) +MythGenericTree *VideoListImp::buildVideoList( + bool filebrowser, bool flatlist, int group_type, + const ParentalLevel &parental_level, bool include_updirs) { refreshList(filebrowser, parental_level, flatlist, group_type); - typedef std::map string_to_tree; + typedef map string_to_tree; string_to_tree prefix_tree_map; video_tree_root.reset(new MythGenericTree(QObject::tr("Video Home"), - kRootNode, false)); + kRootNode, false)); build_generic_tree(video_tree_root.data(), &m_metadata_view_tree, include_updirs); @@ -651,9 +663,9 @@ MythGenericTree *VideoListImp::buildVideoList(bool filebrowser, bool flatlist, if (m_metadata_view_flat.empty()) { video_tree_root.reset(new MythGenericTree(QObject::tr("Video Home"), - kRootNode, false)); + kRootNode, false)); video_tree_root.data()->addNode(QObject::tr("No files found"), - kNoFilesFound, false); + kNoFilesFound, false); } return video_tree_root.data(); @@ -749,8 +761,8 @@ void VideoListImp::sort_view_data(bool flat_list) { if (flat_list) { - std::sort(m_metadata_view_flat.begin(), m_metadata_view_flat.end(), - metadata_sort(m_video_filter, true)); + sort(m_metadata_view_flat.begin(), m_metadata_view_flat.end(), + metadata_sort(m_video_filter, true)); } else { @@ -806,14 +818,14 @@ void VideoListImp::buildGroupList(metadata_list_type whence) metadata_view_list mlist; mlist.reserve(m_metadata.getList().size()); - std::back_insert_iterator mli(mlist); - std::transform(m_metadata.getList().begin(), m_metadata.getList().end(), - mli, to_metadata_ptr()); + back_insert_iterator mli(mlist); + transform(m_metadata.getList().begin(), m_metadata.getList().end(), + mli, to_metadata_ptr()); metadata_path_sort mps(true); - std::sort(mlist.begin(), mlist.end(), mps); + sort(mlist.begin(), mlist.end(), mps); - typedef std::map group_to_node_map; + typedef map group_to_node_map; group_to_node_map gtnm; meta_dir_node *video_root = &m_metadata_tree; @@ -827,19 +839,19 @@ void VideoListImp::buildGroupList(metadata_list_type whence) all_group_node->addEntry(smart_meta_node(new meta_data_node(data))); - std::vector groups; + vector groups; switch (whence) { case ltDBGenreGroup: { - std::vector > genres = + vector > genres = data->GetGenres(); - for (std::vector >::iterator i = + for (vector >::iterator i = genres.begin(); i != genres.end(); ++i) { - std::pair item = *i; + pair item = *i; groups.push_back(item.second); } break; @@ -866,12 +878,12 @@ void VideoListImp::buildGroupList(metadata_list_type whence) } case ltDBCastGroup: { - std::vector > cast = data->GetCast(); + vector > cast = data->GetCast(); - for (std::vector >::iterator i = + for (vector >::iterator i = cast.begin(); i != cast.end(); ++i) { - std::pair item = *i; + pair item = *i; groups.push_back(item.second); } break; @@ -911,7 +923,7 @@ void VideoListImp::buildGroupList(metadata_list_type whence) group_node->addEntry(smart_meta_node(new meta_data_node(data))); } - for (std::vector ::iterator i = groups.begin(); + for (vector::iterator i = groups.begin(); i != groups.end(); ++i) { QString item = *i; @@ -930,7 +942,7 @@ void VideoListImp::buildGroupList(metadata_list_type whence) } } -void VideoListImp::buildTVList() +void VideoListImp::buildTVList(void) { metadata_list ml; VideoMetadataListManager::loadAllFromDatabase(ml); @@ -939,14 +951,14 @@ void VideoListImp::buildTVList() metadata_view_list mlist; mlist.reserve(m_metadata.getList().size()); - std::back_insert_iterator mli(mlist); - std::transform(m_metadata.getList().begin(), m_metadata.getList().end(), - mli, to_metadata_ptr()); + back_insert_iterator mli(mlist); + transform(m_metadata.getList().begin(), m_metadata.getList().end(), + mli, to_metadata_ptr()); metadata_path_sort mps(true); - std::sort(mlist.begin(), mlist.end(), mps); + sort(mlist.begin(), mlist.end(), mps); - typedef std::map group_to_node_map; + typedef map group_to_node_map; group_to_node_map gtnm; meta_dir_node *video_root = &m_metadata_tree; @@ -966,8 +978,8 @@ void VideoListImp::buildTVList() smart_dir_node sdn = television_node->addSubDir((*p)->GetTitle()); meta_dir_node* title_node = sdn.get(); - smart_dir_node ssdn = title_node->addSubDir(QObject::tr("Season %1") - .arg((*p)->GetSeason())); + smart_dir_node ssdn = title_node->addSubDir( + QObject::tr("Season %1").arg((*p)->GetSeason())); meta_dir_node* season_node = ssdn.get(); season_node->addEntry(smart_meta_node(new meta_data_node(data))); @@ -986,17 +998,17 @@ void VideoListImp::buildDbList() metadata_view_list mlist; mlist.reserve(m_metadata.getList().size()); - std::back_insert_iterator mli(mlist); - std::transform(m_metadata.getList().begin(), m_metadata.getList().end(), - mli, to_metadata_ptr()); + back_insert_iterator mli(mlist); + transform(m_metadata.getList().begin(), m_metadata.getList().end(), + mli, to_metadata_ptr()); // print_meta_list(mlist); metadata_path_sort mps(true); - std::sort(mlist.begin(), mlist.end(), mps); + sort(mlist.begin(), mlist.end(), mps); // TODO: break out the prefix in the DB so this isn't needed - typedef std::map prefix_to_node_map; + typedef map prefix_to_node_map; prefix_to_node_map ptnm; QStringList dirs = GetVideoDirs(); @@ -1029,7 +1041,7 @@ void VideoListImp::buildFsysList() // Fill metadata from directory structure // - typedef std::vector > node_to_path_list; + typedef vector > node_to_path_list; node_to_path_list node_paths; @@ -1040,14 +1052,14 @@ void VideoListImp::buildFsysList() iter != dirs.end(); ++iter) { node_paths.push_back( - node_to_path_list::value_type(path_to_node_name(*iter), - *iter)); + node_to_path_list::value_type(path_to_node_name(*iter), + *iter)); } } else { node_paths.push_back( - node_to_path_list::value_type(QObject::tr("videos"), dirs[0])); + node_to_path_list::value_type(QObject::tr("videos"), dirs[0])); } // @@ -1089,12 +1101,12 @@ static void copy_entries(meta_dir_node &dst, meta_dir_node &src, const VideoFilterSettings &filter) { for (meta_dir_node::entry_iterator e = src.entries_begin(); - e != src.entries_end(); ++e) + e != src.entries_end(); ++e) { if (filter.matches_filter(*((*e)->getData()))) { dst.addEntry( - smart_meta_node(new meta_data_node((*e)->getData()))); + smart_meta_node(new meta_data_node((*e)->getData()))); } } } @@ -1104,7 +1116,7 @@ static void copy_filtered_tree(meta_dir_node &dst, meta_dir_node &src, { copy_entries(dst, src, filter); for (meta_dir_node::dir_iterator dir = src.dirs_begin(); - dir != src.dirs_end(); ++dir) + dir != src.dirs_end(); ++dir) { smart_dir_node sdn = dst.addSubDir((*dir)->getPath(), (*dir)->getName(), @@ -1133,11 +1145,11 @@ struct call_tree_flat void tree_view_to_flat(meta_dir_node &tree, VideoListImp::metadata_view_list &flat) { - std::back_insert_iterator bip(flat); - std::transform(tree.entries_begin(), tree.entries_end(), bip, - to_metadata_ptr()); + back_insert_iterator bip(flat); + transform(tree.entries_begin(), tree.entries_end(), bip, + to_metadata_ptr()); - std::for_each(tree.dirs_begin(), tree.dirs_end(), call_tree_flat(flat)); + for_each(tree.dirs_begin(), tree.dirs_end(), call_tree_flat(flat)); } void VideoListImp::update_meta_view(bool flat_list) @@ -1156,7 +1168,7 @@ void VideoListImp::update_meta_view(bool flat_list) if (!(*si)->HasSortKey()) { VideoMetadata::SortKey skey = - VideoMetadata::GenerateDefaultSortKey(*(*si), true); + VideoMetadata::GenerateDefaultSortKey(*(*si), true); (*si)->SetSortKey(skey); } } @@ -1196,14 +1208,14 @@ void VideoListImp::update_meta_view(bool flat_list) class dirhandler : public DirectoryHandler { public: - typedef std::list > free_list; + typedef list > free_list; public: dirhandler(smart_dir_node &directory, const QString &prefix, VideoMetadataListManager::metadata_list &metalist, free_list &dh_free_list, bool infer_title) : - m_directory(directory), m_prefix(prefix), m_metalist(metalist), - m_dh_free_list(dh_free_list), m_infer_title(infer_title) + m_directory(directory), m_prefix(prefix), m_metalist(metalist), + m_dh_free_list(dh_free_list), m_infer_title(infer_title) { } @@ -1235,7 +1247,8 @@ class dirhandler : public DirectoryHandler (void) extension; QString file_string(fq_file_name); - VideoMetadataListManager::VideoMetadataPtr myData(new VideoMetadata(file_string)); + VideoMetadataListManager::VideoMetadataPtr myData( + new VideoMetadata(file_string)); QFileInfo qfi(file_string); QString title = qfi.completeBaseName(); if (m_infer_title) @@ -1261,13 +1274,14 @@ class dirhandler : public DirectoryHandler const bool m_infer_title; }; -void VideoListImp::buildFileList(smart_dir_node &directory, - metadata_list &metalist, const QString &prefix) +void VideoListImp::buildFileList( + smart_dir_node &directory, metadata_list &metalist, const QString &prefix) { FileAssociations::ext_ignore_list ext_list; FileAssociations::getFileAssociation().getExtensionIgnoreList(ext_list); dirhandler::free_list fl; dirhandler dh(directory, prefix, metalist, fl, false); - (void) ScanVideoDirectory(directory->getFQPath(), &dh, ext_list, m_ListUnknown); + (void) ScanVideoDirectory( + directory->getFQPath(), &dh, ext_list, m_ListUnknown); }