From: <ze...@us...> - 2007-06-12 21:43:19
|
Revision: 523 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=523&view=rev Author: zebons Date: 2007-06-12 14:43:17 -0700 (Tue, 12 Jun 2007) Log Message: ----------- Corrected bug when trying to launch a file movie store in the root directory (share drive for example) Modified Paths: -------------- trunk/plugins/MyFilms/MesFilmsDetail.cs Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-06-12 21:02:26 UTC (rev 522) +++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-06-12 21:43:17 UTC (rev 523) @@ -1069,7 +1069,10 @@ if (!multifile) { //case monofile search files belonging same movie (extension cdx or diskx) string folder = file.Substring(0, file.LastIndexOf(@"\")); - file = folder + file.Substring(file.LastIndexOf(@"\") + 1); + if ((folder.Length == 2) && (folder.Substring(1,1) == ":")) + file = folder + "\\" + file.Substring(file.LastIndexOf(@"\") + 1); + else + file = folder + file.Substring(file.LastIndexOf(@"\") + 1); ArrayList items = m_directory.GetDirectory(folder.ToString()); for (int i = 0; i < items.Count; ++i) @@ -1387,8 +1390,9 @@ System.Text.RegularExpressions.MatchCollection oMatches = oRegex.Matches(fi.Name.ToLower()); foreach (System.Text.RegularExpressions.Match oMatch in oMatches) { - if (MediaPortal.Util.Utils.IsVideo(fi.Name)) - result.Add(fi.Name); + if (MediaPortal.Util.Utils.IsVideo(fi.Name) || VirtualDirectory.IsImageFile(System.IO.Path.GetExtension(fi.Name))) + + result.Add(path + "\\" + fi.Name); else { if (fi.Attributes.ToString() == "Directory") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-07-11 10:32:41
|
Revision: 681 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=681&view=rev Author: zebons Date: 2007-07-11 03:32:38 -0700 (Wed, 11 Jul 2007) Log Message: ----------- Bug corrected when launching a list of movies separated by semicolon. Bug corrected if search path for movies is not ended by a'\' Modified Paths: -------------- trunk/plugins/MyFilms/MesFilmsDetail.cs Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-07-08 22:17:27 UTC (rev 680) +++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-07-11 10:32:38 UTC (rev 681) @@ -1047,7 +1047,7 @@ } else { - wfile = filename.Substring(start, at - 1); + wfile = filename.Substring(start, at); file = SearchMovie(filename.Substring(start, at - start).Trim().ToString(), StrDirStor); } //DataRow[] r = LectureDonn\xE9es(StrSelect, StrSort, StrSortSens); @@ -1424,8 +1424,14 @@ else { if (fi.Attributes.ToString() == "Directory") - if (System.IO.File.Exists(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO")) - result.Add(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO"); + if (path.LastIndexOf(@"\") + 1 == path.Length) + { + if (System.IO.File.Exists(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO")) + result.Add(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO"); + } + else + if (System.IO.File.Exists(path + "\\" + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO")) + result.Add(path + " \\" + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-07-11 20:31:43
|
Revision: 682 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=682&view=rev Author: zebons Date: 2007-07-11 13:31:36 -0700 (Wed, 11 Jul 2007) Log Message: ----------- corrected bug in filename for searching movie (extra blank) Modified Paths: -------------- trunk/plugins/MyFilms/MesFilmsDetail.cs Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-07-11 10:32:38 UTC (rev 681) +++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-07-11 20:31:36 UTC (rev 682) @@ -1092,7 +1092,7 @@ idMovie = update_database(file, select_item, idMovie); if (!multifile) { //case monofile search files belonging same movie (extension cdx or diskx) - string folder = file.Substring(0, file.LastIndexOf(@"\")); + string folder = file.Substring(0, file.LastIndexOf(@"\")).Trim(); //if ((folder.Length == 2) && (folder.Substring(1,1) == ":")) // file = folder +file.Substring(file.LastIndexOf(@"\") + 1); //else @@ -1426,12 +1426,12 @@ if (fi.Attributes.ToString() == "Directory") if (path.LastIndexOf(@"\") + 1 == path.Length) { - if (System.IO.File.Exists(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO")) - result.Add(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO"); + if (System.IO.File.Exists(path.Trim() + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO")) + result.Add(path.Trim() + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO"); } else - if (System.IO.File.Exists(path + "\\" + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO")) - result.Add(path + " \\" + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO"); + if (System.IO.File.Exists(path.Trim() + "\\" + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO")) + result.Add(path.Trim() + "\\" + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-07-12 05:54:08
|
Revision: 688 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=688&view=rev Author: zebons Date: 2007-07-11 22:54:07 -0700 (Wed, 11 Jul 2007) Log Message: ----------- Searching filename on drives if not found with sored info (after deplacing file for ex.) Modified Paths: -------------- trunk/plugins/MyFilms/MesFilmsDetail.cs Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-07-12 03:31:53 UTC (rev 687) +++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-07-12 05:54:07 UTC (rev 688) @@ -809,7 +809,7 @@ string fileName = null; if (!(StrStorage == null) && !(StrStorage == "(none)") && !(StrStorage == "")) { - if (r[select_item][StrStorage].ToString() == "") + if ((r[select_item][StrStorage].ToString() == "") || (!System.IO.File.Exists(r[select_item][StrStorage].ToString()))) // recherche nom de fichier par titre du film if ((SearchFile) && (first)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |