* osrepodbmgr/Checksum.cs:

Removed dead code.

	* osrepodbmgr/DBOps.cs:
	  Check null exceptions.
	Don't fill console with debug lines.

	* osrepodbmgr/DicCore.cs:
	  Reduced buffer size for better UI responsiveness.

	* osrepodbmgr/MainWindow.cs:
	  Corrected some GUI nuisances.
	Check null exceptions.

	* osrepodbmgr/dlgMetadata.cs:
	* osrepodbmgr/frmSettings.cs:
	* osrepodbmgr/dlgOpticalDisc.cs:
	* osrepodbmgr/gtk-gui/gui.stetic:
	* osrepodbmgr/gtk-gui/osrepodbmgr.dlgMetadata.cs:
	  Corrected some GUI nuisances.

	* osrepodbmgr/DetectImageFormat.cs:
	  Don't fill console with debug lines.
This commit is contained in:
2017-05-03 23:01:47 +01:00
parent effdda25aa
commit d0bb0aba0f
11 changed files with 178 additions and 106 deletions

View File

@@ -1,3 +1,32 @@
2017-05-03 Natalia Portillo <claunia@claunia.com>
* Checksum.cs:
Removed dead code.
* DBOps.cs:
Check null exceptions.
Don't fill console with debug lines.
* DicCore.cs:
Reduced buffer size for better UI responsiveness.
* MainWindow.cs:
Corrected some GUI nuisances.
Check null exceptions.
* dlgMetadata.cs:
* frmSettings.cs:
* dlgOpticalDisc.cs:
* gtk-gui/gui.stetic:
* gtk-gui/osrepodbmgr.dlgMetadata.cs:
Corrected some GUI nuisances.
* DetectImageFormat.cs:
Don't fill console with debug lines.
2017-05-03 Natalia Portillo <claunia@claunia.com>
* MainWindow.cs:

View File

