claunia/CICMMetadata
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup and reformatting.

Browse Source
This commit is contained in:
Natalia Portillo
2018-07-31 00:14:45 +01:00
parent 978ea811a0
commit ebde6d67e1
5 changed files with 758 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CICMMetadataEditor/CICMMetadataEditor.Desktop/Program.cs
View File

@@ -28,9 +28,10 @@
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// //
using System; using System;
using Eto;
using Eto.Forms; using Eto.Forms;
using Eto.Drawing;
namespace CICMMetadataEditor.Desktop namespace CICMMetadataEditor.Desktop
{ {
@@ -39,7 +40,7 @@ namespace CICMMetadataEditor.Desktop
[STAThread] [STAThread]
static void Main(string[] args) static void Main(string[] args)
{ {
new Application(Eto.Platform.Detect).Run(new dlgMetadata()); new Application(Platform.Detect).Run(new dlgMetadata());
} }
} }
} }

22
CICMMetadataEditor/CICMMetadataEditor/dlgBlockMedia.xeto.cs
View File

@@ -41,16 +41,13 @@ namespace CICMMetadataEditor
{ {
public class dlgBlockMedia : Dialog public class dlgBlockMedia : Dialog
{ {
// Non-editable fields
ChecksumType[] checksums; ChecksumType[] checksums;
ChecksumType[] contentChks; ChecksumType[] contentChks;
DumpHardwareType dumpHwIter; DumpHardwareType dumpHwIter;
bool editingDumpHw; bool editingDumpHw;
bool editingPartition; bool editingPartition;
FileSystemType filesystemIter; FileSystemType filesystemIter;
ObservableCollection<StringEntry> lstAdditionalInformation; ObservableCollection<StringEntry> lstAdditionalInformation;
ObservableCollection<DumpType> lstAta; ObservableCollection<DumpType> lstAta;
ObservableCollection<DumpType> lstCID; ObservableCollection<DumpType> lstCID;
ObservableCollection<DumpType> lstCSD; ObservableCollection<DumpType> lstCSD;
@@ -70,7 +67,6 @@ namespace CICMMetadataEditor
ObservableCollection<DumpType> lstUSBDescriptors; ObservableCollection<DumpType> lstUSBDescriptors;
public BlockMediaType Metadata; public BlockMediaType Metadata;
public bool Modified; public bool Modified;
PartitionType partitionIter; PartitionType partitionIter;
ScansType scans; ScansType scans;
TapePartitionType[] tapeInformation; TapePartitionType[] tapeInformation;
@@ -612,7 +608,8 @@ namespace CICMMetadataEditor
spSequence.ToolTip = "Number of this disk in the sequence."; spSequence.ToolTip = "Number of this disk in the sequence.";
spTotalMedia.ToolTip = "How many disks make the sequence."; spTotalMedia.ToolTip = "How many disks make the sequence.";
spSide.ToolTip = "On flippy disks, which side of the disk is represented by this dump."; spSide.ToolTip = "On flippy disks, which side of the disk is represented by this dump.";
spLayer.ToolTip = "On PTP layered disks, which layer of the side of the disk is represented by this dump."; spLayer.ToolTip =
"On PTP layered disks, which layer of the side of the disk is represented by this dump.";
txtBlocks.ToolTip = "How many individual blocks (sectors) are in this dump."; txtBlocks.ToolTip = "How many individual blocks (sectors) are in this dump.";
spPhysicalBlockSize.ToolTip = "Size of the biggest physical block in bytes."; spPhysicalBlockSize.ToolTip = "Size of the biggest physical block in bytes.";
spLogicalBlockSize.ToolTip = "Size of the biggest logical block in bytes."; spLogicalBlockSize.ToolTip = "Size of the biggest logical block in bytes.";
@@ -721,14 +718,11 @@ namespace CICMMetadataEditor
if(Metadata.PCMCIA.Compliance != null) txtCompliance.Text = Metadata.PCMCIA.Compliance; if(Metadata.PCMCIA.Compliance != null) txtCompliance.Text = Metadata.PCMCIA.Compliance;
if(Metadata.PCMCIA.ManufacturerCodeSpecified) if(Metadata.PCMCIA.ManufacturerCodeSpecified)
txtMfgCode.Text = txtMfgCode.Text = $"0x{Metadata.PCMCIA.ManufacturerCode:X4}";
$"0x{Metadata.PCMCIA.ManufacturerCode:X4}";
if(Metadata.PCMCIA.CardCodeSpecified) if(Metadata.PCMCIA.CardCodeSpecified)
txtCardCode.Text = $"0x{Metadata.PCMCIA.CardCode:X4}"; txtCardCode.Text = $"0x{Metadata.PCMCIA.CardCode:X4}";
if(Metadata.PCMCIA.Manufacturer != null) if(Metadata.PCMCIA.Manufacturer != null) txtPCMCIAManufacturer.Text = Metadata.PCMCIA.Manufacturer;
txtPCMCIAManufacturer.Text = Metadata.PCMCIA.Manufacturer; if(Metadata.PCMCIA.ProductName != null) txtPCMCIAProductName.Text = Metadata.PCMCIA.ProductName;
if(Metadata.PCMCIA.ProductName != null)
txtPCMCIAProductName.Text = Metadata.PCMCIA.ProductName;
if(Metadata.PCMCIA.AdditionalInformation != null) if(Metadata.PCMCIA.AdditionalInformation != null)
{ {
lblAdditionalInformation.Visible = true; lblAdditionalInformation.Visible = true;
@@ -1045,7 +1039,8 @@ namespace CICMMetadataEditor
} }
protected void OnBtnEditFilesystemClicked(object sender, EventArgs e) protected void OnBtnEditFilesystemClicked(object sender, EventArgs e)
{/* {
/*
if(treeFilesystems.SelectedItem == null) return; if(treeFilesystems.SelectedItem == null) return;
filesystemIter = (FileSystemType)treeFilesystems.SelectedItem; filesystemIter = (FileSystemType)treeFilesystems.SelectedItem;
@@ -1061,7 +1056,8 @@ namespace CICMMetadataEditor
} }
protected void OnBtnAddFilesystemClicked(object sender, EventArgs e) protected void OnBtnAddFilesystemClicked(object sender, EventArgs e)
{/* {
/*
dlgFilesystem _dlgFilesystem = new dlgFilesystem(); dlgFilesystem _dlgFilesystem = new dlgFilesystem();
_dlgFilesystem.ShowModal(this); _dlgFilesystem.ShowModal(this);

126
CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto.cs
View File

@@ -36,9 +36,10 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Xml; using System.Xml;
using Eto.Threading; using System.Xml.Serialization;
using Eto.Forms; using Eto.Forms;
using Eto.Serialization.Xaml; using Eto.Serialization.Xaml;
using Eto.Threading;
using Schemas; using Schemas;
using BorderType = Schemas.BorderType; using BorderType = Schemas.BorderType;
@@ -49,17 +50,16 @@ namespace CICMMetadataEditor
AdvertisementType[] adverts; AdvertisementType[] adverts;
AudioMediaType[] audiomedias; AudioMediaType[] audiomedias;
BookType[] books; BookType[] books;
string currentFile;
LinearMediaType[] linearmedias; LinearMediaType[] linearmedias;
ObservableCollection<StringEntry> lstArchitectures; ObservableCollection<StringEntry> lstArchitectures;
ObservableCollection<string> lstArchitecturesTypes; ObservableCollection<string> lstArchitecturesTypes;
ObservableCollection<BarcodeEntry> lstBarcodes; ObservableCollection<BarcodeEntry> lstBarcodes;
ObservableCollection<string> lstBarcodeTypes; ObservableCollection<string> lstBarcodeTypes;
ObservableCollection<StringEntry> lstCategories; ObservableCollection<StringEntry> lstCategories;
ObservableCollection<DiscEntry> lstDiscs; ObservableCollection<DiscEntry> lstDiscs;
ObservableCollection<DiskEntry> lstDisks; ObservableCollection<DiskEntry> lstDisks;
ObservableCollection<string> lstFilesForMedia; ObservableCollection<string> lstFilesForMedia;
ObservableCollection<StringEntry> lstKeywords; ObservableCollection<StringEntry> lstKeywords;
ObservableCollection<StringEntry> lstLanguages; ObservableCollection<StringEntry> lstLanguages;
ObservableCollection<string> lstLanguageTypes; ObservableCollection<string> lstLanguageTypes;
@@ -77,7 +77,6 @@ namespace CICMMetadataEditor
Thread thdDisc; Thread thdDisc;
Thread thdDisk; Thread thdDisk;
UserManualType[] usermanuals; UserManualType[] usermanuals;
string currentFile;
public dlgMetadata() public dlgMetadata()
{ {
@@ -217,8 +216,7 @@ namespace CICMMetadataEditor
try try
{ {
System.Xml.Serialization.XmlSerializer reader = XmlSerializer reader = new XmlSerializer(typeof(CICMMetadataType));
new System.Xml.Serialization.XmlSerializer(typeof(CICMMetadataType));
FileStream fs = new FileStream(dlgOpen.FileName, FileMode.Open, FileAccess.Read); FileStream fs = new FileStream(dlgOpen.FileName, FileMode.Open, FileAccess.Read);
metadata = (CICMMetadataType)reader.Deserialize(fs); metadata = (CICMMetadataType)reader.Deserialize(fs);
fs.Dispose(); fs.Dispose();
@@ -239,11 +237,7 @@ namespace CICMMetadataEditor
protected void OnSaveAsClicked(object sender, EventArgs e) protected void OnSaveAsClicked(object sender, EventArgs e)
{ {
SaveFileDialog dlgSave = new SaveFileDialog SaveFileDialog dlgSave = new SaveFileDialog {CheckFileExists = true, Title = "Choose new metadata file"};
{
CheckFileExists = true,
Title = "Choose new metadata file"
};
dlgSave.Filters.Add(new FileFilter("Metadata files", ".xml")); dlgSave.Filters.Add(new FileFilter("Metadata files", ".xml"));
DialogResult result = dlgSave.ShowDialog(this); DialogResult result = dlgSave.ShowDialog(this);
@@ -254,11 +248,9 @@ namespace CICMMetadataEditor
void Save(string destination) void Save(string destination)
{ {
try try
{ {
System.Xml.Serialization.XmlSerializer writer = XmlSerializer writer = new XmlSerializer(typeof(CICMMetadataType));
new System.Xml.Serialization.XmlSerializer(typeof(CICMMetadataType));
FileStream fs = new FileStream(destination, FileMode.Create, FileAccess.Write); FileStream fs = new FileStream(destination, FileMode.Create, FileAccess.Write);
writer.Serialize(fs, metadata); writer.Serialize(fs, metadata);
fs.Dispose(); fs.Dispose();
@@ -266,8 +258,7 @@ namespace CICMMetadataEditor
} }
catch(Exception) catch(Exception)
{ {
if(Debugger.IsAttached) if(Debugger.IsAttached) throw;
throw;
MessageBox.Show("Could not save metadata.", MessageBoxType.Error); MessageBox.Show("Could not save metadata.", MessageBoxType.Error);
} }
@@ -287,7 +278,6 @@ namespace CICMMetadataEditor
lstDiscs = new ObservableCollection<DiscEntry>(); lstDiscs = new ObservableCollection<DiscEntry>();
lstDisks = new ObservableCollection<DiskEntry>(); lstDisks = new ObservableCollection<DiskEntry>();
treeKeywords.DataStore = lstKeywords; treeKeywords.DataStore = lstKeywords;
treeBarcodes.DataStore = lstBarcodes; treeBarcodes.DataStore = lstBarcodes;
treeCategories.DataStore = lstCategories; treeCategories.DataStore = lstCategories;
@@ -906,69 +896,69 @@ namespace CICMMetadataEditor
thdDisk = new Thread(Workers.AddMedia); thdDisk = new Thread(Workers.AddMedia);
thdDisk.Start(); thdDisk.Start();
*/ */
} }
protected void OnBtnStopAddDiskClicked(object sender, EventArgs e) protected void OnBtnStopAddDiskClicked(object sender, EventArgs e)
{ {
thdDisk?.Abort(); thdDisk?.Abort();
stopped = true; stopped = true;
OnDiskAddFailed(null); OnDiskAddFailed(null);
} }
void UpdateDiskProgress1(string text, string inner, long current, long maximum) void UpdateDiskProgress1(string text, string inner, long current, long maximum)
{ {
Application.Instance.Invoke(delegate Application.Instance.Invoke(delegate
{ {
lblAddDisk1.Text = !string.IsNullOrWhiteSpace(inner) ? inner : text; lblAddDisk1.Text = !string.IsNullOrWhiteSpace(inner) ? inner : text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
maximum > int.MaxValue) maximum > int.MaxValue)
{ {
current /= 100; current /= 100;
maximum /= 100; maximum /= 100;
} }
prgAddDisk1.Indeterminate = false; prgAddDisk1.Indeterminate = false;
prgAddDisk1.MinValue = 0; prgAddDisk1.MinValue = 0;
prgAddDisk1.MaxValue = (int)maximum; prgAddDisk1.MaxValue = (int)maximum;
prgAddDisk1.Value = (int)current; prgAddDisk1.Value = (int)current;
} }
else prgAddDisk1.Indeterminate = true; else prgAddDisk1.Indeterminate = true;
}); });
} }
void UpdateDiskProgress2(string text, string inner, long current, long maximum) void UpdateDiskProgress2(string text, string inner, long current, long maximum)
{ {
Application.Instance.Invoke(delegate Application.Instance.Invoke(delegate
{ {
lblAddDisk2.Text = !string.IsNullOrWhiteSpace(inner) ? inner : text; lblAddDisk2.Text = !string.IsNullOrWhiteSpace(inner) ? inner : text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
maximum > int.MaxValue) maximum > int.MaxValue)
{ {
current /= 100; current /= 100;
maximum /= 100; maximum /= 100;
} }
prgAddDisk2.Indeterminate = false; prgAddDisk2.Indeterminate = false;
prgAddDisk2.MinValue = 0; prgAddDisk2.MinValue = 0;
prgAddDisk2.MaxValue = (int)maximum; prgAddDisk2.MaxValue = (int)maximum;
prgAddDisk2.Value = (int)current; prgAddDisk2.Value = (int)current;
} }
else prgAddDisk2.Indeterminate = true; else prgAddDisk2.Indeterminate = true;
}); });
} }
void OnDiskAddFailed(string text) void OnDiskAddFailed(string text)
{ {
Application.Instance.Invoke(delegate Application.Instance.Invoke(delegate
{ {
if(!stopped) MessageBox.Show(text, MessageBoxType.Error); if(!stopped) MessageBox.Show(text, MessageBoxType.Error);
/* TODO /* TODO
Context.SelectedFile = ""; Context.SelectedFile = "";
*/ */
tabGeneral.Visible = true; tabGeneral.Visible = true;
tabKeywords.Visible = true; tabKeywords.Visible = true;
tabBarcodes.Visible = true; tabBarcodes.Visible = true;

13
CICMMetadataEditor/CICMMetadataEditor/dlgOpticalDisc.xeto.cs
View File

@@ -41,11 +41,9 @@ namespace CICMMetadataEditor
{ {
public class dlgOpticalDisc : Dialog public class dlgOpticalDisc : Dialog
{ {
// Non-editable fields
ChecksumType[] checksums; ChecksumType[] checksums;
DumpHardwareType dumpHwIter; DumpHardwareType dumpHwIter;
bool editingDumpHw; bool editingDumpHw;
bool editingPartition; bool editingPartition;
FileSystemType filesystemIter; FileSystemType filesystemIter;
ObservableCollection<DumpType> lstADIP; ObservableCollection<DumpType> lstADIP;
@@ -57,7 +55,6 @@ namespace CICMMetadataEditor
ObservableCollection<DumpType> lstDDS; ObservableCollection<DumpType> lstDDS;
ObservableCollection<DumpType> lstDI; ObservableCollection<DumpType> lstDI;
ObservableCollection<DumpType> lstDMI; ObservableCollection<DumpType> lstDMI;
ObservableCollection<DumpHardwareType> lstDumpHw; ObservableCollection<DumpHardwareType> lstDumpHw;
ObservableCollection<DumpType> lstLastRMD; ObservableCollection<DumpType> lstLastRMD;
ObservableCollection<SectorsType> lstLayers; ObservableCollection<SectorsType> lstLayers;
@@ -82,7 +79,6 @@ namespace CICMMetadataEditor
public bool Modified; public bool Modified;
PartitionType partitionIter; PartitionType partitionIter;
ScansType scans; ScansType scans;
TrackType trackIter; TrackType trackIter;
XboxType xbox; XboxType xbox;
@@ -841,7 +837,8 @@ namespace CICMMetadataEditor
spSequence.ToolTip = "Number of this disc in the sequence."; spSequence.ToolTip = "Number of this disc in the sequence.";
spTotalMedia.ToolTip = "How many diskc make the sequence."; spTotalMedia.ToolTip = "How many diskc make the sequence.";
spSide.ToolTip = "On double sided discs, which side of the disc is represented by this dump."; spSide.ToolTip = "On double sided discs, which side of the disc is represented by this dump.";
spLayer.ToolTip = "On PTP layered discs, which layer of the side of the disc is represented by this dump."; spLayer.ToolTip =
"On PTP layered discs, which layer of the side of the disc is represented by this dump.";
chkDimensions.ToolTip = "If checked, physical dimensions of disk are known."; chkDimensions.ToolTip = "If checked, physical dimensions of disk are known.";
chkRound.ToolTip = "If checked, disk is physicaly round."; chkRound.ToolTip = "If checked, disk is physicaly round.";
spDiameter.ToolTip = "Diameter in milimeters of disk."; spDiameter.ToolTip = "Diameter in milimeters of disk.";
@@ -1271,7 +1268,8 @@ namespace CICMMetadataEditor
} }
protected void OnBtnEditFilesystemClicked(object sender, EventArgs e) protected void OnBtnEditFilesystemClicked(object sender, EventArgs e)
{/* {
/*
if(treeFilesystems.SelectedItem == null) return; if(treeFilesystems.SelectedItem == null) return;
filesystemIter = (FileSystemType)treeFilesystems.SelectedItem; filesystemIter = (FileSystemType)treeFilesystems.SelectedItem;
@@ -1287,7 +1285,8 @@ namespace CICMMetadataEditor
} }
protected void OnBtnAddFilesystemClicked(object sender, EventArgs e) protected void OnBtnAddFilesystemClicked(object sender, EventArgs e)
{/* {
/*
dlgFilesystem _dlgFilesystem = new dlgFilesystem(); dlgFilesystem _dlgFilesystem = new dlgFilesystem();
_dlgFilesystem.ShowModal(this); _dlgFilesystem.ShowModal(this);