Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [618] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt
|
From: <nor...@us...> - 2007-06-24 12:51:36
|
Revision: 618
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=618&view=rev
Author: northern_sky
Date: 2007-06-24 05:51:32 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
dbchange: filepath-pincode removed
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.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
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -86,7 +86,6 @@
string validExtensions;
bool importValidImagesOnly;
- int pincode;
int contentID;
string systemDefault;
@@ -358,7 +357,6 @@
appPosition = 0;
importValidImagesOnly = false;
enableGUIRefresh = false;
- pincode = -1;
contentID = 100;
systemDefault = "";
waitForExit = true;
@@ -848,20 +846,73 @@
if (sqlDB == null) return;
string sql = "";
- string Pincode = ""; //to remove
if (ContentID <= 0)
ContentID = 100;
try
{
AppID = GetNewAppID(); // important to avoid subsequent inserts!
- 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),
- ProgramUtils.Encode(FileDirectory), ProgramUtils.Encode(ImageDirectory), ProgramUtils.Encode(ValidExtensions), ProgramUtils.BooleanToStr(importValidImagesOnly), Position,
- ProgramUtils.BooleanToStr(Enabled), ProgramUtils.BooleanToStr(EnableGUIRefresh), ProgramUtils.BooleanToStr(GUIRefreshPossible), Pincode,
- ContentID, ProgramUtils.Encode(SystemDefault), ProgramUtils.BooleanToStr(WaitForExit), ProgramUtils.Encode(PreLaunch), ProgramUtils.Encode(PostLaunch)
+ 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,
+ contentID,
+ systemDefault,
+ WaitForExit,
+ preLaunch,
+ postLaunch
+ )
+ VALUES
+ (
+ '"+ 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) +@"',
+ '"+ ProgramUtils.Encode(FileDirectory) +@"',
+ '"+ ProgramUtils.Encode(ImageDirectory)+@"',
+ '"+ ProgramUtils.Encode(ValidExtensions)+@"',
+ '"+ ProgramUtils.BooleanToStr(importValidImagesOnly)+@"',
+ '"+ Position+@"',
+ '"+ ProgramUtils.BooleanToStr(Enabled)+@"',
+ '"+ ProgramUtils.BooleanToStr(EnableGUIRefresh) +@"',
+ '" + ProgramUtils.BooleanToStr(GUIRefreshPossible)+@"',
+ '" + ContentID +@"',
+ '"+ ProgramUtils.Encode(SystemDefault)+@"',
+ '"+ ProgramUtils.BooleanToStr(WaitForExit) +@"',
+ '"+ ProgramUtils.Encode(PreLaunch)+@"',
+ '"+ ProgramUtils.Encode(PostLaunch)+@"'
+ )"
+
);
sqlDB.Execute(sql);
}
@@ -877,7 +928,6 @@
if (AppID == -1) return;
string sql = "";
- string Pincode = ""; //to remove
if (ContentID <= 0)
ContentID = 100;
@@ -907,7 +957,6 @@
fatherID = '" + FatherID + @"',
enableGUIRefresh = '" + ProgramUtils.BooleanToStr(EnableGUIRefresh) + @"',
GUIRefreshPossible = '" + ProgramUtils.BooleanToStr(GUIRefreshPossible) +@"',
- pincode = '" + Pincode + @"',
contentID = '" + ContentID + @"',
systemDefault = '" + ProgramUtils.Encode(SystemDefault) + @"',
WaitForExit = '" + ProgramUtils.BooleanToStr(WaitForExit) + @"',
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -160,7 +160,7 @@
{
curFile.Filename = "\"" + curFile.Filename + "\"";
}
- curFile.Filepath = fileInfo.DirectoryName;
+
curFile.Imagefile = GetThumbsFile(fileInfo, curFile.TitleNormalized);
// not imported properties => set default values
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Database/DatabaseHandler.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -182,7 +182,7 @@
if (sqlDB == null)
return false;
- 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)");
+ 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, 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, 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)");
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -49,7 +49,7 @@
string title2;
string titleOptimized;
string filename;
- string filepath;
+ // string filepath;
string imagefile;
string mainGenre;
@@ -94,7 +94,7 @@
title2 = "";
titleOptimized = "";
filename = "";
- filepath = "";
+// filepath = "";
imagefile = "";
mainGenre = "";
subGenre = "";
@@ -204,7 +204,7 @@
filename = value;
}
}
- public string Filepath
+ /* public string Filepath
{
get
{
@@ -214,7 +214,7 @@
{
filepath = value;
}
- }
+ }*/
public string Imagefile
{
get
@@ -566,7 +566,6 @@
appid,
title,
filename,
- filepath,
imagefile,
mainGenre,
subGenre,
@@ -593,7 +592,6 @@
'" + AppID + @"',
'" + ProgramUtils.Encode(Title)+ @"',
'" + ProgramUtils.Encode(Filename)+ @"',
- '" + ProgramUtils.Encode(Filepath)+ @"',
'" + ProgramUtils.Encode(Imagefile)+ @"',
'" + ProgramUtils.Encode(MainGenre)+ @"',
'" + ProgramUtils.Encode(SubGenre)+ @"',
@@ -633,7 +631,7 @@
try
{
string strSQL = String.Format(
- "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}', gameInfoURL = '" + ProgramUtils.Encode(GameInfoURL) +"' 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));
+ "UPDATE tblFileItem SET title = '{1}', filename = '{2}', imagefile = '{3}', mainGenre = '{4}', subGenre = '{5}', country = '{6}', manufacturer = '{7}', year = '{8}', rating = '{9}', overview = '{10}', system = '{11}', uppertitle = '{12}', tagdata = '{13}', categorydata = '{14}', gameInfoURL = '" + ProgramUtils.Encode(GameInfoURL) +"' where fileid = {0}", FileID, ProgramUtils.Encode(Title), ProgramUtils.Encode(Filename),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)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -25,7 +25,7 @@
using System;
using System.Collections.Generic;
-//using System.Diagnostics;
+//using System.IO;
using SQLite.NET;
using MediaPortal.GUI.Library;
@@ -51,7 +51,7 @@
{
get
{
- return filePath;
+ return filePath;
}
}
@@ -74,7 +74,6 @@
newFile.AppID = ProgramUtils.GetIntDef(results, iRecord, "appid", -1);
newFile.Title = ProgramUtils.Get(results, iRecord, "title");
newFile.Filename = ProgramUtils.Get(results, iRecord, "filename");
- newFile.Filepath = ProgramUtils.Get(results, iRecord, "filepath");
newFile.Imagefile = ProgramUtils.Get(results, iRecord, "imagefile");
newFile.MainGenre = ProgramUtils.Get(results, iRecord, "mainGenre");
newFile.SubGenre = ProgramUtils.Get(results, iRecord, "subGenre");
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -54,7 +54,6 @@
newLink.TargetAppID = ProgramUtils.GetIntDef(results, iRecord, "targetappid", -1);
newLink.Title = ProgramUtils.Get(results, iRecord, "title");
newLink.Filename = ProgramUtils.Get(results, iRecord, "filename");
- newLink.Filepath = ProgramUtils.Get(results, iRecord, "filepath");
newLink.Imagefile = ProgramUtils.Get(results, iRecord, "imagefile");
newLink.MainGenre = ProgramUtils.Get(results, iRecord, "mainGenre");
newLink.SubGenre = ProgramUtils.Get(results, iRecord, "subGenre");
@@ -86,7 +85,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, mainGenre, subGenre, 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);
+ "SELECT fi.appid AS targetappid, fi.grouperappid AS grouperappid, f.fileid AS fileid, title, uppertitle, f.filename as filename, imagefile, mainGenre, subGenre, 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 fileName, uppertitle", nAppID);
results = sqlDB.Execute(strSQL);
if (results.Rows.Count == 0)
return;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/GamebaseImport.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -67,7 +67,6 @@
curFile.AppID = applicationItem.AppID;
curFile.Title = myReader["name"].ToString();
curFile.Filename = romFilename;
- curFile.Filepath = Path.GetDirectoryName(romFilename);
curFile.Imagefile = imgFilename;
string strGenre1 = myReader["ParentGenre"].ToString();
string strGenre2 = myReader["Genre"].ToString();
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-06-24 09:49:46 UTC (rev 617)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-06-24 12:51:32 UTC (rev 618)
@@ -373,7 +373,6 @@
curFile.AppID = currentApplication.AppID;
curFile.Filename = fullRomname;
curFile.Imagefile = GetImageFile(curRomname);
- curFile.Filepath = Path.GetDirectoryName(fullRomname);
if ((curFile.Imagefile == "") && (currentApplication.ImportValidImagesOnly))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
