noham/QobuzDownloaderX
1
0
Fork 0
mirror of https://github.com/NohamR/QobuzDownloaderX.git synced 2025-05-24 14:22:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from tomty89/path_bs

Browse Source 
ditch remaining backslashes in paths
This commit is contained in:
AiiR 2020-07-10 00:13:38 -04:00 committed by GitHub
commit ea09798e3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
QobuzDownloaderX/Form1.cs
View File

@ -110,8 +110,6 @@ namespace QobuzDownloaderX
public int trackNumber { get; set; } public int trackNumber { get; set; }
public int trackTotal { get; set; } public int trackTotal { get; set; }
public string discFolder { get; set; }
searchForm searchF = new searchForm(); searchForm searchF = new searchForm();
private void Form1_Load(object sender, EventArgs e) private void Form1_Load(object sender, EventArgs e)
@ -820,13 +818,11 @@ namespace QobuzDownloaderX
#region Create Directories #region Create Directories
// Create strings for disc folders // Create strings for disc folders
string discFolder = null; string discFolder = null;
string discFolderCreate = null;
// If more than 1 disc, create folders for discs. Otherwise, strings will remain null. // If more than 1 disc, create folders for discs. Otherwise, strings will remain null.
if (discTotal != 1) if (discTotal > 1)
{ {
discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\"; discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0');
discFolderCreate = "\\CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\";
} }
// Create directories // Create directories
@ -1620,13 +1616,11 @@ namespace QobuzDownloaderX
#region Create Directories #region Create Directories
// Create strings for disc folders // Create strings for disc folders
string discFolder = null; string discFolder = null;
string discFolderCreate = null;
// If more than 1 disc, create folders for discs. Otherwise, strings will remain null. // If more than 1 disc, create folders for discs. Otherwise, strings will remain null.
if (discTotal != 1) if (discTotal > 1)
{ {
discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\"; discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0');
discFolderCreate = "\\CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\";
} }
// Create directories // Create directories
@ -2421,13 +2415,11 @@ namespace QobuzDownloaderX
#region Create Directories #region Create Directories
// Create strings for disc folders // Create strings for disc folders
string discFolder = null; string discFolder = null;
string discFolderCreate = null;
// If more than 1 disc, create folders for discs. Otherwise, strings will remain null. // If more than 1 disc, create folders for discs. Otherwise, strings will remain null.
if (discTotal != 1) if (discTotal > 1)
{ {
discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\"; discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0');
discFolderCreate = "\\CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\";
} }
// Create directories // Create directories
@ -3189,13 +3181,11 @@ namespace QobuzDownloaderX
#region Create Directories #region Create Directories
// Create strings for disc folders // Create strings for disc folders
string discFolder = null; string discFolder = null;
string discFolderCreate = null;
// If more than 1 disc, create folders for discs. Otherwise, strings will remain null. // If more than 1 disc, create folders for discs. Otherwise, strings will remain null.
if (discTotal != 1) if (discTotal > 1)
{ {
discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\"; discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0');
discFolderCreate = "\\CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\";
} }
// Create directories // Create directories
@ -3904,13 +3894,11 @@ namespace QobuzDownloaderX
#region Create Directories #region Create Directories
// Create strings for disc folders // Create strings for disc folders
string discFolder = null; string discFolder = null;
string discFolderCreate = null;
// If more than 1 disc, create folders for discs. Otherwise, strings will remain null. // If more than 1 disc, create folders for discs. Otherwise, strings will remain null.
if (discTotal != 1) if (discTotal > 1)
{ {
discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\"; discFolder = "CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0');
discFolderCreate = "\\CD " + discNumber.ToString().PadLeft(paddingDiscLength, '0') + "\\";
} }
// Create directories // Create directories

4
QobuzDownloaderX/LoginForm-v2.cs
View File

@ -53,8 +53,8 @@ namespace QobuzDownloaderX
public string userAuthToken { get; set; } public string userAuthToken { get; set; }
public string altLoginValue { get; set; } public string altLoginValue { get; set; }
string errorLog = Path.GetDirectoryName(Application.ExecutablePath) + "\\Latest_Error.log"; string errorLog = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "Latest_Error.log");
string dllCheck = Path.GetDirectoryName(Application.ExecutablePath) + "\\taglib-sharp.dll"; string dllCheck = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "taglib-sharp.dll");
static string GetMd5Hash(MD5 md5Hash, string input) static string GetMd5Hash(MD5 md5Hash, string input)
{ {