move Sync code to mg_sync, thus decoupling mugglei from vdr

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

6 files changed, 356 insertions, 279 deletions

diff --git a/Makefile b/Makefile
index 0f883f3..9f0c401 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ MIFLAGS += -I/usr/include/taglib -lmysqlclient
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_mysql.o mg_order.o mg_content.o mg_selection.o vdr_actions.o vdr_menu.o mg_tools.o \
+OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_mysql.o mg_sync.o mg_order.o mg_content.o mg_selection.o vdr_actions.o vdr_menu.o mg_tools.o \
 	vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \
 	vdr_setup.o mg_setup.o
 
@@ -96,7 +96,7 @@ libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 
-mugglei: mg_tools.o mugglei.o mg_order.o mg_selection.o mg_mysql.o mg_valmap.o mg_content.o mg_setup.o 
+mugglei: mg_tools.o mugglei.o mg_sync.o mg_mysql.o mg_setup.o 
 	$(CXX) $(CXXFLAGS) $^ $(MILIBS) -o $@
 
 install:
diff --git a/mg_selection.c b/mg_selection.c
index 76abf5c..173ff82 100644
--- a/mg_selection.c
+++ b/mg_selection.c
@@ -1127,264 +1127,3 @@ mgSelection::choices(mgOrder *o,unsigned int level, unsigned int *current)
 	return result;
 }
 
