Ticket #2169: make_dvd_backup_dirs_visible_in_listing_mode.diff

mythvideo/mythvideo/videolist.cpp

@@ -409 +409 @@
 }
 
 GenericTree *VideoList::addDirNode(GenericTree *where_to_add,
-                                                        const QString& dname)
+                                   const QString& dname)
 {
     GenericTree *sub_node, *up_node;
 
@@ -426 +426 @@
 }
 
 GenericTree *VideoList::addFileNode(GenericTree *where_to_add,
-                                                const QString& fname, int index)
+                                    const QString& fname, int index)
 {
     int a_counter = 0;
     GenericTree *sub_node;
-
     QStringList list(QStringList::split("/", fname));
     QStringList::Iterator an_it = list.begin();
     for( ; an_it != list.end(); ++an_it)
@@ -438 +437 @@
         if(a_counter + 1 >= (int) list.count()) // video
         {
             QString title = (*an_it);
-            sub_node = where_to_add->addNode(title.section(".",0,-2),
-                    index, true);
+
+            // this results in (DVD backup) directories having a title in
+            // the file list and video files having a title with only their
+            // file basename (suffix stripped)
+            if (title.find(".") > 0) {
+                title = title.section(".", 0, -2);
+            }
+            sub_node = where_to_add->addNode(title, index, true);
             sub_node->setAttribute(0, ORDER_ITEM);
             sub_node->setOrderingIndex(0);
             nitems++;

mythvideo/mythvideo/videotree.cpp

@@ -241 +241 @@
     int file_browser = gContext->GetNumSetting("VideoTreeNoDB", 0);
 
     video_tree_root = video_list->buildVideoList(file_browser, false,
-                                                current_parental_level);
+                                                 current_parental_level);
     if (video_tree_root->childCount() > 0)
         video_tree_data = video_tree_root->getChildAt(0,0);
     else video_tree_data = video_tree_root;