Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [642] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt
|
From: <nor...@us...> - 2007-06-26 20:34:54
|
Revision: 642
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=642&view=rev
Author: northern_sky
Date: 2007-06-26 13:34:51 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
DB:
- 3 fields removed (external_id,manualfilename,shortitle) + code
- no more quotes around filename in db,parsed instead
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -49,7 +49,6 @@
int appID;
int fatherID;
string title;
- string shortTitle;
string filename;
string arguments;
@@ -123,11 +122,7 @@
get { return title; }
set { title = value; }
}
- public string ShortTitle
- {
- get { return shortTitle; }
- set { shortTitle = value; }
- }
+
public string Filename
{
get { return filename; }
@@ -340,7 +335,6 @@
appID = -1;
fatherID = -1;
title = "";
- shortTitle = "";
filename = "";
arguments = "";
windowStyle = ProcessWindowStyle.Normal;
@@ -436,9 +430,9 @@
// filename of the application
procStart.FileName = this.Filename;
- // avoid double quotes around the filename-argument.....
+ // double quotes around the filename-argument.....
if (UseQuotes)
- curFilename = "\"" + (curFileItem.Filename.TrimStart('\"')).TrimEnd('\"') + "\"";
+ curFilename = "\"" + curFileItem.Filename + "\"";
// set the arguments: one of the arguments is the fileitem-filename
if (this.Arguments.Contains("%FILEnoPATHnoEXT%"))
@@ -463,7 +457,14 @@
{
// application has no launch-file
// => try to make a correct launch using the current FILE object
- procStart.FileName = curFileItem.Filename;
+ if (UseQuotes)
+ {
+ procStart.FileName = "\"" + curFileItem.Filename + "\"";
+ }
+ else
+ {
+ procStart.FileName = curFileItem.Filename;
+ }
// set WorkingDirectory
if (this.StartupDir == "")
@@ -859,7 +860,6 @@
appid,
fatherID,
title,
- shorttitle,
filename,
arguments,
windowstyle,
@@ -888,7 +888,6 @@
'"+ AppID + @"',
'"+ FatherID + @"',
'"+ ProgramUtils.Encode(Title) +@"',
- '"+ ProgramUtils.Encode(ShortTitle) +@"',
'"+ ProgramUtils.Encode(Filename) +@"',
'"+ ProgramUtils.Encode(Arguments) + @"',
'"+ ProgramUtils.WindowStyleToStr(WindowStyle) +@"',
@@ -938,7 +937,6 @@
tblApplicationItem SET
title = '" + ProgramUtils.Encode(Title) + @"',
- shorttitle = '" + ProgramUtils.Encode(ShortTitle) + @"',
filename = '" + ProgramUtils.Encode(Filename) + @"',
arguments = '" + ProgramUtils.Encode(Arguments) + @"',
windowstyle = '" + ProgramUtils.WindowStyleToStr(WindowStyle) + @"',
@@ -1114,7 +1112,6 @@
this.AppID = sourceApp.AppID;
this.FatherID = sourceApp.FatherID;
this.Title = sourceApp.Title;
- this.ShortTitle = sourceApp.ShortTitle;
this.Filename = sourceApp.Filename;
this.Arguments = sourceApp.Arguments;
this.WindowStyle = sourceApp.WindowStyle;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -156,15 +156,10 @@
curFile.Title = fileInfo.Name;
curFile.Title = curFile.TitleNormalized;
curFile.Filename = fileInfo.FullName;
- if (this.UseQuotes)
- {
- curFile.Filename = "\"" + curFile.Filename + "\"";
- }
curFile.Imagefile = GetThumbsFile(fileInfo, curFile.TitleNormalized);
// not imported properties => set default values
- curFile.ManualFilename = "";
curFile.LastTimeLaunched = DateTime.MinValue;
curFile.LaunchCount = 0;
curFile.Write();
@@ -186,14 +181,9 @@
this.Files.Load(AppID, "");
foreach (FileItem DBfile in this.Files)
{
- if (this.UseQuotes && !DBfile.IsFolder)
- {
- TheFileName = DBfile.Filename.Substring(1, DBfile.Filename.Length - 2);
- }
- else
- {
- TheFileName = DBfile.Filename;
- }
+
+ TheFileName = DBfile.Filename;
+
if (!DBfile.IsFolder)
{
if (!File.Exists(TheFileName)) { DBfile.Delete(); }
@@ -224,8 +214,7 @@
foreach (FileItem DBfile in this.Files)
{
- if ((((this.UseQuotes) && (DBfile.Filename == "\"" + fileInDir.FullName + "\""))
- || ((!this.UseQuotes) && (DBfile.Filename == fileInDir.FullName))))
+ if (DBfile.Filename == fileInDir.FullName)
{
FileExists = true;
break;//ugly
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -61,7 +61,6 @@
newApp.AppID = ProgramUtils.GetIntDef(results, recordIndex, "appid", -1);
newApp.FatherID = ProgramUtils.GetIntDef(results, recordIndex, "fatherID", -1);
newApp.Title = ProgramUtils.Get(results, recordIndex, "title");
- newApp.ShortTitle = ProgramUtils.Get(results, recordIndex, "shorttitle");
newApp.Filename = ProgramUtils.Get(results, recordIndex, "filename");
newApp.Arguments = ProgramUtils.Get(results, recordIndex, "arguments");
newApp.WindowStyle = ProgramUtils.GetProcessWindowStyle(results, recordIndex, "windowstyle");
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -46,8 +46,9 @@
public class DatabaseHandler
{
public static SQLiteClient sqlDB = null;
- static ApplicationItemList applicationItemList = null;
+ static ApplicationItemList dbHandlerApplicationItemList = null;
static private ProgramViewHandler viewHandler = null;
+ private const string DATABASEFILE = "myProgramsAltDatabaseV1.db3";
// singleton. Dont allow any instance of this class
private DatabaseHandler() { }
@@ -63,8 +64,8 @@
}
catch (Exception) { }
- sqlDB = new SQLiteClient(Config.GetFile(Config.Dir.Database, "myProgramsAltDatabaseV1.db3"));
- MediaPortal.Database.DatabaseUtility.SetPragmas(sqlDB);
+ sqlDB = new SQLiteClient(Config.GetFile(Config.Dir.Database, DATABASEFILE ));
+ DatabaseUtility.SetPragmas(sqlDB);
// make sure the DB-structure is complete
CreateDBTables();
@@ -74,14 +75,13 @@
{
Log.Info("programdatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
}
-
ViewHandler = new ProgramViewHandler();
- applicationItemList = new ApplicationItemList(sqlDB, new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink));
+ dbHandlerApplicationItemList = new ApplicationItemList(sqlDB, new ApplicationItem.FilelinkLaunchEventHandler(LaunchFilelink));
}
static void LaunchFilelink(FilelinkItem curLink, bool MPGUIMode)
{
- ApplicationItem targetApp = applicationItemList.GetAppByID(curLink.TargetAppID);
+ ApplicationItem targetApp = dbHandlerApplicationItemList.GetAppByID(curLink.TargetAppID);
if (targetApp != null)
{
targetApp.LaunchFile(curLink, MPGUIMode);
@@ -97,8 +97,8 @@
if (sqlDB == null)
return false;
- 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, preLaunch text, postLaunch text)");
- DatabaseUtility.AddTable(sqlDB, "tblFileItem", "CREATE TABLE tblFileItem (fileid integer primary key, appid integer, title text, filename 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, gameInfoUrl text)");
+ DatabaseUtility.AddTable(sqlDB, "tblApplicationItem", "CREATE TABLE tblApplicationItem (appid integer primary key, fatherID integer, title 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, preLaunch text, postLaunch text)");
+ DatabaseUtility.AddTable(sqlDB, "tblFileItem", "CREATE TABLE tblFileItem (fileid integer primary key, appid integer, title text, filename text, imagefile text, mainGenre text, subGenre text, country text, manufacturer text, year integer, rating integer, overview text, system text, import_flag integer, lastTimeLaunched text, launchcount integer, isfolder text, uppertitle text, tagdata text, categorydata text, gameInfoUrl 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)");
@@ -109,6 +109,7 @@
return true;
}
+ #region dbsettings
static public string ReadSetting(string Key)
{
SQLiteResultSet results;
@@ -188,6 +189,7 @@
{
sqlDB.Execute("DELETE FROM tblSetting WHERE key = '" + Key + "'");
}
+ #endregion dbsettings
public static ProgramViewHandler ViewHandler
{
@@ -200,7 +202,7 @@
{
get
{
- return applicationItemList;
+ return dbHandlerApplicationItemList;
}
}
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -54,8 +54,8 @@
applicationArgumentsTextBox.Text = curApp.Arguments;
SetWindowStyle(curApp.WindowStyle);
startupDirComboBox.Text = curApp.StartupDir;
- shellexecuteCheckBox.Checked = (curApp.UseShellExecute);
- quoteCheckBox.Checked = (curApp.UseQuotes);
+ shellexecuteCheckBox.Checked = curApp.UseShellExecute;
+ quoteCheckBox.Checked = curApp.UseQuotes;
waitExitCheckBox.Checked = (curApp.WaitForExit);
applicationImageTextBox.Text = curApp.Imagefile;
allowRefreshCheckBox.Checked = curApp.EnableGUIRefresh;
@@ -71,9 +71,9 @@
curApp.Arguments = applicationArgumentsTextBox.Text;
curApp.WindowStyle = GetSelectedWindowStyle();
curApp.StartupDir = startupDirComboBox.Text;
- curApp.UseShellExecute = (shellexecuteCheckBox.Checked);
- curApp.UseQuotes = (quoteCheckBox.Checked);
- curApp.WaitForExit = (waitExitCheckBox.Checked);
+ curApp.UseShellExecute = shellexecuteCheckBox.Checked;
+ curApp.UseQuotes = quoteCheckBox.Checked;
+ curApp.WaitForExit = waitExitCheckBox.Checked;
curApp.SourceType = ApplicationType.DIRCACHE;
curApp.Imagefile = applicationImageTextBox.Text;
curApp.EnableGUIRefresh = (allowRefreshCheckBox.Checked);
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -86,9 +86,9 @@
curApp.Arguments = this.applicationArgumentsTextBox.Text;
curApp.WindowStyle = GetSelectedWindowStyle();
curApp.StartupDir = this.startupDirComboBox.Text;
- curApp.UseShellExecute = (this.shellexecuteCheckBox.Checked);
- curApp.UseQuotes = (this.quoteCheckBox.Checked);
- curApp.WaitForExit = (this.waitExitCheckBox.Checked);
+ curApp.UseShellExecute = this.shellexecuteCheckBox.Checked;
+ curApp.UseQuotes = this.quoteCheckBox.Checked;
+ curApp.WaitForExit = this.waitExitCheckBox.Checked;
curApp.SourceType = ApplicationType.GAMEBASE;
curApp.Imagefile = this.applicationImageTextBox.Text;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -60,11 +60,10 @@
int rating;
string overview;
string system;
- string manualFilename;
DateTime lastTimeLaunched;
int launchCount;
- int extFileID;
+
string tagData;
string categoryData;
bool isFolder;
@@ -104,11 +103,9 @@
rating = -1;
overview = "";
system = "";
- manualFilename = "";
isFolder = false;
lastTimeLaunched = DateTime.MinValue;
launchCount = 0;
- extFileID = -1;
tagData = "";
categoryData = "";
gameInfoURL = string.Empty;
@@ -315,17 +312,7 @@
system = value;
}
}
- public string ManualFilename
- {
- get
- {
- return manualFilename;
- }
- set
- {
- manualFilename = value;
- }
- }
+
public DateTime LastTimeLaunched
{
get
@@ -349,17 +336,7 @@
}
}
- public int ExtFileID
- {
- get
- {
- return extFileID;
- }
- set
- {
- extFileID = value;
- }
- }
+
public string TagData
{
get
@@ -575,11 +552,9 @@
rating,
overview,
system,
- manualfilename,
lastTimeLaunched,
launchcount,
isfolder,
- external_id,
uppertitle,
tagdata,
categorydata,
@@ -601,11 +576,9 @@
'" + Rating+ @"',
'" + ProgramUtils.Encode(Overview)+ @"',
'" + ProgramUtils.Encode(System_)+ @"',
- '" + ProgramUtils.Encode(ManualFilename)+ @"',
'" + LastTimeLaunched.ToString()+ @"',
'" + LaunchCount.ToString()+ @"',
'" + ProgramUtils.BooleanToStr(IsFolder)+ @"',
- '" + ExtFileID+ @"',
'" + ProgramUtils.Encode(Title.ToUpper())+ @"',
'" + ProgramUtils.Encode(TagData)+ @"',
'" + ProgramUtils.Encode(CategoryData))+ @"',
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -83,7 +83,6 @@
newFile.Rating = ProgramUtils.GetIntDef(results, iRecord, "rating", 5);
newFile.Overview = ProgramUtils.Get(results, iRecord, "overview");
newFile.System_ = ProgramUtils.Get(results, iRecord, "system");
- newFile.ExtFileID = ProgramUtils.GetIntDef(results, iRecord, "external_id", -1);
newFile.LastTimeLaunched = ProgramUtils.GetDateDef(results, iRecord, "lastTimeLaunched", DateTime.MinValue);
newFile.LaunchCount = ProgramUtils.GetIntDef(results, iRecord, "launchcount", 0);
newFile.IsFolder = ProgramUtils.GetBool(results, iRecord, "isfolder");
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -63,7 +63,6 @@
newLink.Rating = ProgramUtils.GetIntDef(results, iRecord, "rating", 5);
newLink.Overview = ProgramUtils.Get(results, iRecord, "overview");
newLink.System_ = ProgramUtils.Get(results, iRecord, "system");
- newLink.ExtFileID = ProgramUtils.GetIntDef(results, iRecord, "external_id", -1);
newLink.LastTimeLaunched = ProgramUtils.GetDateDef(results, iRecord, "lastTimeLaunched", DateTime.MinValue);
newLink.LaunchCount = ProgramUtils.GetIntDef(results, iRecord, "launchcount", 0);
newLink.IsFolder = ProgramUtils.GetBool(results, iRecord, "isfolder");
@@ -102,12 +101,10 @@
overview,
system,
import_flag,
- manualFilename,
lastTimeLaunched,
launchCount,
- isFolder,
- external_id
-
+ isFolder
+
FROM
tblFileItem f,
tblFilterItem fi
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-06-26 19:02:52 UTC (rev 641)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-06-26 20:34:51 UTC (rev 642)
@@ -89,7 +89,6 @@
curFile.Overview = myReader["MemoText"].ToString();
curFile.System_ = applicationItem.Title;
// not imported properties => set default values
- curFile.ManualFilename = "";
curFile.LastTimeLaunched = DateTime.MinValue;
curFile.LaunchCount = 0;
curFile.Write();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
