mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 08:53:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

webtv-setup: allow to load *.m3u and *.tv automatically

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3a77b26c2
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-12 (Wed, 12 Sep 2018)

Origin message was:
------------------
- webtv-setup: allow to load *.m3u and *.tv automatically

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-09-12 21:31:59 +02:00
parent a1867d98f8
commit c505ec4df0
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/webtv_setup.cpp
View File

@@ -211,10 +211,15 @@ bool CWebTVSetup::changeNotify(const neutrino_locale_t, void */*data*/)
} }
//NI //NI
int xml_filter(const struct dirent *entry) int filefilter(const struct dirent *entry)
{ {
int len = strlen(entry->d_name); int len = strlen(entry->d_name);
if (len > 3 && entry->d_name[len-3] == 'x' && entry->d_name[len-2] == 'm' && entry->d_name[len-1] == 'l') if (len > 3 && (
(entry->d_name[len-3] == 'x' && entry->d_name[len-2] == 'm' && entry->d_name[len-1] == 'l')
|| (entry->d_name[len-3] == 'm' && entry->d_name[len-2] == '3' && entry->d_name[len-1] == 'u')
|| ( entry->d_name[len-2] == 't' && entry->d_name[len-1] == 'v')
)
)
return 1; return 1;
return 0; return 0;
} }
@@ -225,30 +230,30 @@ void CWebTVSetup::webtv_xml_auto()
if (g_settings.webtv_xml_auto) if (g_settings.webtv_xml_auto)
{ {
const char *dirs[] = {WEBTVDIR_VAR, WEBTVDIR}; const char *dirs[] = {WEBTVDIR_VAR, WEBTVDIR};
struct dirent **xml_list; struct dirent **filelist;
char xml_file[1024] = {0}; char webtv_file[1024] = {0};
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
int xml_cnt = scandir(dirs[i], &xml_list, xml_filter, alphasort); int file_count = scandir(dirs[i], &filelist, filefilter, alphasort);
if (xml_cnt > -1) if (file_count > -1)
{ {
for (int count = 0; count < xml_cnt; count++) for (int count = 0; count < file_count; count++)
{ {
snprintf(xml_file, sizeof(xml_file), "%s/%s", dirs[i], xml_list[count]->d_name); snprintf(webtv_file, sizeof(webtv_file), "%s/%s", dirs[i], filelist[count]->d_name);
if (file_size(xml_file)) if (file_size(webtv_file))
{ {
bool found = false; bool found = false;
for (std::list<std::string>::iterator it = g_settings.webtv_xml.begin(); it != g_settings.webtv_xml.end(); it++) for (std::list<std::string>::iterator it = g_settings.webtv_xml.begin(); it != g_settings.webtv_xml.end(); it++)
found |= ((*it).find(xml_list[count]->d_name) != std::string::npos); found |= ((*it).find(filelist[count]->d_name) != std::string::npos);
if (!found) if (!found)
{ {
printf("[CWebTVSetup] loading: %s\n", xml_file); printf("[CWebTVSetup] loading: %s\n", webtv_file);
g_settings.webtv_xml.push_back(xml_file); g_settings.webtv_xml.push_back(webtv_file);
} }
else else
{ {
printf("[CWebTVSetup] skipping: %s\n", xml_file); printf("[CWebTVSetup] skipping: %s\n", webtv_file);
} }
} }
} }