Skip to content

Commit 5ca3b1d

Browse files
DanTheMan827DanTheMan827
committed
Add dumper target for a dump-only build
1 parent 643d35d commit 5ca3b1d

File tree

13 files changed

+387
-15
lines changed

13 files changed

+387
-15
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
branch = notracesource
55
[submodule "Libraries/ProgressODoom"]
66
path = Libraries/ProgressODoom
7-
url = https://github.com/daPhie79/ProgressODoom.git
7+
url = https://github.com/TeamShinkansen/ProgressODoom.git
88
[submodule "Libraries/tiny7z"]
99
path = Libraries/tiny7z
1010
url = https://github.com/daPhie79/tiny7z.git

‎Libraries/ProgressODoom‎

‎Libraries/SSH.NET‎

‎hakchi_gui.sln‎

Lines changed: 102 additions & 0 deletions
Large diffs are not rendered by default.

‎hakchi_gui/DumperForm.Designer.cs‎

Lines changed: 49 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hakchi_gui/DumperForm.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using com.clusterrr.hakchi_gui.Properties;
2+
using System;
3+
using System.Windows.Forms;
4+
5+
namespace com.clusterrr.hakchi_gui
6+
{
7+
public partial class DumperForm : Form
8+
{
9+
public DumperForm()
10+
{
11+
InitializeComponent();
12+
hakchi.Initialize();
13+
}
14+
15+
private void DumperForm_Load(object sender, EventArgs e)
16+
{
17+
#if DUMPER
18+
MainForm.DoNand(Tasks.MembootTasks.NandTasks.DumpNand, Resources.DumpingNand, this);
19+
#endif
20+
Close();
21+
}
22+
}
23+
}

‎hakchi_gui/DumperForm.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎hakchi_gui/MainForm.cs‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,8 +1950,15 @@ bool UploadGames(bool exportGames = false)
19501950
}
19511951
}
19521952

1953+
#if DUMPER
1954+
internal static
1955+
#endif
19531956
bool DumpDialog(FileAccess type, string FileName, string FileExt, out string DumpFileName, string DialogFilter = null)
19541957
{
1958+
#if DUMPER
1959+
var openDumpFileDialog = new OpenFileDialog();
1960+
var saveDumpFileDialog = new SaveFileDialog();
1961+
#endif
19551962
DumpFileName = null;
19561963
string currentFilter;
19571964
switch (type)
@@ -1997,9 +2004,13 @@ bool DumpDialog(FileAccess type, string FileName, string FileExt, out string Dum
19972004
}
19982005
}
19992006

2000-
bool DoNand(MembootTasks.NandTasks task, string title)
2007+
bool DoNand(MembootTasks.NandTasks task, string title) => DoNand(task, title, this);
2008+
#if DUMPER
2009+
internal static
2010+
#endif
2011+
bool DoNand(MembootTasks.NandTasks task, string title, Form owner)
20012012
{
2002-
using (Tasker tasker = new Tasker(this))
2013+
using (Tasker tasker = new Tasker(owner))
20032014
{
20042015
tasker.AttachViews(new Tasks.TaskerTaskbar(), new Tasks.TaskerForm());
20052016
tasker.SetStatusImage(Resources.sign_cogs);

‎hakchi_gui/Program.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ static void Main(string[] args)
112112

113113
Trace.Listeners.Add(new TextWriterTraceListener(stdout));
114114

115+
#if !DUMPER
115116
if (Debugger.IsAttached || Array.IndexOf(args, "/debug") != -1)
117+
#endif
116118
{
117119
try
118120
{
@@ -173,6 +175,7 @@ static void Main(string[] args)
173175
{
174176
if (createdNew)
175177
{
178+
#if !DUMPER
176179
if (!isPortable)
177180
{
178181
BaseDirectoryExternal = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "hakchi2");
@@ -258,6 +261,9 @@ static void Main(string[] args)
258261
}
259262

260263
SetupScrapers();
264+
#else
265+
BaseDirectoryExternal = BaseDirectoryInternal;
266+
#endif
261267

262268
Trace.WriteLine("Starting, version: " + Shared.AppDisplayVersion);
263269

@@ -267,7 +273,11 @@ static void Main(string[] args)
267273

268274
FormContext.AllFormsClosed += Process.GetCurrentProcess().Kill; // Suicide! Just easy and dirty way to kill all threads.
269275

276+
#if !DUMPER
270277
FormContext.AddForm(new MainForm());
278+
#else
279+
FormContext.AddForm(new DumperForm());
280+
#endif
271281
Application.Run(FormContext);
272282
Trace.WriteLine("Done.");
273283
}

‎hakchi_gui/Sunxi/NandInfo.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ internal PartitionInfo(string device, string label, long blocks)
2424

2525
public static PartitionInfo GetByLabel(IEnumerable<PartitionInfo> info, params string[] labels)
2626
{
27-
return info.Where(e => labels.Contains(e.Label)).First();
27+
return info.Where(e => labels.Contains(e.Label)).FirstOrDefault();
2828
}
2929
}
3030

@@ -46,7 +46,14 @@ private NandInfo(PartitionInfo[] partitions, long pageSize, long pagesPerBlock,
4646
public static NandInfo GetNandInfo(string partCommand = "sunxi-part")
4747
{
4848
string partInfo = hakchi.Shell.ExecuteSimple(partCommand);
49-
string[] nandInfo = hakchi.Shell.ExecuteSimple("sunxi-flash nandinfo").Split(' ');
49+
string commandOutput = hakchi.Shell.ExecuteSimple("sunxi-flash nandinfo");
50+
51+
if (string.IsNullOrWhiteSpace(commandOutput))
52+
{
53+
return new NandInfo(new PartitionInfo[] { }, 0, 0, 0);
54+
}
55+
56+
string[] nandInfo = commandOutput.Split(' ');
5057

5158
var partitions = new List<PartitionInfo>();
5259

0 commit comments

Comments
 (0)