Skip to content

Commit

Permalink
Add option to use title as output directory + small things
Browse files Browse the repository at this point in the history
- add title as output directory
- add keyboard delete in main list
- fix progress bar missing when using delete from right click
- replace input for disk numbers with numerical input (up/down)
  • Loading branch information
r4dius committed Jul 15, 2024
1 parent 032fb2e commit 99fa13a
Show file tree
Hide file tree
Showing 16 changed files with 384 additions and 498 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

.vs/*
Backup/*
bin/*
obj/*
Backup/Iso2God.sln
9 changes: 5 additions & 4 deletions Chilano.Iso2God.Ftp/FtpUploader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ private void FtpUploader_DoWork(object sender, DoWorkEventArgs e)
Errors.Add(new ArgumentNullException("FtpUploader must be passed an instance of FtpUploaderArgs."));
return;
}

string text = ((args.Platform == IsoEntryPlatform.Xbox360) ? "00007000" : "00005000");
string text2 = args.SourcePath + args.TitleID + Path.DirectorySeparatorChar + text + Path.DirectorySeparatorChar;
string text2 = args.SourcePath + args.TitleDirectory + Path.DirectorySeparatorChar + text + Path.DirectorySeparatorChar;
ftp.ServerAddress = args.Ip;
ftp.UserName = args.User;
ftp.Password = args.Pass;
Expand All @@ -51,11 +52,11 @@ private void FtpUploader_DoWork(object sender, DoWorkEventArgs e)
return;
}
ftp.ChangeWorkingDirectory("Hdd1/Content/0000000000000000");
if (!dirExists(args.TitleID))
if (!dirExists(args.TitleDirectory))
{
ftp.CreateDirectory(args.TitleID);
ftp.CreateDirectory(args.TitleDirectory);
}
ftp.ChangeWorkingDirectory(args.TitleID);
ftp.ChangeWorkingDirectory(args.TitleDirectory);
if (!dirExists(text))
{
ftp.CreateDirectory(text);
Expand Down
8 changes: 4 additions & 4 deletions Chilano.Iso2God.Ftp/FtpUploaderArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ public class FtpUploaderArgs

public string Port;

public string TitleID;

public string ContainerID;

public string SourcePath;

public string TitleDirectory;

public FtpUploaderArgs(string Ip, string User, string Pass, string Port, string TitleID, string ContainerID, string SourcePath, IsoEntryPlatform Platform)
public FtpUploaderArgs(string Ip, string User, string Pass, string Port, string TitleDirectory, string ContainerID, string SourcePath, IsoEntryPlatform Platform)
{
this.Ip = Ip;
this.User = User;
this.Pass = Pass;
this.Port = Port;
this.TitleID = TitleID;
this.TitleDirectory = TitleDirectory;
this.ContainerID = ContainerID;
this.SourcePath = SourcePath;
this.Platform = Platform;
Expand Down
50 changes: 25 additions & 25 deletions Chilano.Iso2God.Properties/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,48 +43,33 @@ public string RebuildPath
}
}

[DefaultSettingValue("True")]
[DebuggerNonUserCode]
[UserScopedSetting]
public bool AlwaysSaveISO
{
get
{
return (bool)this["AlwaysSaveISO"];
}
set
{
this["AlwaysSaveISO"] = value;
}
}

[DefaultSettingValue("False")]
[DefaultSettingValue("True")]
[DebuggerNonUserCode]
[UserScopedSetting]
public bool AlwaysDeleteGOD
public bool RebuiltCheck
{
get
{
return (bool)this["AlwaysDeleteGOD"];
return (bool)this["RebuiltCheck"];
}
set
{
this["AlwaysDeleteGOD"] = value;
this["RebuiltCheck"] = value;
}
}

[DefaultSettingValue("False")]
[DefaultSettingValue("True")]
[DebuggerNonUserCode]
[UserScopedSetting]
public bool AlwaysSkipGOD
public bool AlwaysSave
{
get
{
return (bool)this["AlwaysSkipGOD"];
return (bool)this["AlwaysSave"];
}
set
{
this["AlwaysSkipGOD"] = value;
this["AlwaysSave"] = value;
}
}

Expand Down Expand Up @@ -148,9 +133,9 @@ public string FtpPort
}
}

[DefaultSettingValue("True")]
[UserScopedSetting]
[DebuggerNonUserCode]
[DefaultSettingValue("True")]
public bool AutoRenameMultiDisc
{
get
Expand Down Expand Up @@ -178,9 +163,9 @@ public bool FtpUpload
}
}

[DefaultSettingValue("2")]
[DebuggerNonUserCode]
[UserScopedSetting]
[DefaultSettingValue("2")]
public int DefaultPadding
{
get
Expand Down Expand Up @@ -208,6 +193,21 @@ public bool AutoBrowse
}
}

[DefaultSettingValue("False")]
[UserScopedSetting]
[DebuggerNonUserCode]
public bool TitleDirectory
{
get
{
return (bool)this["TitleDirectory"];
}
set
{
this["TitleDirectory"] = value;
}
}

[DefaultSettingValue("800")]
[DebuggerNonUserCode]
[UserScopedSetting]
Expand Down
7 changes: 3 additions & 4 deletions Chilano.Iso2God/About.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,9 @@ private void InitializeComponent()
//
this.label2.Location = new System.Drawing.Point(10, 245);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(369, 35);
this.label2.Size = new System.Drawing.Size(363, 35);
this.label2.TabIndex = 9;
this.label2.Text = "This \"Reloaded\" update is a \"quality of life\" improvement mod from decompilation " +
"of the original v1.3.6, it is not supported by Team 360h.";
this.label2.Text = "This update is a \"quality of life\" improvement mod from decompilation of the original v1.3.6 and is not supported by Team 360h.";
//
// About
//
Expand All @@ -108,7 +107,7 @@ private void InitializeComponent()
this.MinimizeBox = false;
this.Name = "About";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "About Iso2God - Reloaded";
this.Text = "About Iso2God";
this.Load += new System.EventHandler(this.About_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
Expand Down
Loading

0 comments on commit 99fa13a

Please sign in to comment.