Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [505] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt
|
From: <nor...@us...> - 2007-06-10 17:37:19
|
Revision: 505
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=505&view=rev
Author: northern_sky
Date: 2007-06-10 10:37:16 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
genres changed to main/subgenre + small db-tblrename
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem .cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseSettings.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIFileDetailsInfoParser.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem .cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem .cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem .cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -868,7 +868,7 @@
// won't work in multiuser environment :)
SQLiteResultSet results;
int res = 0;
- results = sqlDB.Execute("SELECT MAX(APPID) FROM application");
+ results = sqlDB.Execute("SELECT MAX(APPID) FROM tblApplicationItem");
SQLiteResultSet.Row arr = results.Rows[0];
if (arr.fields[0] != null)
{
@@ -895,7 +895,7 @@
//to remove
string Pincode = "";
AppID = GetNewAppID(); // important to avoid subsequent inserts!
- string sql = String.Format("insert into application (appid, fatherID, title, shorttitle, filename, arguments, windowstyle, startupdir, useshellexecute, usequotes, source_type, source, imagefile, filedirectory, imagedirectory, validextensions, importvalidimagesonly, iposition, enabled, enableGUIRefresh, GUIRefreshPossible, pincode, contentID, systemDefault, WaitForExit, preLaunch, postLaunch) values('{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}', '{11}', '{12}', '{13}', '{14}', '{15}', '{16}', '{17}', '{18}', '{19}', '{20}', '{21}', '{22}', '{23}', '{24}', '{25}', '{26}')",
+ string sql = String.Format("insert into tblApplicationItem (appid, fatherID, title, shorttitle, filename, arguments, windowstyle, startupdir, useshellexecute, usequotes, source_type, source, imagefile, filedirectory, imagedirectory, validextensions, importvalidimagesonly, iposition, enabled, enableGUIRefresh, GUIRefreshPossible, pincode, contentID, systemDefault, WaitForExit, preLaunch, postLaunch) values('{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}', '{11}', '{12}', '{13}', '{14}', '{15}', '{16}', '{17}', '{18}', '{19}', '{20}', '{21}', '{22}', '{23}', '{24}', '{25}', '{26}')",
AppID, FatherID, ProgramUtils.Encode(Title), ProgramUtils.Encode(ShortTitle), ProgramUtils.Encode(Filename), ProgramUtils.Encode(Arguments),
ProgramUtils.WindowStyleToStr(WindowStyle), ProgramUtils.Encode(Startupdir), ProgramUtils.BooleanToStr(UseShellExecute),
ProgramUtils.BooleanToStr(UseQuotes), ProgramUtils.ApplicationTypeToString(SourceType), ProgramUtils.Encode(Source), ProgramUtils.Encode(Imagefile),
@@ -925,7 +925,7 @@
}
try
{
- sql = String.Format("update application set title = '{0}', shorttitle = '{1}', filename = '{2}', arguments = '{3}', windowstyle = '{4}', startupdir = '{5}', useshellexecute = '{6}', usequotes = '{7}', source_type = '{8}', source = '{9}', imagefile = '{10}',filedirectory = '{11}',imagedirectory = '{12}',validextensions = '{13}',importvalidimagesonly = '{14}',iposition = {15}, enabled = '{16}', fatherID = '{17}', enableGUIRefresh = '{18}', GUIRefreshPossible = '{19}', pincode = '{20}', contentID = '{21}', systemDefault = '{22}', WaitForExit = '{23}', preLaunch = '{24}', postLaunch = '{25}' where appID = {26}",
+ sql = String.Format("update tblApplicationItem set title = '{0}', shorttitle = '{1}', filename = '{2}', arguments = '{3}', windowstyle = '{4}', startupdir = '{5}', useshellexecute = '{6}', usequotes = '{7}', source_type = '{8}', source = '{9}', imagefile = '{10}',filedirectory = '{11}',imagedirectory = '{12}',validextensions = '{13}',importvalidimagesonly = '{14}',iposition = {15}, enabled = '{16}', fatherID = '{17}', enableGUIRefresh = '{18}', GUIRefreshPossible = '{19}', pincode = '{20}', contentID = '{21}', systemDefault = '{22}', WaitForExit = '{23}', preLaunch = '{24}', postLaunch = '{25}' where appID = {26}",
ProgramUtils.Encode(Title), ProgramUtils.Encode(ShortTitle), ProgramUtils.Encode(Filename), ProgramUtils.Encode(Arguments),
ProgramUtils.WindowStyleToStr(WindowStyle), ProgramUtils.Encode(Startupdir), ProgramUtils.BooleanToStr(UseShellExecute),
ProgramUtils.BooleanToStr(UseQuotes), ProgramUtils.ApplicationTypeToString(SourceType), ProgramUtils.Encode(Source), ProgramUtils.Encode(Imagefile),
@@ -951,7 +951,7 @@
{
DeleteFiles();
DeleteFileLinks();
- sqlDB.Execute(String.Format("delete from application where appid = {0}", AppID));
+ sqlDB.Execute(String.Format("delete from tblApplicationItem where appid = {0}", AppID));
}
catch (SQLiteException ex)
{
@@ -969,7 +969,7 @@
{
try
{
- sqlDB.Execute(String.Format("delete from tblfile where appid = {0}", AppID));
+ sqlDB.Execute(String.Format("delete from tblFileItem where appid = {0}", AppID));
}
catch (SQLiteException ex)
{
@@ -984,7 +984,7 @@
{
try
{
- sqlDB.Execute(String.Format("delete from filteritem where appid = {0} or grouperappid = {0}", AppID));
+ sqlDB.Execute(String.Format("delete from tblFilterItem where appid = {0} or grouperappid = {0}", AppID));
}
catch (SQLiteException ex)
{
@@ -1038,10 +1038,10 @@
// are out of sync... fix this here!
// query with data to fix
- string sqlSelectDataToFix = String.Format("select fi.appid, fi.fileid as oldfileid, f.fileid as newfileid, fi.filename as filename from filteritem fi, tblfile f where fi.appID = f.appid and fi.filename = f.filename and fi.appID = {0}", AppID);
+ string sqlSelectDataToFix = String.Format("select fi.appid, fi.fileid as oldfileid, f.fileid as newfileid, fi.filename as filename from tblFilterItem fi, tblFileItem f where fi.appID = f.appid and fi.filename = f.filename and fi.appID = {0}", AppID);
// update command to fix one single link
- string sqlFixOneLink = "update filteritem set fileID = {0}, tag = 0 where appID = {1} and filename = '{2}'";
+ string sqlFixOneLink = "update tblFilterItem set fileID = {0}, tag = 0 where appID = {1} and filename = '{2}'";
SQLiteResultSet rows2fix;
@@ -1049,7 +1049,7 @@
try
{
// 1) initialize TAG
- sqlDB.Execute(String.Format("update filteritem set tag = 1234 where appid = {0}", AppID));
+ sqlDB.Execute(String.Format("update tblFilterItem set tag = 1234 where appid = {0}", AppID));
// 2) fix all fileids of the newly imported files
rows2fix = sqlDB.Execute(sqlSelectDataToFix);
@@ -1064,7 +1064,7 @@
}
// 3) delete untouched links ( they were not imported anymore )
- sqlDB.Execute(String.Format("delete from filteritem where appid = {0} and tag = 1234", AppID));
+ sqlDB.Execute(String.Format("delete from tblFilterItem where appid = {0} and tag = 1234", AppID));
}
catch (SQLiteException ex)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -161,7 +161,7 @@
if (null == sqlDB)
return;
SQLiteResultSet results;
- results = sqlDB.Execute("select * from application order by iposition");
+ results = sqlDB.Execute("select * from tblApplicationItem order by iposition");
if (results.Rows.Count == 0)
return;
for (int row = 0; row < results.Rows.Count; row++)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -132,7 +132,8 @@
FROM
sqlite_temp_master
- WHERE type='" + strType + @"'
+ WHERE
+ type='" + strType + @"'
ORDER BY name");
@@ -181,14 +182,14 @@
if (sqlDB == null)
return false;
- skipPrePostPatch = DatabaseUtility.AddTable(sqlDB, "application", "CREATE TABLE application (appid integer primary key, fatherID integer, title text, shorttitle text, filename text, arguments text, windowstyle text, startupdir text, useshellexecute text, usequotes text, source_type text, source text, imagefile text, filedirectory text, imagedirectory text, validextensions text, enabled text, importvalidimagesonly text, iposition integer, enableGUIRefresh text, GUIRefreshPossible text, contentID integer, systemdefault text, waitforexit text, pincode integer, preLaunch text, postLaunch text)");
- DatabaseUtility.AddTable(sqlDB, "tblfile", "CREATE TABLE tblfile (fileid integer primary key, appid integer, title text, filename text, filepath text, imagefile text, genre text, genre2 text, genre3 text, genre4 text, genre5 text, country text, manufacturer text, year integer, rating integer, overview text, system text, import_flag integer, manualfilename text, lastTimeLaunched text, launchcount integer, isfolder text, external_id integer, uppertitle text, tagdata text, categorydata text)");
- DatabaseUtility.AddTable(sqlDB, "filterItem", "CREATE TABLE filterItem (appid integer, grouperAppID integer, fileID integer, filename text, tag integer)");
- DatabaseUtility.AddTable(sqlDB, "setting", "CREATE TABLE setting (settingid integer primary key, key text, value text)");
- DatabaseUtility.AddIndex(sqlDB, "idxFile1", "CREATE INDEX idxFile1 ON tblfile(appid)");
- DatabaseUtility.AddIndex(sqlDB, "idxFile2", "CREATE INDEX idxFile2 ON tblfile(filepath, uppertitle)");
- DatabaseUtility.AddIndex(sqlDB, "idxApp1", "CREATE INDEX idxApp1 ON application(fatherID)");
- DatabaseUtility.AddIndex(sqlDB, "idxFilterItem1", "CREATE UNIQUE INDEX idxFilterItem1 ON filterItem(appID, fileID, grouperAppID)");
+ skipPrePostPatch = DatabaseUtility.AddTable(sqlDB, "tblApplicationItem", "CREATE TABLE tblApplicationItem (appid integer primary key, fatherID integer, title text, shorttitle text, filename text, arguments text, windowstyle text, startupdir text, useshellexecute text, usequotes text, source_type text, source text, imagefile text, filedirectory text, imagedirectory text, validextensions text, enabled text, importvalidimagesonly text, iposition integer, enableGUIRefresh text, GUIRefreshPossible text, contentID integer, systemdefault text, waitforexit text, pincode integer, preLaunch text, postLaunch text)");
+ DatabaseUtility.AddTable(sqlDB, "tblFileItem", "CREATE TABLE tblFileItem (fileid integer primary key, appid integer, title text, filename text, filepath text, imagefile text, mainGenre text, subGenre text, country text, manufacturer text, year integer, rating integer, overview text, system text, import_flag integer, manualfilename text, lastTimeLaunched text, launchcount integer, isfolder text, external_id integer, uppertitle text, tagdata text, categorydata text)");
+ DatabaseUtility.AddTable(sqlDB, "tblFilterItem", "CREATE TABLE tblFilterItem (appid integer, grouperAppID integer, fileID integer, filename text, tag integer)");
+ DatabaseUtility.AddTable(sqlDB, "tblSetting", "CREATE TABLE tblSetting (settingid integer primary key, key text, value text)");
+ DatabaseUtility.AddIndex(sqlDB, "idxFile1", "CREATE INDEX idxFile1 ON tblFileItem(appid)");
+ DatabaseUtility.AddIndex(sqlDB, "idxFile2", "CREATE INDEX idxFile2 ON tblFileItem(filepath, uppertitle)");
+ DatabaseUtility.AddIndex(sqlDB, "idxApp1", "CREATE INDEX idxApp1 ON tblApplicationItem(fatherID)");
+ DatabaseUtility.AddIndex(sqlDB, "idxFilterItem1", "CREATE UNIQUE INDEX idxFilterItem1 ON tblFilterItem(appID, fileID, grouperAppID)");
if (skipPrePostPatch)
{
@@ -207,8 +208,8 @@
if (!DatabaseSettings.KeyExists(ProgramUtils.cCONTENT_PATCH))
{
Log.Info("myPrograms: applying contentID-patch");
- sqlDB.Execute("UPDATE application SET contentID = 100 WHERE contentID IS NULL");
- sqlDB.Execute("UPDATE application SET contentID = 100 WHERE contentID <= 0");
+ sqlDB.Execute("UPDATE tblApplicationItem SET contentID = 100 WHERE contentID IS NULL");
+ sqlDB.Execute("UPDATE tblApplicationItem SET contentID = 100 WHERE contentID <= 0");
DatabaseSettings.WriteSetting(ProgramUtils.cCONTENT_PATCH, "DONE");
}
}
@@ -219,9 +220,9 @@
return;
Log.Info("myPrograms: applying empty-value-patch");
- sqlDB.Execute("UPDATE tblfile SET launchcount = 0 WHERE launchcount = ''");
- sqlDB.Execute("UPDATE tblfile SET launchcount = 0 WHERE launchcount <= 0");
- sqlDB.Execute("UPDATE tblfile SET lastTimeLaunched = '01.01.0001 00:00:00' WHERE lastTimeLaunched = ''");
+ sqlDB.Execute("UPDATE tblFileItem SET launchcount = 0 WHERE launchcount = ''");
+ sqlDB.Execute("UPDATE tblFileItem SET launchcount = 0 WHERE launchcount <= 0");
+ sqlDB.Execute("UPDATE tblFileItem SET lastTimeLaunched = '01.01.0001 00:00:00' WHERE lastTimeLaunched = ''");
}
static void PatchGenreValues()
@@ -231,11 +232,8 @@
if (!DatabaseSettings.KeyExists(ProgramUtils.cGENRE_PATCH))
{
Log.Info("myPrograms: applying genre-patch");
- sqlDB.Execute("UPDATE tblfile SET genre = '' WHERE genre IS NULL");
- sqlDB.Execute("UPDATE tblfile SET genre2 = '' WHERE genre2 IS NULL");
- sqlDB.Execute("UPDATE tblfile SET genre3 = '' WHERE genre3 IS NULL");
- sqlDB.Execute("UPDATE tblfile SET genre4 = '' WHERE genre4 IS NULL");
- sqlDB.Execute("UPDATE tblfile SET genre5 = '' WHERE genre5 IS NULL");
+ sqlDB.Execute("UPDATE tblFileItem SET mainGenre = '' WHERE mainGenre IS NULL");
+ sqlDB.Execute("UPDATE tblFileItem SET subGenre = '' WHERE subGenre IS NULL");
DatabaseSettings.WriteSetting(ProgramUtils.cGENRE_PATCH, "DONE");
}
}
@@ -267,8 +265,8 @@
try
{
Log.Info("myPrograms: adding preLaunch / postLaunch fields");
- sqlDB.Execute("ALTER TABLE application ADD COLUMN preLaunch TEXT");
- sqlDB.Execute("ALTER TABLE application ADD COLUMN postLaunch TEXT");
+ sqlDB.Execute("ALTER TABLE tblApplicationItem ADD COLUMN preLaunch TEXT");
+ sqlDB.Execute("ALTER TABLE tblApplicationItem ADD COLUMN postLaunch TEXT");
DatabaseSettings.WriteSetting(ProgramUtils.cPREPOST_PATCH, "DONE");
}
catch (SQLiteException ex)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseSettings.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseSettings.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseSettings.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -52,7 +52,7 @@
value
FROM
- setting
+ tblSetting
WHERE
key ='" + Key + "'";
@@ -77,7 +77,7 @@
COUNT(*)
FROM
- setting
+ tblSetting
WHERE key ='" + Key + "'");
@@ -100,7 +100,7 @@
{
sqlDB.Execute(@"
UPDATE
- setting
+ tblSetting
SET
value = '" + Value + @"'
@@ -112,7 +112,7 @@
{
sqlDB.Execute(@"
INSERT INTO
- setting (key, value)
+ tblSetting (key, value)
VALUES('" + Key + "', '" + Value + "')");
}
@@ -120,7 +120,7 @@
static public void DeleteSetting(string Key)
{
- sqlDB.Execute("DELETE FROM setting WHERE key = '" + Key + "'");
+ sqlDB.Execute("DELETE FROM tblSetting WHERE key = '" + Key + "'");
}
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -673,47 +673,28 @@
void GenreToFileItem()
{
- CurFile.Genre = "";
- CurFile.Genre2 = "";
- CurFile.Genre3 = "";
- CurFile.Genre4 = "";
- CurFile.Genre5 = "";
- if (txtGenre.Lines.Length > 0) { CurFile.Genre = txtGenre.Lines[0]; }
- if (txtGenre.Lines.Length > 1) { CurFile.Genre2 = txtGenre.Lines[1]; }
- if (txtGenre.Lines.Length > 2) { CurFile.Genre3 = txtGenre.Lines[2]; }
- if (txtGenre.Lines.Length > 3) { CurFile.Genre4 = txtGenre.Lines[3]; }
- if (txtGenre.Lines.Length > 4) { CurFile.Genre5 = txtGenre.Lines[4]; }
+ CurFile.MainGenre = "";
+ CurFile.SubGenre = "";
+ if (txtGenre.Lines.Length > 0) { CurFile.MainGenre = txtGenre.Lines[0]; }
+ if (txtGenre.Lines.Length > 1) { CurFile.SubGenre = txtGenre.Lines[1]; }
+
}
void FileItemToGenre()
{
string sep = "";
txtGenre.Text = "";
- if (CurFile.Genre != "")
+ if (CurFile.MainGenre != "")
{
- txtGenre.Text = txtGenre.Text + sep + CurFile.Genre;
+ txtGenre.Text = txtGenre.Text + sep + CurFile.MainGenre;
sep = "\r\n";
}
- if (CurFile.Genre2 != "")
+ if (CurFile.SubGenre != "")
{
- txtGenre.Text = txtGenre.Text + sep + CurFile.Genre2;
+ txtGenre.Text = txtGenre.Text + sep + CurFile.SubGenre;
sep = "\r\n";
}
- if (CurFile.Genre3 != "")
- {
- txtGenre.Text = txtGenre.Text + sep + CurFile.Genre3;
- sep = "\r\n";
- }
- if (CurFile.Genre4 != "")
- {
- txtGenre.Text = txtGenre.Text + sep + CurFile.Genre4;
- sep = "\r\n";
- }
- if (CurFile.Genre5 != "")
- {
- txtGenre.Text = txtGenre.Text + sep + CurFile.Genre5;
- sep = "\r\n";
- }
+
}
private void btnOk_Click(object sender, EventArgs e)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -49,11 +49,8 @@
string filename;
string filepath;
string imagefile;
- string genre;
- string genre2;
- string genre3;
- string genre4;
- string genre5;
+ string mainGenre;
+ string subGenre;
string country;
string manufacturer;
int year;
@@ -87,11 +84,8 @@
filename = "";
filepath = "";
imagefile = "";
- genre = "";
- genre2 = "";
- genre3 = "";
- genre4 = "";
- genre5 = "";
+ mainGenre = "";
+ subGenre = "";
country = "";
manufacturer = "";
year = -1;
@@ -225,70 +219,34 @@
}
}
- public string Genre
+ public string MainGenre
{
get
{
- return genre;
+ return mainGenre;
}
set
{
- genre = value;
+ mainGenre = value;
}
}
- public string Genre2
+ public string SubGenre
{
get
{
- return genre2;
+ return subGenre;
}
set
{
- genre2 = value;
+ subGenre = value;
}
}
- public string Genre3
+ public string Country
{
get
{
- return genre3;
- }
- set
- {
- genre3 = value;
- }
- }
-
- public string Genre4
- {
- get
- {
- return genre4;
- }
- set
- {
- genre4 = value;
- }
- }
-
- public string Genre5
- {
- get
- {
- return genre5;
- }
- set
- {
- genre5 = value;
- }
- }
-
- public string Country
- {
- get
- {
return country;
}
set
@@ -615,18 +573,15 @@
string strSQL = String.Format(
@"
INSERT INTO
- tblfile (
+ tblFileItem (
fileid,
appid,
title,
filename,
filepath,
imagefile,
- genre,
- genre2,
- genre3,
- genre4,
- genre5,
+ mainGenre,
+ subGenre,
country,
manufacturer,
year,
@@ -665,21 +620,15 @@
'{17}',
'{18}',
'{19}',
- '{20}',
- '{21}',
- '{22}',
- '{23}'
+ '{20}'
)",
AppID,
ProgramUtils.Encode(Title),
ProgramUtils.Encode(Filename),
ProgramUtils.Encode(Filepath),
ProgramUtils.Encode(Imagefile),
- ProgramUtils.Encode(Genre),
- ProgramUtils.Encode(Genre2),
- ProgramUtils.Encode(Genre3),
- ProgramUtils.Encode(Genre4),
- ProgramUtils.Encode(Genre5),
+ ProgramUtils.Encode(MainGenre),
+ ProgramUtils.Encode(SubGenre),
Country,
ProgramUtils.Encode(Manufacturer),
strYear,
@@ -726,7 +675,7 @@
string strSQL = String.Format(
@"
INSERT INTO
- tblfile (
+ tblFileItem (
fileid,
appid,
title,
@@ -826,7 +775,7 @@
try
{
string strSQL = String.Format(
- "UPDATE tblfile SET title = '{1}', filename = '{2}', filepath = '{3}', imagefile = '{4}', genre = '{5}', genre2 = '{6}', genre3 = '{7}', genre4 = '{8}', genre5 = '{9}', country = '{10}', manufacturer = '{11}', year = '{12}', rating = '{13}', overview = '{14}', system = '{15}', uppertitle = '{16}', tagdata = '{17}', categorydata = '{18}' where fileid = {0}", FileID, ProgramUtils.Encode(Title), ProgramUtils.Encode(Filename), ProgramUtils.Encode(Filepath), ProgramUtils.Encode(Imagefile), ProgramUtils.Encode(Genre), ProgramUtils.Encode(Genre2), ProgramUtils.Encode(Genre3), ProgramUtils.Encode(Genre4), ProgramUtils.Encode(Genre5), ProgramUtils.Encode(Country), ProgramUtils.Encode(Manufacturer), strYear, Rating, ProgramUtils.Encode(Overview), ProgramUtils.Encode(System_), ProgramUtils.Encode(Title.ToUpper()), ProgramUtils.Encode(TagData), ProgramUtils.Encode(CategoryData));
+ "UPDATE tblFileItem SET title = '{1}', filename = '{2}', filepath = '{3}', imagefile = '{4}', mainGenre = '{5}', subGenre = '{6}', country = '{7}', manufacturer = '{8}', year = '{9}', rating = '{10}', overview = '{11}', system = '{12}', uppertitle = '{13}', tagdata = '{14}', categorydata = '{15}' where fileid = {0}", FileID, ProgramUtils.Encode(Title), ProgramUtils.Encode(Filename), ProgramUtils.Encode(Filepath), ProgramUtils.Encode(Imagefile), ProgramUtils.Encode(MainGenre), ProgramUtils.Encode(SubGenre), ProgramUtils.Encode(Country), ProgramUtils.Encode(Manufacturer), strYear, Rating, ProgramUtils.Encode(Overview), ProgramUtils.Encode(System_), ProgramUtils.Encode(Title.ToUpper()), ProgramUtils.Encode(TagData), ProgramUtils.Encode(CategoryData));
sqlDB.Execute(strSQL);
}
catch (SQLiteException ex)
@@ -841,7 +790,7 @@
{
LastTimeLaunched = DateTime.Now;
LaunchCount = LaunchCount + 1;
- string strSQL = String.Format("UPDATE tblfile SET lastTimeLaunched = '{0}', launchcount = {1} WHERE fileid = {2}", LastTimeLaunched, LaunchCount, FileID);
+ string strSQL = String.Format("UPDATE tblFileItem SET lastTimeLaunched = '{0}', launchcount = {1} WHERE fileid = {2}", LastTimeLaunched, LaunchCount, FileID);
sqlDB.Execute(strSQL);
}
catch (SQLiteException ex)
@@ -868,8 +817,8 @@
{
try
{
- string strSQL1 = String.Format("DELETE FROM filteritem WHERE fileid = {0}", this.FileID);
- string strSQL2 = String.Format("DELETE FROM tblfile WHERE fileid = {0}", this.FileID);
+ string strSQL1 = String.Format("DELETE FROM tblFilterItem WHERE fileid = {0}", this.FileID);
+ string strSQL2 = String.Format("DELETE FROM tblFileItem WHERE fileid = {0}", this.FileID);
sqlDB.Execute(strSQL1);
sqlDB.Execute(strSQL2);
}
@@ -957,11 +906,8 @@
FileInfoFavourite.Title = this.Title;
//FileInfoFavourite.GameURL = this.mGameURL;
- FileInfoFavourite.Genre = this.Genre;
- FileInfoFavourite.Genre2 = this.Genre2;
- FileInfoFavourite.Genre3 = this.Genre3;
- FileInfoFavourite.Genre4 = this.Genre4;
- FileInfoFavourite.Genre5 = this.Genre5;
+ FileInfoFavourite.MainGenre = this.MainGenre;
+ FileInfoFavourite.SubGenre = this.SubGenre;
FileInfoFavourite.Manufacturer = this.Manufacturer;
FileInfoFavourite.Year = this.Year.ToString();
FileInfoFavourite.Overview = this.Overview;
@@ -974,11 +920,8 @@
if (this.FileInfoFavourite != null)
{
// DON'T overwrite title! this.Title = FileInfoFavourite.Title;
- this.Genre = FileInfoFavourite.Genre;
- this.Genre2 = FileInfoFavourite.Genre2;
- this.Genre3 = FileInfoFavourite.Genre3;
- this.Genre4 = FileInfoFavourite.Genre4;
- this.Genre5 = FileInfoFavourite.Genre5;
+ this.MainGenre = FileInfoFavourite.MainGenre;
+ this.SubGenre = FileInfoFavourite.SubGenre;
this.Manufacturer = FileInfoFavourite.Manufacturer;
this.Year = ProgramUtils.StringToInteger(FileInfoFavourite.Year, -1);
this.Overview = FileInfoFavourite.Overview;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -45,11 +45,8 @@
string year;
string gameURL;
string title;
- string genre;
- string genre2;
- string genre3;
- string genre4;
- string genre5;
+ string mainGenre;
+ string subGenre;
string style;
string platform;
string rating;
@@ -69,11 +66,8 @@
year = "";
gameURL = "";
title = "";
- genre = "";
- genre2 = "";
- genre3 = "";
- genre4 = "";
- genre5 = "";
+ mainGenre = "";
+ subGenre = "";
style = "";
platform = "";
rating = "";
@@ -152,66 +146,31 @@
}
}
- public string Genre
+ public string MainGenre
{
get
{
- return genre;
+ return mainGenre;
}
set
{
- genre = value;
+ mainGenre = value;
}
}
- public string Genre2
+ public string SubGenre
{
get
{
- return genre2;
+ return subGenre
+ ;
}
set
{
- genre2 = value;
+ subGenre = value;
}
}
- public string Genre3
- {
- get
- {
- return genre3;
- }
- set
- {
- genre3 = value;
- }
- }
-
- public string Genre4
- {
- get
- {
- return genre4;
- }
- set
- {
- genre4 = value;
- }
- }
-
- public string Genre5
- {
- get
- {
- return genre5;
- }
- set
- {
- genre5 = value;
- }
- }
-
public string Style
{
get
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -82,11 +82,8 @@
newFile.Filename = ProgramUtils.Get(results, iRecord, "filename");
newFile.Filepath = ProgramUtils.Get(results, iRecord, "filepath");
newFile.Imagefile = ProgramUtils.Get(results, iRecord, "imagefile");
- newFile.Genre = ProgramUtils.Get(results, iRecord, "genre");
- newFile.Genre2 = ProgramUtils.Get(results, iRecord, "genre2");
- newFile.Genre3 = ProgramUtils.Get(results, iRecord, "genre3");
- newFile.Genre4 = ProgramUtils.Get(results, iRecord, "genre4");
- newFile.Genre5 = ProgramUtils.Get(results, iRecord, "genre5");
+ newFile.MainGenre = ProgramUtils.Get(results, iRecord, "mainGenre");
+ newFile.SubGenre = ProgramUtils.Get(results, iRecord, "subGenre");
newFile.Country = ProgramUtils.Get(results, iRecord, "country");
newFile.Manufacturer = ProgramUtils.Get(results, iRecord, "manufacturer");
newFile.Year = ProgramUtils.GetIntDef(results, iRecord, "year", -1);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkItem.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkItem.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -79,7 +79,7 @@
try
{
//sqliteClient.Execute("begin");
- string strSQL2 = String.Format(String.Format("DELETE FROM filterItem WHERE appid = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
+ string strSQL2 = String.Format(String.Format("DELETE FROM tblFilterItem WHERE appid = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
this.AppID, this.FileID));
sqlDB.Execute(strSQL2);
//sqliteClient.Execute("commit");
@@ -96,7 +96,7 @@
{
SQLiteResultSet results;
int res = 0;
- results = sqlDB.Execute(String.Format("SELECT COUNT(*) FROM filterItem WHERE appid = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
+ results = sqlDB.Execute(String.Format("SELECT COUNT(*) FROM tblFilterItem WHERE appid = {0} AND grouperAppID = {1} AND fileID = {2}", this.TargetAppID,
this.AppID, this.FileID));
if (results != null && results.Rows.Count > 0)
{
@@ -111,7 +111,7 @@
try
{
//sqliteClient.Execute("begin");
- string strSQL2 = String.Format(String.Format("INSERT INTO filterItem (appid, grouperAppID, fileID, filename) VALUES ({0}, {1}, {2}, '{3}')",
+ string strSQL2 = String.Format(String.Format("INSERT INTO tblFilterItem (appid, grouperAppID, fileID, filename) VALUES ({0}, {1}, {2}, '{3}')",
this.TargetAppID, this.AppID, this.FileID, ProgramUtils.Encode(Filename)));
// Log.Info("hi from filelinkiteminsert: {0}", strSQL2);
sqlDB.Execute(strSQL2);
@@ -127,7 +127,7 @@
private void Update()
{
// nothing to update (yet)
- //...... as all FILTERITEM fields are primary key fields...
+ //...... as all tblFilterItem fields are primary key fields...
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -56,11 +56,8 @@
newLink.Filename = ProgramUtils.Get(results, iRecord, "filename");
newLink.Filepath = ProgramUtils.Get(results, iRecord, "filepath");
newLink.Imagefile = ProgramUtils.Get(results, iRecord, "imagefile");
- newLink.Genre = ProgramUtils.Get(results, iRecord, "genre");
- newLink.Genre2 = ProgramUtils.Get(results, iRecord, "genre2");
- newLink.Genre3 = ProgramUtils.Get(results, iRecord, "genre3");
- newLink.Genre4 = ProgramUtils.Get(results, iRecord, "genre4");
- newLink.Genre5 = ProgramUtils.Get(results, iRecord, "genre5");
+ newLink.MainGenre = ProgramUtils.Get(results, iRecord, "mainGenre");
+ newLink.SubGenre = ProgramUtils.Get(results, iRecord, "subGenre");
newLink.Country = ProgramUtils.Get(results, iRecord, "country");
newLink.Manufacturer = ProgramUtils.Get(results, iRecord, "manufacturer");
newLink.Year = ProgramUtils.GetIntDef(results, iRecord, "year", -1);
@@ -90,7 +87,7 @@
// applicationItem.
// SPECIAL: the current application IS NOT the application with the launchinfo!
strSQL = String.Format(
- "SELECT fi.appid AS targetappid, fi.grouperappid AS grouperappid, f.fileid AS fileid, title, uppertitle, f.filename as filename, filepath, imagefile, genre, genre2, genre3, genre4, genre5, country, manufacturer, YEAR, rating, overview, SYSTEM, import_flag, manualfilename, lasttimelaunched, launchcount, isfolder, external_id FROM tblFILE f, filteritem fi WHERE f.fileid = fi.fileid AND grouperappid = {0} ORDER BY filepath, uppertitle", nAppID);
+ "SELECT fi.appid AS targetappid, fi.grouperappid AS grouperappid, f.fileid AS fileid, title, uppertitle, f.filename as filename, filepath, imagefile, genre, genre2, genre3, genre4, genre5, country, manufacturer, YEAR, rating, overview, SYSTEM, import_flag, manualfilename, lasttimelaunched, launchcount, isfolder, external_id FROM tblFileItem f, tblFilterItem fi WHERE f.fileid = fi.fileid AND grouperappid = {0} ORDER BY filepath, uppertitle", nAppID);
results = sqlDB.Execute(strSQL);
if (results.Rows.Count == 0)
return;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIFileDetailsInfoParser.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIFileDetailsInfoParser.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIFileDetailsInfoParser.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -210,31 +210,16 @@
case "genre":
{
string sep = "";
- if (curFile.Genre != "")
+ if (curFile.MainGenre != "")
{
- result = curFile.Genre;
+ result = curFile.MainGenre;
sep = " / ";
}
- if (curFile.Genre2 != "")
+ if (curFile.SubGenre != "")
{
- result = result + sep + curFile.Genre2;
+ result = result + sep + curFile.SubGenre;
sep = " / ";
}
- if (curFile.Genre3 != "")
- {
- result = result + sep + curFile.Genre3;
- sep = " / ";
- }
- if (curFile.Genre4 != "")
- {
- result = result + sep + curFile.Genre4;
- sep = " / ";
- }
- if (curFile.Genre5 != "")
- {
- result = result + sep + curFile.Genre5;
- sep = " / ";
- }
break;
}
case "overview":
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/AllGameScraper.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -173,7 +173,7 @@
newGame.Style = match.Groups["style"].Value;
match = Regex.Match(tableData[6], regexpGenre, RegexOptions.IgnoreCase);
- newGame.Genre = match.Groups["genre"].Value;
+ newGame.MainGenre = match.Groups["genre"].Value;
match = Regex.Match(tableData[7], regexpPlatform, RegexOptions.IgnoreCase);
newGame.Platform = match.Groups["platform"].Value;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -71,8 +71,8 @@
string strGenre1 = myReader["ParentGenre"].ToString();
string strGenre2 = myReader["Genre"].ToString();
- curFile.Genre = strGenre1;
- curFile.Genre2 = strGenre2;
+ curFile.MainGenre = strGenre1;
+ curFile.SubGenre = strGenre2;
// todo: country
curFile.Country = "";
curFile.Manufacturer = myReader["Publisher"].ToString();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -466,7 +466,7 @@
void ProcessGenreEntry(FileItem curFile, string genreEntry)
{
- string[] genres = new string[5];
+ string[] genres = new string[2];
string[] tmpArr = genreEntry.Split('/');
if (tmpArr.Length > 0)
@@ -480,20 +480,18 @@
}
//then fill genres with real val
- for (int z = 0; z < tmpArr.Length; z++)
+ for (int z = 0; ((z < genres.Length) && (z < tmpArr.Length)); z++)
{
genres[z] = tmpArr[z];
}
- curFile.Genre = genres[0];
- curFile.Genre2 = genres[1];
- curFile.Genre3 = genres[2];
- curFile.Genre4 = genres[3];
- curFile.Genre5 = genres[4];
+ curFile.MainGenre = genres[0];
+ curFile.SubGenre = genres[1];
+
}
// mspacman=Maze
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-10 17:28:47 UTC (rev 504)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-10 17:37:16 UTC (rev 505)
@@ -277,7 +277,7 @@
SQLSelectBuilder sqlSelect = new SQLSelectBuilder();
// build the SQL query respecting all the filters and let
// the query be executed from outside (this is different from MusicViewHandler)
- sqlSelect.AddTable("tblfile");
+ sqlSelect.AddTable("tblFileItem");
sqlSelect.AddWhereCond(String.Format("appid = {0}", appID));
if (currentView == null)
{
@@ -286,7 +286,7 @@
// a: "select file.*, '' as title2, '' as fieldtype2 from file where appid = {0} order by isfolder desc, uppertitle"
// b: "select file.*, '' as title2, '' as fieldtype2 from file where appid = {0} and filepath = '{1}' order by isfolder desc, uppertitle"
- sqlSelect.AddField("tblfile.*");
+ sqlSelect.AddField("tblFileItem.*");
sqlSelect.AddField("'' as title2");
sqlSelect.AddField("'' as fieldtype2");
if (pathSubfolders != "")
@@ -334,7 +334,7 @@
{
return @"SELECT
UPPER(SUBSTR(" + currentViewFilterFieldVariable + ",1," + currentViewFilterFieldRestriction + @")) AS title,
- COUNT(*) FROM tblfile WHERE appid = " + appID + @"
+ COUNT(*) FROM tblFileItem WHERE appid = " + appID + @"
GROUP BY UPPER(SUBSTR(title,1," + currentViewFilterFieldRestriction + @"))
@@ -365,7 +365,7 @@
UPPER(SUBSTR(" + currentViewFilterFieldVariable + ",1," + currentViewFilterFieldRestriction + @")) AS title,
Count(*)
- FROM tblfile
+ FROM tblFileItem
WHERE
appid = " + appID + @"
@@ -376,7 +376,7 @@
UPPER(SUBSTR(" + prevViewFilterFieldVariable + ",1," + prevViewFilterRestriciton + @")) AS title
FROM
- tblfile
+ tblFileItem
WHERE
appid = " + appID + @"
@@ -397,11 +397,11 @@
else
{
return @"SELECT
- tblfile.*,
+ tblFileItem.*,
'STR' AS fieldtype
FROM
- tblfile
+ tblFileItem
WHERE
UPPER(SUBSTR(" + prevViewFilterFieldVariable + ",1," + prevViewFilterRestriciton + @")) LIKE '" + prevViewFilterFieldSelectedValue + @"%'
@@ -569,18 +569,18 @@
string res = "";
if (where == "launchcount")
{
- res = "tblfile.*";
+ res = "tblFileItem.*";
}
else if (where == "lastTimeLaunched")
{
- res = "tblfile.*";
+ res = "tblFileItem.*";
}
else
{
res = GetFieldName(where);
if (res == "")
{
- res = "tblfile.*";
+ res = "tblFileItem.*";
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