@@ -426,18 +426,6 @@ namespace osrepodbmgr
public byte[] data;
}
/*struct fletcher16Packet
{
public Fletcher16Context context;
public byte[] data;
}
struct fletcher32Packet
{
public Fletcher32Context context;
public byte[] data;
}*/
struct md5Packet
{
public MD5Context context;
@@ -500,16 +488,6 @@ namespace osrepodbmgr
((crc64Packet)packet).context.Update(((crc64Packet)packet).data);
}
/*static void updateFletcher16(object packet)
{
((fletcher16Packet)packet).context.Update(((fletcher16Packet)packet).data);
}
static void updateFletcher32(object packet)
{
((fletcher32Packet)packet).context.Update(((fletcher32Packet)packet).data);
}*/
static void updateMD5(object packet)
{
((md5Packet)packet).context.Update(((md5Packet)packet).data);

View File

@@ -108,8 +108,11 @@ namespace osrepodbmgr
fEntry.source = bool.Parse(dRow["source"].ToString());
fEntry.files = bool.Parse(dRow["files"].ToString());
fEntry.netinstall = bool.Parse(dRow["netinstall"].ToString());
fEntry.xml = (byte[])dRow["xml"];
fEntry.json = (byte[])dRow["json"];
if(dRow["xml"] != DBNull.Value)
fEntry.xml = (byte[])dRow["xml"];
if(dRow["json"] != DBNull.Value)
fEntry.json = (byte[])dRow["json"];
entries.Add(fEntry);
}
@@ -229,7 +232,7 @@ namespace osrepodbmgr
public bool AddFile(string hash)
{
Console.WriteLine("Adding {0}", hash);
//Console.WriteLine("Adding {0}", hash);
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataParameter param1 = dbcmd.CreateParameter();

View File

@@ -54,7 +54,6 @@ namespace osrepodbmgr
{
try
{
Console.WriteLine("Format detection: Trying plugin {0}", _imageplugin.Name);
if(_imageplugin.IdentifyImage(imageFilter))
{
_imageFormat = _imageplugin;
@@ -78,7 +77,6 @@ namespace osrepodbmgr
{
try
{
Console.WriteLine("Format detection: Trying plugin {0}", _imageplugin.Name);
if(_imageplugin.IdentifyImage(imageFilter))
{
_imageFormat = _imageplugin;

View File

@@ -129,17 +129,17 @@ namespace osrepodbmgr
byte[] data;
long position = 0;
while(position < (fi.Length - 1048576))
while(position < (fi.Length - 524288))
{
data = new byte[1048576];
fs.Read(data, 0, 1048576);
data = new byte[524288];
fs.Read(data, 0, 524288);
if(UpdateProgress2 != null)
UpdateProgress2(null, string.Format("{0} of {1} bytes", position, fi.Length), position, fi.Length);
imgChkWorker.Update(data);
position += 1048576;
position += 524288;
}
data = new byte[fi.Length - position];

View File

@@ -172,11 +172,14 @@ public partial class MainWindow : Window
btnSettings.Sensitive = false;
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
thdFindFiles = new Thread(Core.FindFiles);
@@ -250,6 +253,8 @@ public partial class MainWindow : Window
dlgMsg.Run();
dlgMsg.Destroy();
}
if(thdPulseProgress != null)
thdPulseProgress.Abort();
lblProgress.Visible = false;
prgProgress.Visible = false;
lblProgress2.Visible = false;
@@ -270,6 +275,8 @@ public partial class MainWindow : Window
{
Application.Invoke(delegate
{
if(thdPulseProgress != null)
thdPulseProgress.Abort();
lblProgress.Visible = false;
prgProgress.Visible = false;
lblProgress.Visible = false;
@@ -306,6 +313,8 @@ public partial class MainWindow : Window
dlgMsg.Run();
dlgMsg.Destroy();
}
if(thdPulseProgress != null)
thdPulseProgress.Abort();
if(thdCheckFiles != null)
thdCheckFiles.Abort();
prgProgress.Visible = false;
@@ -343,6 +352,8 @@ public partial class MainWindow : Window
Core.AddFile -= AddFile;
Core.AddOS -= AddOS;
if(thdPulseProgress != null)
thdPulseProgress.Abort();
thdHashFiles = null;
prgProgress.Visible = false;
btnStop.Visible = false;
@@ -372,11 +383,14 @@ public partial class MainWindow : Window
btnMetadata.Visible = true;
if(MainClass.metadata != null)
{
foreach(string developer in MainClass.metadata.Developer)
if(MainClass.metadata.Developer != null)
{
if(!string.IsNullOrWhiteSpace(txtDeveloper.Text))
txtDeveloper.Text += ",";
txtDeveloper.Text += developer;
foreach(string developer in MainClass.metadata.Developer)
{
if(!string.IsNullOrWhiteSpace(txtDeveloper.Text))
txtDeveloper.Text += ",";
txtDeveloper.Text += developer;
}
}
if(!string.IsNullOrWhiteSpace(MainClass.metadata.Name))
@@ -384,25 +398,34 @@ public partial class MainWindow : Window
if(!string.IsNullOrWhiteSpace(MainClass.metadata.Version))
txtVersion.Text = MainClass.metadata.Version;
foreach(LanguagesTypeLanguage language in MainClass.metadata.Languages)
if(MainClass.metadata.Languages != null)
{
if(!string.IsNullOrWhiteSpace(txtLanguages.Text))
txtLanguages.Text += ",";
txtLanguages.Text += language;
foreach(LanguagesTypeLanguage language in MainClass.metadata.Languages)
{
if(!string.IsNullOrWhiteSpace(txtLanguages.Text))
txtLanguages.Text += ",";
txtLanguages.Text += language;
}
}
foreach(ArchitecturesTypeArchitecture architecture in MainClass.metadata.Architectures)
if(MainClass.metadata.Architectures != null)
{
if(!string.IsNullOrWhiteSpace(txtArchitecture.Text))
txtArchitecture.Text += ",";
txtArchitecture.Text += architecture;
foreach(ArchitecturesTypeArchitecture architecture in MainClass.metadata.Architectures)
{
if(!string.IsNullOrWhiteSpace(txtArchitecture.Text))
txtArchitecture.Text += ",";
txtArchitecture.Text += architecture;
}
}
foreach(string machine in MainClass.metadata.Systems)
if(MainClass.metadata.Systems != null)
{
if(!string.IsNullOrWhiteSpace(txtMachine.Text))
txtMachine.Text += ",";
txtMachine.Text += machine;
foreach(string machine in MainClass.metadata.Systems)
{
if(!string.IsNullOrWhiteSpace(txtMachine.Text))
txtMachine.Text += ",";
txtMachine.Text += machine;
}
}
btnMetadata.ModifyBg(StateType.Normal, new Gdk.Color(0, 127, 0));
@@ -497,11 +520,14 @@ public partial class MainWindow : Window
prgProgress.Text = "Removing temporary files";
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
Core.Failed += RemoveTempFilesFailed;
Core.Finished += RemoveTempFilesFinished;
@@ -522,7 +548,7 @@ public partial class MainWindow : Window
if(maximum > 0)
prgProgress.Fraction = current / (double)maximum;
else
prgProgress.Pulse();
while(true) { prgProgress.Pulse(); }
});
}
@@ -597,11 +623,14 @@ public partial class MainWindow : Window
prgProgress.Text = "Removing temporary files";
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
Core.Failed += RemoveTempFilesFailed;
Core.Finished += RemoveTempFilesFinished;
@@ -761,6 +790,8 @@ public partial class MainWindow : Window
{
if(thdAddFiles != null)
thdAddFiles.Abort();
if(thdPulseProgress != null)
thdPulseProgress.Abort();
Core.UpdateProgress -= UpdateProgress;
Core.Finished -= AddFilesToDbFinished;
@@ -796,6 +827,8 @@ public partial class MainWindow : Window
if(thdAddFiles != null)
thdAddFiles.Abort();
if(thdPulseProgress != null)
thdPulseProgress.Abort();
Core.UpdateProgress -= UpdateProgress;
Core.Finished -= AddFilesToDbFinished;
@@ -859,11 +892,14 @@ public partial class MainWindow : Window
{
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
Core.UpdateProgress -= UpdateProgress;
Core.UpdateProgress2 -= UpdateProgress2;
@@ -886,18 +922,15 @@ public partial class MainWindow : Window
{
if(thdPackFiles != null)
thdPackFiles.Abort();
if(thdPulseProgress != null)
thdPulseProgress.Abort();
Core.UpdateProgress -= UpdateProgress;
Core.UpdateProgress2 -= UpdateProgress2;
Core.FinishedWithText -= PackFilesFinished;
Core.Failed -= PackFilesFailed;
prgProgress.Visible = false;
prgProgress2.Visible = false;
lblProgress.Visible = false;
lblProgress2.Visible = false;
btnPack.Sensitive = false;
btnClose.Sensitive = true;
btnAdd.Click();
MessageDialog dlgMsg = new MessageDialog(this, DialogFlags.Modal, MessageType.Info, ButtonsType.Ok, "Correctly packed to " + text);
dlgMsg.Run();
@@ -918,6 +951,8 @@ public partial class MainWindow : Window
if(thdPackFiles != null)
thdPackFiles.Abort();
if(thdPulseProgress != null)
thdPulseProgress.Abort();
Core.UpdateProgress -= UpdateProgress;
Core.UpdateProgress2 -= UpdateProgress2;
@@ -974,11 +1009,14 @@ public partial class MainWindow : Window
btnSettings.Sensitive = false;
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
thdOpenArchive = new Thread(Core.OpenArchive);
@@ -1030,13 +1068,18 @@ public partial class MainWindow : Window
btnFolder.Visible = false;
btnArchive.Visible = false;
btnSettings.Sensitive = false;
if(thdPulseProgress != null)
thdPulseProgress.Abort();
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
Core.Failed -= OpenArchiveFailed;
Core.Finished -= OpenArchiveFinished;
@@ -1077,11 +1120,14 @@ public partial class MainWindow : Window
prgProgress.Text = "Removing temporary files";
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
Core.Failed += RemoveTempFilesFailed;
Core.Finished += RemoveTempFilesFinished;
@@ -1097,6 +1143,8 @@ public partial class MainWindow : Window
{
if(thdExtractArchive != null)
thdExtractArchive.Abort();
if(thdPulseProgress != null)
thdPulseProgress.Abort();
stopped = false;
lblProgress.Text = "Finding files";
lblProgress.Visible = true;
@@ -1110,11 +1158,14 @@ public partial class MainWindow : Window
Core.UpdateProgress2 -= UpdateProgress2;
thdPulseProgress = new Thread(() =>
{
Application.Invoke(delegate
while(true)
{
prgProgress.Pulse();
});
Thread.Sleep(10);
Application.Invoke(delegate
{
prgProgress.Pulse();
});
Thread.Sleep(66);
}
});
thdFindFiles = new Thread(Core.FindFiles);
@@ -1167,7 +1218,7 @@ public partial class MainWindow : Window
if(!string.IsNullOrWhiteSpace(txtLanguages.Text))
txtLanguages.Text += ",";
txtLanguages.Text += language;
}
}
}
}

View File

@@ -551,7 +551,7 @@ namespace osrepodbmgr
protected void OnChkReleaseDateToggled(object sender, EventArgs e)
{
cldReleaseDate.Sensitive = chkReleaseDate.Active;
cldReleaseDate.Sensitive = !chkReleaseDate.Active;
}
protected void OnTxtAddKeywordClicked(object sender, EventArgs e)
@@ -715,6 +715,8 @@ namespace osrepodbmgr
notebook3.GetNthPage(8).Visible = false;
prgAddDisc1.Visible = true;
prgAddDisc2.Visible = true;
buttonCancel.Visible = false;
buttonOk.Visible = false;
Core.Failed += OnDiscAddFailed;
Core.Finished += OnDiscAddFinished;
Core.UpdateProgress += UpdateDiscProgress1;
@@ -780,6 +782,8 @@ namespace osrepodbmgr
notebook3.GetNthPage(8).Visible = true;
prgAddDisc1.Visible = false;
prgAddDisc2.Visible = false;
buttonCancel.Visible = true;
buttonOk.Visible = true;
Core.Failed -= OnDiscAddFailed;
Core.Finished -= OnDiscAddFinished;
Core.UpdateProgress -= UpdateDiscProgress1;
@@ -893,6 +897,8 @@ namespace osrepodbmgr
notebook3.GetNthPage(8).Visible = true;
prgAddDisc1.Visible = false;
prgAddDisc2.Visible = false;
buttonCancel.Visible = true;
buttonOk.Visible = true;
Core.Failed -= OnDiscAddFailed;
Core.Finished -= OnDiscAddFinished;
Core.UpdateProgress -= UpdateDiscProgress1;
@@ -935,6 +941,8 @@ namespace osrepodbmgr
notebook3.GetNthPage(7).Visible = false;
prgAddDisk1.Visible = true;
prgAddDisk2.Visible = true;
buttonCancel.Visible = false;
buttonOk.Visible = false;
Core.Failed += OnDiskAddFailed;
Core.Finished += OnDiskAddFinished;
Core.UpdateProgress += UpdateDiskProgress1;
@@ -1000,6 +1008,8 @@ namespace osrepodbmgr
notebook3.GetNthPage(7).Visible = true;
prgAddDisk1.Visible = false;
prgAddDisk2.Visible = false;
buttonCancel.Visible = true;
buttonOk.Visible = true;
Core.Failed -= OnDiskAddFailed;
Core.Finished -= OnDiskAddFinished;
Core.UpdateProgress -= UpdateDiskProgress1;
@@ -1109,6 +1119,8 @@ namespace osrepodbmgr
notebook3.GetNthPage(7).Visible = true;
prgAddDisk1.Visible = false;
prgAddDisk2.Visible = false;
buttonCancel.Visible = true;
buttonOk.Visible = true;
Core.Failed -= OnDiskAddFailed;
Core.Finished -= OnDiskAddFinished;
Core.UpdateProgress -= UpdateDiskProgress1;
@@ -1155,9 +1167,9 @@ namespace osrepodbmgr
Metadata.Author = txtAuthor.Text.Split(',');
if(!string.IsNullOrEmpty(txtDeveloper.Text))
Metadata.Developer = txtDeveloper.Text.Split(',');
if(!string.IsNullOrEmpty(txtAuthor.Text))
if(!string.IsNullOrEmpty(txtName.Text))
Metadata.Name = txtName.Text;
if(!string.IsNullOrEmpty(txtAuthor.Text))
if(!string.IsNullOrEmpty(txtPartNumber.Text))
Metadata.PartNumber = txtPartNumber.Text;
if(!string.IsNullOrEmpty(txtPerformer.Text))
Metadata.Performer = txtPerformer.Text.Split(',');

View File

@@ -386,9 +386,9 @@ namespace osrepodbmgr
#endregion Set Xbox security sectors table
#region Set tracks table
lstTracks = new ListStore(typeof(int), typeof(int), typeof(string), typeof(int), typeof(string), typeof(int), typeof(string), typeof(string),
typeof(long), typeof(long), typeof(string), typeof(int), typeof(string), typeof(ChecksumType[]), typeof(SubChannelType),
typeof(ListStore));
lstTracks = new ListStore(typeof(int), typeof(int), typeof(string), typeof(long), typeof(string), typeof(long), typeof(string), typeof(string),
typeof(long), typeof(long), typeof(string), typeof(int), typeof(string), typeof(ChecksumType[]), typeof(SubChannelType),
typeof(ListStore));
CellRendererText trackSequenceCell = new CellRendererText();
CellRendererText sessionSequenceCell = new CellRendererText();
CellRendererText trackFileCell = new CellRendererText();
@@ -466,15 +466,15 @@ namespace osrepodbmgr
lblSide.Visible = true;
spSide.Visible = true;
lblLayer.Visible = true;
spLayer.Visible = true;
spLayer1.Visible = true;
chkSequence.Active = true;
lblDiscTitle.Text = Metadata.Sequence.MediaTitle;
txtDiscTitle.Text = Metadata.Sequence.MediaTitle;
spSequence.Value = Metadata.Sequence.MediaSequence;
spTotalMedia.Value = Metadata.Sequence.TotalMedia;
if(Metadata.Sequence.SideSpecified)
spSide.Value = Metadata.Sequence.Side;
if(Metadata.Sequence.LayerSpecified)
spLayer.Value = Metadata.Sequence.Layer;
spLayer1.Value = Metadata.Sequence.Layer;
}
if(Metadata.Layers != null)
@@ -706,9 +706,8 @@ namespace osrepodbmgr
}
}
lstTracks.AppendValues(track.Sequence.TrackNumber.ToString(), track.Sequence.Session.ToString(), track.Image.Value, track.Size.ToString(),
track.Image.format, track.Image.offset.ToString(), track.StartMSF, track.EndMSF, track.StartSector.ToString(),
track.EndSector.ToString(), track.TrackType1.ToString(), track.BytesPerSector.ToString(), track.AccoustID,
lstTracks.AppendValues(track.Sequence.TrackNumber, track.Sequence.Session, track.Image.Value, track.Size, track.Image.format, track.Image.offset,
track.StartMSF, track.EndMSF, track.StartSector, track.EndSector, track.TrackType1.ToString(), track.BytesPerSector, track.AccoustID,
track.Checksums, track.SubChannel, lstPartitions);
}
@@ -748,7 +747,7 @@ namespace osrepodbmgr
lblSide.Visible = chkSequence.Active;
spSide.Visible = chkSequence.Active;
lblLayer.Visible = chkSequence.Active;
spLayer.Visible = chkSequence.Active;
spLayer1.Visible = chkSequence.Active;
}
protected void OnChkDimensionsToggled(object sender, EventArgs e)
@@ -824,7 +823,7 @@ namespace osrepodbmgr
dlgMsg.Destroy();
}
lstLayers.AppendValues(spLayer.ValueAsInt, long.Parse(txtLayerSize.Text));
lstLayers.AppendValues(spLayer1.ValueAsInt, long.Parse(txtLayerSize.Text));
}
protected void OnBtnRemoveLayerClicked(object sender, EventArgs e)
@@ -1072,9 +1071,9 @@ namespace osrepodbmgr
protected void OnBtnApplyTrackClicked(object sender, EventArgs e)
{
string file = (string)lstTracks.GetValue(trackIter, 2);
int filesize = (int)lstTracks.GetValue(trackIter, 3);
long filesize = (long)lstTracks.GetValue(trackIter, 3);
string fileformat = (string)lstTracks.GetValue(trackIter, 4);
int fileoffset = (int)lstTracks.GetValue(trackIter, 5);
long fileoffset = (long)lstTracks.GetValue(trackIter, 5);
ChecksumType[] checksums = (ChecksumType[])lstTracks.GetValue(trackIter, 13);
SubChannelType subchannel = (SubChannelType)lstTracks.GetValue(trackIter, 14);
@@ -1545,10 +1544,10 @@ namespace osrepodbmgr
Metadata.Sequence.SideSpecified = true;
Metadata.Sequence.Side = spSide.ValueAsInt;
}
if(spLayer.ValueAsInt > 0)
if(spLayer1.ValueAsInt > 0)
{
Metadata.Sequence.LayerSpecified = true;
Metadata.Sequence.Layer = spLayer.ValueAsInt;
Metadata.Sequence.Layer = spLayer1.ValueAsInt;
}
}

View File

@@ -173,7 +173,7 @@ namespace osrepodbmgr
_dbCore.CloseDB();
}
txtUnar.Text = dlgFile.Filename;
txtDatabase.Text = dlgFile.Filename;
}
dlgFile.Destroy();

View File

@@ -1496,6 +1496,7 @@ QNX/QNX/20090229/source.zip</property>
<child>
<widget class="Gtk.ComboBox" id="cmbReleaseType">
<property name="MemberName" />
<property name="Sensitive">False</property>
<property name="IsTextCombo">True</property>
<property name="Items" translatable="yes" />
</widget>

View File

@@ -499,6 +499,7 @@ namespace osrepodbmgr
w20.Fill = false;
// Container child hbox7.Gtk.Box+BoxChild
this.cmbReleaseType = global::Gtk.ComboBox.NewText();
this.cmbReleaseType.Sensitive = false;
this.cmbReleaseType.Name = "cmbReleaseType";
this.hbox7.Add(this.cmbReleaseType);
global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox7[this.cmbReleaseType]));