github/IconSnap
1
0
Fork 0
mirror of https://github.com/krustur/IconSnap.git synced 2026-09-12 20:11:33 +00:00
Code Releases Wiki Activity

Fixed bugs: Cant rename isngle file (and not from it's file.info neither)

Browse Source
This commit is contained in:
Krister Jansson
2018-11-25 00:18:35 +01:00
parent dce48b0df0
commit 820b83f2c7
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+24 -12
View File
@@ -21,8 +21,6 @@
// TODO: Upload to Aminet // TODO: Upload to Aminet
// TODO: Align via .backdrop-file // TODO: Align via .backdrop-file
// TODO: Scripted tests! // TODO: Scripted tests!
// BUG: Can't rename single file
// BUG: Can't rename single file from it's file.info file
// BUG: Problems reading some icons width/heigth information // BUG: Problems reading some icons width/heigth information
// C helpers // C helpers
@@ -331,7 +329,6 @@ unsigned int AlignDir(unsigned char *dirName)
StringToLower(fullPath, fullLen, fullLen - 4); StringToLower(fullPath, fullLen, fullLen - 4);
if (StringEndsWith(fullPath, ".info")) if (StringEndsWith(fullPath, ".info"))
{ {
fullPath[fullLen - 5] = 0;
// Verbose("fullPath: %s\n", fullPath); // Verbose("fullPath: %s\n", fullPath);
fixCount += AlignIcon(fullPath); fixCount += AlignIcon(fullPath);
} }
@@ -347,10 +344,19 @@ unsigned int AlignDir(unsigned char *dirName)
unsigned int AlignIcon(unsigned char *diskObjectName) unsigned int AlignIcon(unsigned char *diskObjectName)
{ {
struct DiskObject *diskObject = GetDiskObject(diskObjectName); unsigned long diskObjectNameLen = strlen(diskObjectName);
unsigned char *fixedDiskObjectName = malloc(PATH_MAX);
strcpy(fixedDiskObjectName, diskObjectName);
StringToLower(fixedDiskObjectName, diskObjectNameLen, diskObjectNameLen - 4);
if (StringEndsWith(fixedDiskObjectName, ".info"))
{
fixedDiskObjectName[diskObjectNameLen - 5] = 0;
}
struct DiskObject *diskObject = GetDiskObject(fixedDiskObjectName);
if (diskObject) if (diskObject)
{ {
Verbose("Icon found: %s\n", diskObjectName); Verbose("Icon found: %s\n", fixedDiskObjectName);
// Verbose("do_Magic: %x\n", diskObject->do_Magic); // Verbose("do_Magic: %x\n", diskObject->do_Magic);
// Verbose(" Version: %hi\n", diskObject->do_Version); // Verbose(" Version: %hi\n", diskObject->do_Version);
// Verbose(" do_Type: %i\n", (int)diskObject->do_Type); // Verbose(" do_Type: %i\n", (int)diskObject->do_Type);
@@ -374,8 +380,9 @@ unsigned int AlignIcon(unsigned char *diskObjectName)
// diskObject->do_CurrentX += 10; // diskObject->do_CurrentX += 10;
if (diskObject->do_CurrentX == NO_ICON_POSITION && diskObject->do_CurrentX == NO_ICON_POSITION) if (diskObject->do_CurrentX == NO_ICON_POSITION && diskObject->do_CurrentX == NO_ICON_POSITION)
{ {
Information("Skip \"%s\" - no icon position\n", diskObjectName); Information("Skip \"%s\" - no icon position\n", fixedDiskObjectName);
return 0; free(fixedDiskObjectName);
return 1;
} }
short xaligned = FALSE; short xaligned = FALSE;
@@ -409,20 +416,25 @@ unsigned int AlignIcon(unsigned char *diskObjectName)
if (!xaligned && !yaligned) if (!xaligned && !yaligned)
{ {
Information("Already aligned \"%s\"\n", diskObjectName); Information("Already aligned \"%s\" (%i,%i)\n",
return 0; fixedDiskObjectName,
origx, origy);
free(fixedDiskObjectName);
return 1;
} }
PutDiskObject(diskObjectName, diskObject); PutDiskObject(fixedDiskObjectName, diskObject);
FreeDiskObject(diskObject); FreeDiskObject(diskObject);
Information("Aligend \"%s\" (%i,%i) to (%i,%i)\n", Information("Aligend \"%s\" (%i,%i) to (%i,%i)\n",
diskObjectName, fixedDiskObjectName,
origx, origy, origx, origy,
newx, newy); newx, newy);
free(fixedDiskObjectName);
return 1; return 1;
} }
Verbose("Skipped \"%s\" - icon not found\n", diskObjectName); Verbose("Skipped \"%s\" - icon not found\n", fixedDiskObjectName);
free(fixedDiskObjectName);
return 0; return 0;
} }