feedback while importing in plugin

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/branches/0.1.3-wr@532 e10066b5-e1e2-0310-b819-94efdf66514b

8 files changed, 38 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 2fbdfb6..c106961 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ $(DEPFILE): Makefile
 %.o: %.c %.h
 	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $<
 
-mg_tables.h:	scripts/genres.txt scripts/languages.txt scripts/musictypes.txt scripts/sources.txt
+mg_tables.h:	scripts/genres.txt scripts/iso_639.xml scripts/musictypes.txt scripts/sources.txt
 	scripts/gentables
 
 libvdr-$(PLUGIN).so: $(OBJS)
diff --git a/mg_mysql.c b/mg_mysql.c
index e083c56..4f8180b 100644
--- a/mg_mysql.c
+++ b/mg_mysql.c
@@ -334,8 +334,9 @@ void mgmySql::FillTables()
   for( int i=0; i < len; i ++ )
   {
 	  char b[600];
-	  sprintf(b,"INSERT INTO language SET id='%s', language='%s'",
-			  languages[i].id,languages[i].name);
+	  sprintf(b,"INSERT INTO language SET id='%s', language=",
+			  languages[i].id);
+	  sql_Cstring(languages[i].name,strchr(b,0));
 	  exec_sql(b);
   }
   len = sizeof( musictypes ) / sizeof( musictypes_t );
diff --git a/mg_sync.c b/mg_sync.c
index 93081f4..c15304a 100644
--- a/mg_sync.c
+++ b/mg_sync.c
@@ -142,6 +142,11 @@ mgSync::mgSync()
  	MYSQL_ROW rx;
 	while ((rx = mysql_fetch_row (m_genre_rows)) != 0)
 		m_Genres[rx[1]]=rx[0];
+	// init random number generator
+	struct timeval tv;
+	struct timezone tz;
+	gettimeofday( &tv, &tz );
+	srandom( tv.tv_usec );
 }
 
 mgSync::~mgSync()
@@ -293,12 +298,7 @@ mgSync::Sync(char * const * path_argv, bool delete_missing)
 	{
 		mgError("Cannot connect to data base");
 	}
-	// init random number generator
-	struct timeval tv;
-	struct timezone tz;
-	gettimeofday( &tv, &tz );
-	srandom( tv.tv_usec );
-
+	unsigned int count=0;
 	m_db.CreateFolderFields();
 	chdir(the_setup.ToplevelDir);
 	FTS *fts;
@@ -316,7 +316,15 @@ mgSync::Sync(char * const * path_argv, bool delete_missing)
 			strcpy(c_extension,extension+1);
       			lower(c_extension);
 			if (!strcmp(c_extension,"flac") || !strcmp(c_extension,"ogg") || !strcmp(c_extension,"mp3"))
+			{
 				SyncFile(ftsent->fts_path);
+				count++;
+				if (count%1000==0)
+				{
+					extern void showimportcount(unsigned int);
+					showimportcount(count);
+				}
+			}
 		}
 		fts_close(fts);
 	}
diff --git a/mg_tools.c b/mg_tools.c
index 3b07ba5..a6f6323 100644
--- a/mg_tools.c
+++ b/mg_tools.c
@@ -84,7 +84,7 @@ mgWarning (const char *fmt, ...)
         isyslog ("Warning: %s\n", buffer);
 #endif
     }
-    extern void showmessage(const char*);
+    extern void showmessage(const char*,int duration=0);
     showmessage(buffer);
     va_end (ap);
 }
diff --git a/mugglei.c b/mugglei.c
index cf3d0cc..2b6257b 100755
--- a/mugglei.c
+++ b/mugglei.c
@@ -41,7 +41,11 @@ int SysLogLevel = 1;
 
 bool import_assorted, delete_mode, create_mode;
 
-void showmessage(const char *msg)
+void showmessage(const char *msg,int duration)
+{
+}
+
+void showimportcount(unsigned int count)
 {
 }
 
diff --git a/vdr_decoder.c b/vdr_decoder.c
index 605b007..5ac9706 100644
--- a/vdr_decoder.c
+++ b/vdr_decoder.c
@@ -31,7 +31,7 @@
 #include "vdr_decoder.h"
 #include "vdr_decoder_mp3.h"
 
-extern void showmessage(const char *);
+extern void showmessage(const char *,int duration=0);
 
 #ifdef HAVE_VORBISFILE
 #include "vdr_decoder_ogg.h"
diff --git a/vdr_menu.c b/vdr_menu.c
index 4498775..18c10e7 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -845,10 +845,10 @@ mgMainMenu::showMessage()
 }
 
 void
-showmessage(const char * msg)
+showmessage(const char * msg,int duration)
 {
 #if VDRVERSNUM >= 10307
-    	Skins.Message (mtInfo, msg,2);
+    	Skins.Message (mtInfo, msg,duration);
     	Skins.Flush ();
 #else
     	Interface->Status (msg);
@@ -857,6 +857,15 @@ showmessage(const char * msg)
 }
 
 void
+showimportcount(unsigned int count)
+{
+	char b[100];
+	sprintf(b,tr("Imported %d tracks..."),count);
+	assert(strlen(b)<100);
+	showmessage(b,1);
+}
+
+void
 mgMainMenu::AddMenu (mgMenu * m,unsigned int position)
 {
     Menus.push_back (m);
diff --git a/vdr_menu.h b/vdr_menu.h
index 5d04446..227931c 100644
--- a/vdr_menu.h
+++ b/vdr_menu.h
@@ -30,7 +30,8 @@ using namespace std;
 //! \param select if true, play only what the current position selects
 void Play(mgSelection *sel,const bool select=false);
 
-void showmessage(const char *msg);
+void showmessage(const char *msg,int duration=2);
+void showimportcount(unsigned int count);
 
 class cCommands;