From: <che...@us...> - 2007-06-24 09:16:22
|
Revision: 615 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=615&view=rev Author: chef_koch Date: 2007-06-24 02:16:20 -0700 (Sun, 24 Jun 2007) Log Message: ----------- minor format change Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemFactory.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemGameBase.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemMame.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 Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemDirectoryCache.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -24,21 +24,20 @@ #endregion using System; -using System.Collections.Generic; using System.Collections; +using System.Collections.Generic; using System.IO; +using System.Windows.Forms; +using SQLite.NET; + using MediaPortal.Dialogs; using MediaPortal.GUI.Library; using MediaPortal.Util; -using GUIPrograms; -using SQLite.NET; -using System.Windows.Forms; - +using GUIPrograms; +using GUIPrograms.Database; using GUIPrograms.FileItems; -using GUIPrograms.Database; - namespace GUIPrograms.ApplicationItems { /// <summary> @@ -328,5 +327,4 @@ LoadFiles(); } } - -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemFactory.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemFactory.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemFactory.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -23,9 +23,9 @@ #endregion -using GUIPrograms; using SQLite.NET; +using GUIPrograms; namespace GUIPrograms.ApplicationItems { @@ -67,6 +67,5 @@ } return applicationItem; } - } -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemGameBase.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemGameBase.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemGameBase.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -25,11 +25,13 @@ using System; using System.IO; +using SQLite.NET; + using MediaPortal.Dialogs; using MediaPortal.GUI.Library; + using GUIPrograms; using GUIPrograms.Database; -using SQLite.NET; using GUIPrograms.Imports; namespace GUIPrograms.ApplicationItems @@ -134,4 +136,4 @@ LoadFiles(); } } -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemList.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -24,13 +24,14 @@ #endregion using System.Collections.Generic; -using MediaPortal.GUI.Library; -using GUIPrograms; using SQLite.NET; +using GUIPrograms; using GUIPrograms.Database; +using GUIPrograms.FileItems; -using GUIPrograms.FileItems; +using MediaPortal.GUI.Library; + namespace GUIPrograms.ApplicationItems { /// <summary> Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemMame.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemMame.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItemMame.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -26,10 +26,12 @@ using System; using System.Diagnostics; using System.IO; +using SQLite.NET; + using MediaPortal.Dialogs; using MediaPortal.GUI.Library; + using GUIPrograms; -using SQLite.NET; using GUIPrograms.Imports; namespace GUIPrograms.ApplicationItems @@ -39,7 +41,6 @@ /// </summary> public class ApplicationItemMame : ApplicationItem { - GUIDialogProgress guiDialogProgress = null; bool importOriginalsOnly = true; @@ -155,4 +156,4 @@ guiDialogProgress.Progress(); } } -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItem.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -27,18 +27,20 @@ using System.Collections; using System.Collections.Generic; using System.IO; -using MediaPortal.GUI.Library; -using GUIPrograms; using SQLite.NET; -using GUIPrograms.Imports; +using MediaPortal.GUI.Library; + +using GUIPrograms; using GUIPrograms.ApplicationItems; +using GUIPrograms.Imports; - namespace GUIPrograms.FileItems { public class FileItem { + #region Variables + protected static SQLiteClient sqlDB = null; int fileID; @@ -49,6 +51,7 @@ string filename; string filepath; string imagefile; + string mainGenre; string subGenre; string country; @@ -60,16 +63,20 @@ string manualFilename; DateTime lastTimeLaunched; int launchCount; + int extFileID; string tagData; string categoryData; bool isFolder; string gameInfoURL; - List<FileItemInfo> fileItemInfoList = null; FileItemInfo fileItemInfoFavourite = null; + #endregion + + #region Constructor + public FileItem(SQLiteClient initSqlDB) { // constructor: save SQLiteDB object @@ -77,6 +84,8 @@ Clear(); } + #endregion + public virtual void Clear() { fileID = -1; @@ -119,6 +128,8 @@ return (result.Trim()); } + #region Properties + public int FileID { get @@ -130,7 +141,6 @@ fileID = value; } } - public int AppID { get @@ -142,7 +152,6 @@ appID = value; } } - public string Title { get @@ -154,7 +163,6 @@ title = value; } } - public string Title2 { get @@ -166,7 +174,6 @@ title2 = value; } } - public string TitleNormalized { get @@ -174,7 +181,6 @@ return GetTitleNormalized(); } } - public string TitleOptimized { get @@ -198,7 +204,6 @@ filename = value; } } - public string Filepath { get @@ -210,7 +215,6 @@ filepath = value; } } - public string Imagefile { get @@ -234,7 +238,6 @@ mainGenre = value; } } - public string SubGenre { get @@ -245,9 +248,8 @@ { subGenre = value; } - } - - public string Country + } + public string Country { get { @@ -258,7 +260,6 @@ country = value; } } - public string Manufacturer { get @@ -270,7 +271,6 @@ manufacturer = value; } } - public int Year { get @@ -282,7 +282,6 @@ year = value; } } - public int Rating { get @@ -294,7 +293,6 @@ rating = value; } } - public string Overview { get @@ -306,7 +304,6 @@ overview = value; } } - public string System_ { get @@ -318,7 +315,6 @@ system = value; } } - public string ManualFilename { get @@ -330,7 +326,6 @@ manualFilename = value; } } - public DateTime LastTimeLaunched { get @@ -342,7 +337,6 @@ lastTimeLaunched = value; } } - public int LaunchCount { get @@ -355,6 +349,17 @@ } } + public int ExtFileID + { + get + { + return extFileID; + } + set + { + extFileID = value; + } + } public string TagData { get @@ -366,7 +371,6 @@ tagData = value; } } - public string CategoryData { get @@ -378,7 +382,6 @@ categoryData = value; } } - public bool IsFolder { get @@ -390,19 +393,12 @@ isFolder = value; } } - - public int ExtFileID + public string GameInfoURL { - get - { - return extFileID; - } - set - { - extFileID = value; - } + get { return gameInfoURL; } + set { gameInfoURL = value; } } - + public string YearManu { get @@ -418,7 +414,6 @@ return fileItemInfoList; } } - public FileItemInfo FileInfoFavourite { get @@ -431,6 +426,8 @@ } } + #endregion + private int CountQuotes(string strVal) { int at = 0; @@ -523,8 +520,6 @@ return strRes; } - - public string ExtractArguments() { string strRes = ""; @@ -557,21 +552,9 @@ } return strRes; } + private void Insert() { - string strLastLaunch = ""; - string strLaunchCount = ""; - string strYear = ""; - - strLastLaunch = String.Format("{0}", LastTimeLaunched); - - strLaunchCount = String.Format("{0}", LaunchCount); // poor man's inttostr :-) - - if (Year > 0) - { - strYear = String.Format("{0}", Year); - } - try { string strSQL = String.Format( @@ -616,13 +599,13 @@ '" + ProgramUtils.Encode(SubGenre)+ @"', '" + Country+ @"', '" + ProgramUtils.Encode(Manufacturer)+ @"', - '" + strYear+ @"', + '" + Year.ToString()+ @"', '" + Rating+ @"', '" + ProgramUtils.Encode(Overview)+ @"', '" + ProgramUtils.Encode(System_)+ @"', '" + ProgramUtils.Encode(ManualFilename)+ @"', - '" + strLastLaunch+ @"', - '" + strLaunchCount+ @"', + '" + LastTimeLaunched.ToString()+ @"', + '" + LaunchCount.ToString()+ @"', '" + ProgramUtils.BooleanToStr(IsFolder)+ @"', '" + ExtFileID+ @"', '" + ProgramUtils.Encode(Title.ToUpper())+ @"', @@ -639,7 +622,6 @@ } } - private void Update() { string strYear = ""; @@ -723,12 +705,6 @@ } } - public string GameInfoURL - { - get { return gameInfoURL; } - set { gameInfoURL = value; } - } - public bool FindFileInfo(ScraperType ScraperType) { @@ -1032,7 +1008,5 @@ result = result.TrimEnd('\"'); return result; } - } - -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemInfo.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -26,12 +26,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; + using MediaPortal.Util; using GUIPrograms.ApplicationItems; - - namespace GUIPrograms.FileItems { /// <summary> @@ -39,23 +38,28 @@ /// </summary> public class FileItemInfo { + #region Variables string relevance; int relevanceNorm; - string year; string gameURL; + string title; string mainGenre; string subGenre; + string year; string style; string platform; string rating; int ratingNorm; - string imageURLs; string manufacturer; string overview; + + string imageURLs; bool isLoaded; + #endregion + public FileItemInfo() { // @@ -78,6 +82,9 @@ isLoaded = false; } + + #region Properties + public string RelevanceOrig { get @@ -89,7 +96,6 @@ relevance = value; } } - public int RelevanceNorm { get @@ -101,19 +107,6 @@ relevanceNorm = value; } } - - public string Year - { - get - { - return year; - } - set - { - year = value; - } - } - public string GameURL { get @@ -125,7 +118,6 @@ gameURL = value; } } - public string GameURLPostParams { get @@ -145,7 +137,6 @@ title = value; } } - public string MainGenre { get @@ -157,7 +148,6 @@ mainGenre = value; } } - public string SubGenre { get @@ -170,7 +160,17 @@ subGenre = value; } } - + public string Year + { + get + { + return year; + } + set + { + year = value; + } + } public string Style { get @@ -182,7 +182,6 @@ style = value; } } - public string Platform { get @@ -194,7 +193,6 @@ platform = value; } } - public string RatingOrig { get @@ -206,7 +204,6 @@ rating = value; } } - public int RatingNorm { get @@ -218,7 +215,6 @@ ratingNorm = value; } } - public string Manufacturer { get @@ -230,7 +226,6 @@ manufacturer = value; } } - public string Overview { get @@ -254,7 +249,6 @@ imageURLs = value; } } - public bool Loaded { get @@ -267,6 +261,8 @@ } } + #endregion + public void LaunchURL() { if (GameURL == null) @@ -336,4 +332,4 @@ } } } -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FileItemList.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -26,23 +26,19 @@ using System; using System.Collections.Generic; //using System.Diagnostics; -using MediaPortal.GUI.Library; -using GUIPrograms; using SQLite.NET; +using MediaPortal.GUI.Library; -using GUIPrograms.FileItems; +using GUIPrograms; using GUIPrograms.Database; +using GUIPrograms.FileItems; - namespace GUIPrograms.FileItems { - public class FileItemList : List<object> { - string filePath = ""; - static SQLiteClient sqlDB = null; public FileItemList(SQLiteClient initSqlDB) @@ -59,7 +55,6 @@ } } - public FileItem GetFileItemByID(int fileID) { foreach (FileItem currentFileItem in this) @@ -72,7 +67,6 @@ return null; } - static private FileItem DBGetFileItem(SQLiteResultSet results, int iRecord) { FileItem newFile = new FileItem(sqlDB); @@ -191,5 +185,4 @@ } } } - -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkItem.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkItem.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkItem.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -25,11 +25,12 @@ using System; using System.Collections; +using SQLite.NET; + using MediaPortal.GUI.Library; + using GUIPrograms; -using SQLite.NET; - namespace GUIPrograms.FileItems { /// <summary> @@ -129,6 +130,5 @@ // nothing to update (yet) //...... as all tblFilterItem fields are primary key fields... } - } -} +} \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-24 08:33:23 UTC (rev 614) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/FileItems/FilelinkList.cs 2007-06-24 09:16:20 UTC (rev 615) @@ -25,11 +25,12 @@ using System; using System.Collections.Generic; -using MediaPortal.GUI.Library; -using GUIPrograms; using SQLite.NET; +using MediaPortal.GUI.Library; +using GUIPrograms; + namespace GUIPrograms.FileItems { /// <summary> @@ -37,15 +38,14 @@ /// </summary> public class FilelinkItemList : List<object> { + static SQLiteClient sqlDB = null; + public FilelinkItemList(SQLiteClient initSqlDB) { // constructor: save SQLiteDB object sqlDB = initSqlDB; } - static SQLiteClient sqlDB = null; - - static private FilelinkItem DBGetFilelinkItem(SQLiteResultSet results, int iRecord) { FilelinkItem newLink = new FilelinkItem(sqlDB); @@ -71,7 +71,6 @@ return newLink; } - public void Load(int nAppID, string strPath) { if (sqlDB == null) @@ -102,6 +101,5 @@ Log.Info("Filedatabase exception err:{0} stack:{1}", ex.Message, ex.StackTrace); } } - } -} +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |