mp-plugins-svn

[Mp-plugins-svn] SF.net SVN: mp-plugins: [536] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt /Design/FileInfoScraperForm.cs

[<che...@us...>]

Revision: 536
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=536&view=rev
Author:   chef_koch
Date:     2007-06-13 14:54:37 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
first try to fix a null pointer exception
SelectBestMatch() will now use gameInfoURL for previous selected info item

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 21:05:50 UTC (rev 535)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 21:54:37 UTC (rev 536)
@@ -60,7 +60,7 @@
     #region Variables / Init
 
     int mStartTime = 0;
-    ApplicationItem m_CurApp;
+    ApplicationItem curApp;
 
     bool isSearching = false;
     bool stopSearching = false;
@@ -71,7 +71,7 @@
     {
       get
       {
-        return m_CurApp;
+        return curApp;
       }
       set
       {
@@ -81,10 +81,10 @@
 
     void SetCurApp(ApplicationItem value)
     {
-      m_CurApp = value;
-      if (m_CurApp != null)
+      curApp = value;
+      if (curApp != null)
       {
-        filterComboBox.Text = m_CurApp.SystemDefault;
+        filterComboBox.Text = curApp.SystemDefault;
       }
     }
 
@@ -153,14 +153,12 @@
           continue;
         }
 
-        /*
         // prevously selected infoitem
-        if (file.GameURL == info.GameURL)
+        if (file.GameInfoURL == info.GameURL)
         {
           file.FileInfoFavourite = info;
           continue;
         }
-        */
 
         // file has already a favourite
         // is info's relevance better than current favourite's relevance
@@ -184,6 +182,8 @@
 
     private void UpdateButtonStates()
     {
+      if (groupBoxFileList == null) return;
+
       // labels to update
       groupBoxFileList.Text = String.Format("Files ({0} of {1} selected)", listViewFileList.CheckedItems.Count, listViewFileList.Items.Count);
 
@@ -235,7 +235,7 @@
 
     private void SyncFileList()
     {
-      if (m_CurApp == null) return;
+      if (curApp == null) return;
       
       listViewFileList.BeginUpdate();
       try
@@ -243,7 +243,7 @@
         listViewFileList.Items.Clear();
 
         // add all files
-        foreach (FileItem file in m_CurApp.Files)
+        foreach (FileItem file in curApp.Files)
         {
           ListViewItem curItem = new ListViewItem(file.Title);
           file.ToFileInfoFavourite();
@@ -424,9 +424,9 @@
 
     private void buttonClose_Click(object sender, EventArgs e)
     {
-      if ((m_CurApp != null) && (filterComboBox.Text != ""))
+      if ((curApp != null) && (filterComboBox.Text != ""))
       {
-        m_CurApp.SystemDefault = filterComboBox.Text;
+        curApp.SystemDefault = filterComboBox.Text;
         //m_CurApp.Write();
       }
       this.Close();
@@ -655,7 +655,7 @@
           }
           curItem.SubItems[1].Text = String.Format("<searching...>");
           System.Windows.Forms.Application.DoEvents();
-          file.FindFileInfoDetail(m_CurApp, file.FileInfoFavourite, ScraperType.ALLGAME, saveType);
+          file.FindFileInfoDetail(curApp, file.FileInfoFavourite, ScraperType.ALLGAME, saveType);
           if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data))
           {
             file.SaveFromFileInfoFavourite();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins: [537] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt /Design/FileInfoScraperForm.cs

[<che...@us...>]

Revision: 537
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=537&view=rev
Author:   chef_koch
Date:     2007-06-13 15:07:13 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
small cleanup

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 21:54:37 UTC (rev 536)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 22:07:13 UTC (rev 537)
@@ -42,21 +42,6 @@
 {
   public partial class FileInfoScraperForm : Form
   {
-    #region InitControls
-
-    private ToolTip toolTip1;
-    private ContextMenu menuFileList;
-    private MenuItem mnuCheckWithoutImages;
-    private MenuItem mnuCheckWithoutOverview;
-
-    private ContextMenu menuSaveDetails;
-    private MenuItem menuItem4;
-    private MenuItem menuDataAndImages;
-    private MenuItem menuData;
-    private MenuItem menuImages;
-
-    #endregion
-
     #region Variables / Init
 
     int mStartTime = 0;
@@ -549,24 +534,21 @@
       int numberOfSearches = 0;
       bool bSuccess = true;
       InitProgressBar("Starting search");
+
       foreach (ListViewItem curItem in listViewFileList.CheckedItems)
       {
         if (stopSearching) break;
         if (curItem.Tag == null) continue;
-
         FileItem file = curItem.Tag as FileItem;
         if (file == null) continue;
 
         ListViewItem nextItem = null;
 
         if (curItem.Index < listViewFileList.Items.Count - 1)
-        {
           nextItem = listViewFileList.Items[curItem.Index + 1];
-        }
         else
-        {
           nextItem = curItem;
-        }
+
         nextItem.EnsureVisible();
         //          if (!bSuccess)
         //          {
@@ -578,29 +560,23 @@
         {
           curItem.SubItems[1].Text = String.Format("waiting...");
           System.Threading.Thread.Sleep(20000);
-          System.Windows.Forms.Application.DoEvents();
           numberOfSearches = 0;
         }
         curItem.SubItems[1].Text = String.Format("searching...");
         curItem.Font = new Font(curItem.Font, curItem.Font.Style | FontStyle.Bold);
-        System.Windows.Forms.Application.DoEvents();
         bSuccess = file.FindFileInfo(ScraperType.ALLGAME);
 
         SelectBestMatch(curItem);
 
         StepProgressBar();
-        System.Windows.Forms.Application.DoEvents();
       }
-      ChangeFileSelection();
+
       if (stopSearching)
-      {
         DeInitProgressBar("Search aborted");
-      }
       else
-      {
         DeInitProgressBar("Search finished");
-      }
 
+      ChangeFileSelection();
       stopSearching = false;
       isSearching = false;
       UpdateButtonStates();
@@ -625,21 +601,15 @@
 
       foreach (ListViewItem curItem in listViewFileList.CheckedItems)
       {
-        if (stopSearching)
-          break;
+        if (stopSearching) break;
         FileItem file = (FileItem)curItem.Tag;
+        if (file == null) continue;
 
-        if (file == null)
-          continue;
-
         if (curItem.Index < listViewFileList.Items.Count - 1)
-        {
           nextItem = listViewFileList.Items[curItem.Index + 1];
-        }
         else
-        {
           nextItem = curItem;
-        }
+
         nextItem.EnsureVisible();
         StepProgressBar();
         if (file.FileInfoFavourite != null)
@@ -649,29 +619,21 @@
           if (numberOfSearches > 20)
           {
             curItem.SubItems[1].Text = String.Format("waiting...");
-            System.Windows.Forms.Application.DoEvents();
             System.Threading.Thread.Sleep(20000);
             numberOfSearches = 0;
           }
           curItem.SubItems[1].Text = String.Format("<searching...>");
-          System.Windows.Forms.Application.DoEvents();
           file.FindFileInfoDetail(curApp, file.FileInfoFavourite, ScraperType.ALLGAME, saveType);
           if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data))
-          {
             file.SaveFromFileInfoFavourite();
-          }
           curItem.SubItems[1].Text = String.Format("<saved>");
-          System.Windows.Forms.Application.DoEvents();
         }
       }
+
       if (stopSearching)
-      {
         DeInitProgressBar("Search aborted");
-      }
       else
-      {
         DeInitProgressBar("Search finished");
-      }
 
       stopSearching = false;
       isSearching = false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins: [540] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt /Design/FileInfoScraperForm.cs

[<nor...@us...>]

Revision: 540
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=540&view=rev
Author:   northern_sky
Date:     2007-06-13 16:00:49 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
workaround for possible  frameworkbug

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 22:57:56 UTC (rev 539)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 23:00:49 UTC (rev 540)
@@ -167,14 +167,23 @@
 
     private void UpdateButtonStates()
     {
-      if (groupBoxFileList == null) return;
 
-      // labels to update
-      groupBoxFileList.Text = String.Format("Files ({0} of {1} selected)", listViewFileList.CheckedItems.Count, listViewFileList.Items.Count);
+      //frameworkbug...? listViewFileList.CheckedItems.COUNT throws null exceptions sometimes... gaaa
 
-      // button states to update
-      buttonStartSearch.Enabled = (listViewFileList.CheckedItems.Count > 0);
+        // labels to update
+      if (listViewFileList.SelectedItems.Count > 0)
+      {
+        groupBoxFileList.Text = String.Format("Files ({0} of {1} selected)", listViewFileList.CheckedItems.Count, listViewFileList.Items.Count);
 
+        // button states to update
+        buttonStartSearch.Enabled = (listViewFileList.CheckedItems.Count > 0);
+      }
+      else
+      {
+        groupBoxFileList.Text = String.Format("Files (0) of {0} selected)", listViewFileList.Items.Count);
+        buttonStartSearch.Enabled = false;
+      }
+
       if (!buttonStartSearch.Enabled)
         buttonSaveSearch.Enabled = false;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Mp-plugins-svn] SF.net SVN: mp-plugins: [543] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt /Design/FileInfoScraperForm.cs

[<che...@us...>]

Revision: 543
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=543&view=rev
Author:   chef_koch
Date:     2007-06-14 04:34:48 -0700 (Thu, 14 Jun 2007)

Log Message:
-----------
fixed: after you set a filter, which hides the previously selected match, no new selection was made

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-14 11:30:58 UTC (rev 542)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-14 11:34:48 UTC (rev 543)
@@ -89,14 +89,21 @@
 
     #region Properties / Helper Routines
 
-    private FileItem GetSelectedFileItem()
+    private ListViewItem GetSelectedListViewItem()
     {
       if (listViewFileList.FocusedItem == null) return null;
-      if (listViewFileList.FocusedItem.Tag == null) return null;
 
-      return listViewFileList.FocusedItem.Tag as FileItem;
+      return listViewFileList.FocusedItem;
     }
 
+    private FileItem GetSelectedFileItem()
+    {
+      if (GetSelectedListViewItem() == null) return null;
+      if (GetSelectedListViewItem().Tag == null) return null;
+
+      return GetSelectedListViewItem().Tag as FileItem;
+    }
+
     private FileItemInfo GetSelectedMatchItem()
     {
       if (listViewMatchList.CheckedItems == null) return null;
@@ -126,6 +133,14 @@
 
       foreach (FileItemInfo info in file.FileInfoList)
       {
+        // is current favourite a good match?
+        //   - info is from platform, which is set in combobox
+        //   - has minimum relevance
+        // if not set favourite null
+        if (file.FileInfoFavourite != null)
+          if (!IsGoodMatch(file.FileInfoFavourite))
+            file.FileInfoFavourite = null;
+
         // check if 
         //   - info is from platform, which is set in combobox
         //   - has minimum relevance
@@ -224,6 +239,10 @@
 
     private void ChangeFileSelection()
     {
+      if (GetSelectedListViewItem() == null) return;
+      if (GetSelectedFileItem() == null) return;
+
+      SelectBestMatch(GetSelectedListViewItem());
       SyncMatchList(GetSelectedFileItem());
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.