-char *
-mgSelection::sql_Cstring(TagLib::String s)
-{
-	return m_db.sql_Cstring(s.toCString());
-}
-
-char *
-mgSelection::lower(char *s)
-{
-	char *p=s;
-	while (*p)
-	{
-		int i=(int)(*p);
-		(*p)=(char)tolower(i);
-		p++;
-	}
-	return s;
-}
-
-TagLib::String
-mgSelection::getlanguage(const char *filename)
-{
-      TagLib::String result = "";
-      TagLib::ID3v2::Tag * id3v2tag=0;
-      char *extension = strrchr(filename,'.');
-      if (!extension)
-	      return result;
-      extension++;
-      lower(extension);
-      if (!strcmp(extension,"flac"))
-      {
-      	TagLib::FLAC::File f(filename);
-	id3v2tag = f.ID3v2Tag();
-      	if (id3v2tag)
-      	{
-      	  TagLib::ID3v2::FrameList l = id3v2tag->frameListMap()["TLAN"];
-      	  if (!l.isEmpty())
-  	    result = l.front()->toString();
-        }
-      }
-      else if (!strcmp(extension,"mp3"))
-      {
-      	TagLib::MPEG::File f(filename);
-	id3v2tag = f.ID3v2Tag();
-        if (id3v2tag)
-        {
-      	  TagLib::ID3v2::FrameList l = id3v2tag->frameListMap()["TLAN"];
-      	  if (!l.isEmpty())
-  	    result = l.front()->toString();
-        }
-      }
-      return result;
-}
-
-char *
-mgSelection::getAlbum(const char *c_album,const char *c_artist,const char *c_directory)
-{
-	char * result;
-	char *b;
-	asprintf(&b,"SELECT cddbid FROM album"
-			" WHERE title=%s AND artist=%s",c_album,c_artist);
-	result=m_db.sql_Cstring(m_db.get_col0(b));
-	free(b);
-	if (!strcmp(result,"'NULL'"))
-	{
-		const char *directory="substring(tracks.mp3file,1,length(tracks.mp3file)"
-			"-instr(reverse(tracks.mp3file),'/'))";
-		char *where;
-		asprintf(&where,"WHERE tracks.sourceid=album.cddbid "
-			"AND %s=%s "
-			"AND album.title=%s",
-			directory,c_directory,
-			c_album);
-
-		// how many artists will the album have after adding this one?
-		asprintf(&b,"SELECT distinct album.artist FROM tracks, album %s "
-				" union select %s",where,c_artist);
-        	//MYSQL_RES *rows = m_db.exec_sql (b);
-        	m_db.exec_sql (b);
-		free(b);
-		long new_album_artists = m_db.affected_rows();
-		if (new_album_artists>1)	// is the album multi artist?
-		{
-			asprintf(&b,"SELECT album.cddbid FROM tracks, album %s",where);
-			result=m_db.sql_Cstring(m_db.get_col0(b));
-			free(b);
-			asprintf(&b,"UPDATE album SET artist='Various Artists' WHERE cddbid=%s",result);
-			m_db.exec_sql(b);
-			// here we could change all tracks.sourceid to result and delete
-			// the other album entries for this album, but that should only 
-			// be needed if a pre 0.1.4 import has been done incorrectly, so we
-			// don't bother
-		}
-		else
-		{				// no usable album found
-			asprintf(&result,"'%ld-%9s",random(),c_artist+1);
-			char *p=strchr(result,0)-1;
-			if (*p!='\'')
-				*p='\'';
-			asprintf(&b,"INSERT INTO album SET title=%s,artist=%s,cddbid=%s",
-				c_album,c_artist,result);
-			m_db.exec_sql(b);
-			free(b);
-		}
-		free(where);
-	}
-	return result;
-}
-
-void
-mgSelection::AddTrack(const char *filename)
-{
-	TagLib::FileRef f( filename) ;
-	if (f.isNull())
-		return;
-	TagLib::Tag *tag = f.tag();
-	if (!f.tag())
-		return;
-        char *c_album;
-	if (tag->album()=="")
-		c_album=strdup("'Unassigned'");
-	else
-		c_album=sql_Cstring(tag->album());
-        char *c_artist=sql_Cstring(tag->artist());
-	char *c_title=sql_Cstring(tag->title());
-	char *c_directory=sql_Cstring(filename);
-	char *slash=strrchr(c_directory,'/');
-	if (slash)
-	{
-		*slash='\'';
-		*(slash+1)=0;
-	}
-	char *c_cddbid=getAlbum(c_album,c_artist,c_directory);
-	char *c_mp3file=sql_Cstring(filename);
-	char *c_genre1=sql_Cstring(id(keyGenres,tag->genre().to8Bit()));
-	char *c_lang=sql_Cstring(getlanguage(filename));
-	char *folderstring=(char*)malloc(strlen(c_mp3file)*3);
-	unsigned int trackno=tag->track();
-	unsigned int year=tag->year();
-        TagLib::AudioProperties *ap = f.audioProperties();
-        int len      = ap->length();     // tracks.length
-        int bitrate  = ap->bitrate();    // tracks.bitrate
-        int sample   = ap->sampleRate(); //tracks.samplerate
-        int channels = ap->channels();   //tracks.channels
-	folderstring[0]=0;
-	if (m_db.HasFolderFields())
-	{
-	    char *path = strdup(filename);
-	    char *folder1="";
-	    char *folder2="";
-	    char *folder3="";
-	    char *folder4="";
-	    char *p=path;
-	    char *slash;
-	    slash=strchr(p,'/');
-	    if (slash)
-	    {
-	    	folder1=p;
-		*slash=0;
-		p=slash+1;
-	    	slash=strchr(p,'/');
-	    	if (slash)
-	    	{
-	    		folder2=p;
-	    		*slash=0;
-			p=slash+1;
-	    		slash=strchr(p,'/');
-	    		if (slash)
-	    		{
-	    			folder3=p;
-	    			*slash=0;
-				p=slash+1;
-	    			slash=strchr(p,'/');
-	    			if (slash)
-	    			{
-	    				folder4=p;
-	    				*slash=0;
-				}
-			}
-		}
-	    }
-		char *c_folder1=sql_Cstring(folder1);
-		char *c_folder2=sql_Cstring(folder2);
-		char *c_folder3=sql_Cstring(folder3);
-		char *c_folder4=sql_Cstring(folder4);
-		free(path);
-		sprintf(folderstring,"folder1=%s,folder2=%s,folder3=%s,folder4=%s",
-				c_folder1,c_folder2,c_folder3,c_folder4);
-		free(c_folder1);
-		free(c_folder2);
-		free(c_folder3);
-		free(c_folder4);
-	}
-	char sql[2000];
-	sprintf(sql,"INSERT INTO tracks SET artist=%s,title=%s,year=%d,sourceid=%s,"
-			"tracknb=%d,mp3file=%s,length=%d,bitrate=%d,samplerate=%d,"
-			"channels=%d,genre1=%s,genre2='',lang=%s,%s",
-			c_artist,c_title,year,c_cddbid,
-			trackno,c_mp3file,len,bitrate,sample,
-			channels,c_genre1,c_lang,folderstring);
-	free(c_directory);
-	free(c_album);
-	free(c_artist);
-	free(c_title);
-	free(c_cddbid);
-	free(c_mp3file);
-	free(c_genre1);
-	free(c_lang);
-	free(folderstring);
-	m_db.exec_sql(sql);
-}
-
-void
-mgSelection::SyncFile(const char *filename)
-{
-	if (!strncmp(filename,"./",2))
-		filename += 2;
-	if (strlen(filename)>255)
-	{
-		mgWarning("Length of file exceeds database field capacity: %s", filename);
-
-		return;
-	}
-	string escapedmp3file = m_db.sql_string(filename);
-	string s = m_db.get_col0("SELECT id from tracks WHERE mp3file="+escapedmp3file);
-	if (s!="NULL")
-	{
-	}
-	else
-	{
-		AddTrack(filename);
-	}
-}
-
-void
-mgSelection::Sync(const char * path, bool assorted,bool delete_missing)
-{
-	if (!m_db.Connected())
-	{
-		mgError("Cannot connect to data base");
-	}
-	// init random number generator
-	struct timeval tv;
-	struct timezone tz;
-	gettimeofday( &tv, &tz );
-	srandom( tv.tv_usec );
-
-	m_db.CreateFolderFields();
-	chdir(the_setup.ToplevelDir);
-	FTS *fts;
-	FTSENT *ftsent;
-	const char * paths[2];
-	paths[0]=path;
-	paths[1]=0;
-	fts = fts_open( const_cast<char *const *>(paths), FTS_LOGICAL, 0);
-	while ( (ftsent = fts_read(fts)) != NULL)
-	{
-		SyncFile(ftsent->fts_path);
-	}
-	fts_close(fts);
-}
diff --git a/mg_selection.h b/mg_selection.h
index b8acc26..7ad6648 100644
--- a/mg_selection.h
+++ b/mg_selection.h
@@ -23,8 +23,6 @@ using namespace std;
 #include "mg_order.h"
 #include "mg_content.h"
 
-#include <tag.h>
-
 typedef vector<string> strvector;
 
 
@@ -467,16 +465,6 @@ class mgSelection
         void loadgenres ();
 
 	void InitFrom(const mgSelection* s);
-	char *sql_Cstring(TagLib::String s);
-	char *lower(char *s);
-	TagLib::String getlanguage(const char *filename);
-	char * getAlbum(const char *c_album,const char *c_artist,const char *c_directory);
-	void AddTrack(const char *filename);
-	void SyncFile(const char *filename);
-
-
-
-
 
 };
 
diff --git a/mg_sync.c b/mg_sync.c
new file mode 100644
index 0000000..d30659a
--- /dev/null
+++ b/mg_sync.c
@@ -0,0 +1,302 @@
+/*!
+ * \file mg_sync.c
+ * \brief synchronization between SQL and filesystem
+ *
+ * \version $Revision: 1.0 $
+ * \date    $Date: 2004-12-07 10:10:35 +0200 (Tue, 07 Dec 2004) $
+ * \author  Wolfgang Rohdewald
+ * \author  Responsible author: $Author: wr $
+ *
+ */
+
+#include "mg_sync.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fts.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <mpegfile.h>
+#include <flacfile.h>
+#include <id3v2tag.h>
+#include <fileref.h>
+
+#include "mg_tools.h"
+#include "mg_mysql.h"
+#include "mg_setup.h"
+
+char *
+mgSync::sql_Cstring(TagLib::String s)
+{
+	return m_db.sql_Cstring(s.toCString());
+}
+
+char *
+mgSync::lower(char *s)
+{
+	char *p=s;
+	while (*p)
+	{
+		int i=(int)(*p);
+		(*p)=(char)tolower(i);
+		p++;
+	}
+	return s;
+}
+
+TagLib::String
+mgSync::getlanguage(const char *filename)
+{
+      TagLib::String result = "";
+      TagLib::ID3v2::Tag * id3v2tag=0;
+      char *extension = strrchr(filename,'.');
+      if (!extension)
+	      return result;
+      extension++;
+      lower(extension);
+      if (!strcmp(extension,"flac"))
+      {
+      	TagLib::FLAC::File f(filename);
+	id3v2tag = f.ID3v2Tag();
+      	if (id3v2tag)
+      	{
+      	  TagLib::ID3v2::FrameList l = id3v2tag->frameListMap()["TLAN"];
+      	  if (!l.isEmpty())
+  	    result = l.front()->toString();
+        }
+      }
+      else if (!strcmp(extension,"mp3"))
+      {
+      	TagLib::MPEG::File f(filename);
+	id3v2tag = f.ID3v2Tag();
+        if (id3v2tag)
+        {
+      	  TagLib::ID3v2::FrameList l = id3v2tag->frameListMap()["TLAN"];
+      	  if (!l.isEmpty())
+  	    result = l.front()->toString();
+        }
+      }
+      return result;
+}
+
+char *
+mgSync::getAlbum(const char *c_album,const char *c_artist,const char *c_directory)
+{
+	char * result;
+	char *b;
+	asprintf(&b,"SELECT cddbid FROM album"
+			" WHERE title=%s AND artist=%s",c_album,c_artist);
+	result=m_db.sql_Cstring(m_db.get_col0(b));
+	free(b);
+	if (!strcmp(result,"'NULL'"))
+	{
+		const char *directory="substring(tracks.mp3file,1,length(tracks.mp3file)"
+			"-instr(reverse(tracks.mp3file),'/'))";
+		char *where;
+		asprintf(&where,"WHERE tracks.sourceid=album.cddbid "
+			"AND %s=%s "
+			"AND album.title=%s",
+			directory,c_directory,
+			c_album);
+
+		// how many artists will the album have after adding this one?
+		asprintf(&b,"SELECT distinct album.artist FROM tracks, album %s "
+				" union select %s",where,c_artist);
+        	m_db.exec_sql (b);
+		free(b);
+		long new_album_artists = m_db.affected_rows();
+		if (new_album_artists>1)	// is the album multi artist?
+		{
+			asprintf(&b,"SELECT album.cddbid FROM tracks, album %s",where);
+			result=m_db.sql_Cstring(m_db.get_col0(b));
+			free(b);
+			asprintf(&b,"UPDATE album SET artist='Various Artists' WHERE cddbid=%s",result);
+			m_db.exec_sql(b);
+			// here we could change all tracks.sourceid to result and delete
+			// the other album entries for this album, but that should only 
+			// be needed if a pre 0.1.4 import has been done incorrectly, so we
+			// don't bother
+		}
+		else
+		{				// no usable album found
+			asprintf(&result,"'%ld-%9s",random(),c_artist+1);
+			char *p=strchr(result,0)-1;
+			if (*p!='\'')
+				*p='\'';
+			asprintf(&b,"INSERT INTO album SET title=%s,artist=%s,cddbid=%s",
+				c_album,c_artist,result);
+			m_db.exec_sql(b);
+			free(b);
+		}
+		free(where);
+	}
+	return result;
+}
+
+mgSync::mgSync()
+{
+      	m_genre_rows = m_db.exec_sql ("SELECT id,genre from genre");
+ 	MYSQL_ROW rx;
+	while ((rx = mysql_fetch_row (m_genre_rows)) != 0)
+		m_Genres[rx[1]]=rx[0];
+}
+
+mgSync::~mgSync()
+{
+	mysql_free_result(m_genre_rows);
+}
+
+void
+mgSync::AddTrack(const char *filename)
+{
+	TagLib::FileRef f( filename) ;
+	if (f.isNull())
+		return;
+	TagLib::Tag *tag = f.tag();
+	if (!f.tag())
+		return;
+        char *c_album;
+	if (tag->album()=="")
+		c_album=strdup("'Unassigned'");
+	else
+		c_album=sql_Cstring(tag->album());
+        char *c_artist=sql_Cstring(tag->artist());
+	char *c_title=sql_Cstring(tag->title());
+	char *c_directory=sql_Cstring(filename);
+	char *slash=strrchr(c_directory,'/');
+	if (slash)
+	{
+		*slash='\'';
+		*(slash+1)=0;
+	}
+	char *c_cddbid=getAlbum(c_album,c_artist,c_directory);
+	char *c_mp3file=sql_Cstring(filename);
+	const char *genrename=tag->genre().toCString();
+	const char *genreid=m_Genres[genrename].c_str();
+	char *c_genre1=sql_Cstring(genreid);
+	char *c_lang=sql_Cstring(getlanguage(filename));
+	char *folderstring=(char*)malloc(strlen(c_mp3file)*3);
+	unsigned int trackno=tag->track();
+	unsigned int year=tag->year();
+        TagLib::AudioProperties *ap = f.audioProperties();
+        int len      = ap->length();     // tracks.length
+        int bitrate  = ap->bitrate();    // tracks.bitrate
+        int sample   = ap->sampleRate(); //tracks.samplerate
+        int channels = ap->channels();   //tracks.channels
+	folderstring[0]=0;
+	if (m_db.HasFolderFields())
+	{
+	    char *path = strdup(filename);
+	    char *folder1="";
+	    char *folder2="";
+	    char *folder3="";
+	    char *folder4="";
+	    char *p=path;
+	    char *slash;
+	    slash=strchr(p,'/');
+	    if (slash)
+	    {
+	    	folder1=p;
+		*slash=0;
+		p=slash+1;
+	    	slash=strchr(p,'/');
+	    	if (slash)
+	    	{
+	    		folder2=p;
+	    		*slash=0;
+			p=slash+1;
+	    		slash=strchr(p,'/');
+	    		if (slash)
+	    		{
+	    			folder3=p;
+	    			*slash=0;
+				p=slash+1;
+	    			slash=strchr(p,'/');
+	    			if (slash)
+	    			{
+	    				folder4=p;
+	    				*slash=0;
+				}
+			}
+		}
+	    }
+		char *c_folder1=sql_Cstring(folder1);
+		char *c_folder2=sql_Cstring(folder2);
+		char *c_folder3=sql_Cstring(folder3);
+		char *c_folder4=sql_Cstring(folder4);
+		free(path);
+		sprintf(folderstring,"folder1=%s,folder2=%s,folder3=%s,folder4=%s",
+				c_folder1,c_folder2,c_folder3,c_folder4);
+		free(c_folder1);
+		free(c_folder2);
+		free(c_folder3);
+		free(c_folder4);
+	}
+	char sql[2000];
+	sprintf(sql,"INSERT INTO tracks SET artist=%s,title=%s,year=%d,sourceid=%s,"
+			"tracknb=%d,mp3file=%s,length=%d,bitrate=%d,samplerate=%d,"
+			"channels=%d,genre1=%s,genre2='',lang=%s,%s",
+			c_artist,c_title,year,c_cddbid,
+			trackno,c_mp3file,len,bitrate,sample,
+			channels,c_genre1,c_lang,folderstring);
+	free(c_directory);
+	free(c_album);
+	free(c_artist);
+	free(c_title);
+	free(c_cddbid);
+	free(c_mp3file);
+	free(c_genre1);
+	free(c_lang);
+	free(folderstring);
+	m_db.exec_sql(sql);
+}
+
+void
+mgSync::SyncFile(const char *filename)
+{
+	if (!strncmp(filename,"./",2))	// strip leading ./
+		filename += 2;
+	if (strlen(filename)>255)
+	{
+		mgWarning("Length of file exceeds database field capacity: %s", filename);
+		return;
+	}
+	string escapedmp3file = m_db.sql_string(filename);
+	string s = m_db.get_col0("SELECT id from tracks WHERE mp3file="+escapedmp3file);
+	if (s!="NULL")
+	{
+	}
+	else
+	{
+		AddTrack(filename);
+	}
+}
+
+void
+mgSync::Sync(const char * path, bool delete_missing)
+{
+	if (!m_db.Connected())
+	{
+		mgError("Cannot connect to data base");
+	}
+	// init random number generator
+	struct timeval tv;
+	struct timezone tz;
+	gettimeofday( &tv, &tz );
+	srandom( tv.tv_usec );
+
+	m_db.CreateFolderFields();
+	chdir(the_setup.ToplevelDir);
+	FTS *fts;
+	FTSENT *ftsent;
+	const char * paths[2];
+	paths[0]=path;
+	paths[1]=0;
+	fts = fts_open( const_cast<char *const *>(paths), FTS_LOGICAL, 0);
+	while ( (ftsent = fts_read(fts)) != NULL)
+	{
+		SyncFile(ftsent->fts_path);
+	}
+	fts_close(fts);
+}
diff --git a/mg_sync.h b/mg_sync.h
new file mode 100644
index 0000000..3ab9469
--- /dev/null
+++ b/mg_sync.h
@@ -0,0 +1,47 @@
+/*!
+ * \file mg_sync.h
+ * \brief synchronization between SQL and filesystem
+ *
+ * \version $Revision: 1.0 $
+ * \date    $Date: 2004-12-07 10:10:35 +0200 (Tue, 07 Dec 2004) $
+ * \author  Wolfgang Rohdewald
+ * \author  Responsible author: $Author: wr $
+ *
+ */
+
+#ifndef _MG_SYNC_H
+#define _MG_SYNC_H
+
+#include <map>
+#include <string.h>
+#include <tag.h>
+
+#include "mg_mysql.h"
+
+class mgSync
+{
+	public:
+		mgSync();
+		~mgSync();
+		/*! import/export tags like
+	 	 * \par path can be a file or a directory. If directory, 
+	 	 * sync all files within 
+	 	 * \par assorted see mugglei -h
+	 	 * \par delete_missing if the file does not exist, delete the
+	 	 * data base entry. If the file is unreadable, do not delete.
+	 	 */
+		void Sync(const char * path, bool delete_missing=false);
+
+	private:
+		mgmySql m_db;
+		char *sql_Cstring(TagLib::String s);
+		char *lower(char *s);
+		TagLib::String getlanguage(const char *filename);
+		char * getAlbum(const char *c_album,const char *c_artist,const char *c_directory);
+		void AddTrack(const char *filename);
+		void SyncFile(const char *filename);
+		map<string,string> m_Genres;
+		MYSQL_RES* m_genre_rows;
+};
+
+#endif
diff --git a/mugglei.c b/mugglei.c
index ee09fb9..6b1da1c 100755
--- a/mugglei.c
+++ b/mugglei.c
@@ -30,8 +30,9 @@
 #include <id3v2tag.h>
 #include <fileref.h>
 
-#include "vdr_setup.h"
-#include "mg_selection.h"
+#include "mg_tools.h"
+#include "mg_setup.h"
+#include "mg_sync.h"
 
 
 using namespace std;
@@ -154,8 +155,8 @@ int main( int argc, char *argv[] )
 	}
     }
 
-  mgSelection sel;
-  sel.Sync(filename,false);
+  mgSync sync;
+  sync.Sync(filename,false);
   return 0;
 }