Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite 4.5: proper renaming files and folders

Browse Source 
git-svn-id: svn://kolibrios.org@8750 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-05-27 23:40:55 +00:00
parent 65dd3b758c
commit a660c35743
2 changed files with 114 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
programs/cmm/eolite/Eolite.c
View File

@ -1,10 +1,10 @@
//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2020 //Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2021
//GNU GPL license. //GNU GPL license.
// 70.5 - get volume info and label // 70.5 - get volume info and label
#define TITLE "Eolite File Manager 4.49" #define TITLE "Eolite File Manager 4.5"
#define ABOUT_TITLE "EOLITE 4.49" #define ABOUT_TITLE "EOLITE 4.5"
#ifndef AUTOBUILD #ifndef AUTOBUILD
#include "lang.h--" #include "lang.h--"
@ -1021,15 +1021,16 @@ void ShowOpenWithDialog()
void NewElement() void NewElement()
{ {
BDVK element_info; BDVK element_info;
byte del_rezult, copy_rezult, info_result; byte del_result, copy_result, info_result;
sprintf(#temp,"%s/%s",#path,new_file_ed.text); sprintf(#temp,"%s/%s",#path,new_file_ed.text);
info_result = GetFileInfo(#temp, #element_info); info_result = GetFileInfo(#temp, #element_info);
switch(new_element_active) switch(new_element_active)
{ {
case CREATE_FILE: case CREATE_FILE:
if (info_result==5) if (info_result!=5) {
{ notify(FS_ITEM_ALREADY_EXISTS);
} else {
CreateFile(0, 0, #temp); CreateFile(0, 0, #temp);
if (EAX) if (EAX)
{ {
@ -1037,14 +1038,11 @@ void NewElement()
else Write_Error(EAX); else Write_Error(EAX);
} }
} }
else
{
notify(FS_ITEM_ALREADY_EXISTS);
}
break; break;
case CREATE_FOLDER: case CREATE_FOLDER:
if (info_result==5) if (info_result!=5) {
{ notify(FS_ITEM_ALREADY_EXISTS);
} else {
CreateDir(#temp); CreateDir(#temp);
if (EAX) if (EAX)
{ {
@ -1052,42 +1050,25 @@ void NewElement()
else Write_Error(EAX); else Write_Error(EAX);
} }
} }
else
{
notify(FS_ITEM_ALREADY_EXISTS);
}
break; break;
case RENAME_ITEM: case RENAME_ITEM:
if (info_result==5) if (info_result!=5) {
{
if (itdir)
{
//rename only empty folders
if (del_rezult = DeleteFile(#file_path))
{
Write_Error(del_rezult);
return;
}
if (CreateDir(#temp)) CreateDir(#file_path);
Open_Dir(#path,WITH_REDRAW);
SelectFileByName(new_file_ed.text);
}
else
{
if (copy_rezult = CopyFile(#file_path,#temp))
{
Write_Error(copy_rezult);
}
else
{
DeleteFile(#file_path);
SelectFileByName(new_file_ed.text);
}
}
}
else
{
notify(FS_ITEM_ALREADY_EXISTS); notify(FS_ITEM_ALREADY_EXISTS);
} else {
(RenameMove(new_file_ed.text, #file_path))
{
if (itdir) {
notify("'Error renaming folder' -E");
return;
} else {
if (copy_result = CopyFile(#file_path,#temp)) {
Write_Error(copy_result);
} else {
DeleteFile(#file_path);
SelectFileByName(new_file_ed.text);
}
}
}
} }
} }
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);

171
programs/cmm/lib/fs.h
View File

@ -16,7 +16,7 @@
// // // //
//===================================================// //===================================================//
:struct f70{ :struct F70{
dword func; dword func;
dword param1; dword param1;
dword param2; dword param2;
@ -24,7 +24,7 @@
dword param4; dword param4;
char rezerv; char rezerv;
dword name; dword name;
}; } f70;
:struct BDVK { :struct BDVK {
dword readonly:1, hidden:1, system:1, volume_label:1, isfolder:1, notarchived:1, :0; dword readonly:1, hidden:1, system:1, volume_label:1, isfolder:1, notarchived:1, :0;
@ -43,141 +43,146 @@
:f70 getinfo_file_70;
:dword GetFileInfo(dword file_path, bdvk_struct) :dword GetFileInfo(dword file_path, bdvk_struct)
{ {
getinfo_file_70.func = 5; f70.func = 5;
getinfo_file_70.param1 = f70.param1 =
getinfo_file_70.param2 = f70.param2 =
getinfo_file_70.param3 = 0; f70.param3 = 0;
getinfo_file_70.param4 = bdvk_struct; f70.param4 = bdvk_struct;
getinfo_file_70.rezerv = 0; f70.rezerv = 0;
getinfo_file_70.name = file_path; f70.name = file_path;
$mov eax,70 $mov eax,70
$mov ebx,#getinfo_file_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }
:f70 setinfo_file_70;
:dword SetFileInfo(dword file_path, bdvk_struct) :dword SetFileInfo(dword file_path, bdvk_struct)
{ {
setinfo_file_70.func = 6; f70.func = 6;
setinfo_file_70.param1 = f70.param1 =
setinfo_file_70.param2 = f70.param2 =
setinfo_file_70.param3 = 0; f70.param3 = 0;
setinfo_file_70.param4 = bdvk_struct; f70.param4 = bdvk_struct;
setinfo_file_70.rezerv = 0; f70.rezerv = 0;
setinfo_file_70.name = file_path; f70.name = file_path;
$mov eax,70 $mov eax,70
$mov ebx,#setinfo_file_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }
:f70 run_file_70;
:signed int RunProgram(dword run_path, run_param) :signed int RunProgram(dword run_path, run_param)
{ {
run_file_70.func = 7; f70.func = 7;
run_file_70.param1 = f70.param1 =
run_file_70.param3 = f70.param3 =
run_file_70.param4 = f70.param4 =
run_file_70.rezerv = 0; f70.rezerv = 0;
run_file_70.param2 = run_param; f70.param2 = run_param;
run_file_70.name = run_path; f70.name = run_path;
$mov eax,70 $mov eax,70
$mov ebx,#run_file_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }
:f70 create_dir_70;
:int CreateDir(dword new_folder_path) :int CreateDir(dword new_folder_path)
{ {
create_dir_70.func = 9; f70.func = 9;
create_dir_70.param1 = f70.param1 =
create_dir_70.param2 = f70.param2 =
create_dir_70.param3 = f70.param3 =
create_dir_70.param4 = f70.param4 =
create_dir_70.rezerv = 0; f70.rezerv = 0;
create_dir_70.name = new_folder_path; f70.name = new_folder_path;
$mov eax,70 $mov eax,70
$mov ebx,#create_dir_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }
:f70 del_file_70;
:int DeleteFile(dword del_file_path) :int DeleteFile(dword del_file_path)
{ {
del_file_70.func = 8; f70.func = 8;
del_file_70.param1 = f70.param1 =
del_file_70.param2 = f70.param2 =
del_file_70.param3 = f70.param3 =
del_file_70.param4 = f70.param4 =
del_file_70.rezerv = 0; f70.rezerv = 0;
del_file_70.name = del_file_path; f70.name = del_file_path;
$mov eax,70 $mov eax,70
$mov ebx,#del_file_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }
:f70 read_file_70;
:int ReadFile(dword offset, data_size, buffer, file_path) :int ReadFile(dword offset, data_size, buffer, file_path)
{ {
read_file_70.func = 0; f70.func = 0;
read_file_70.param1 = offset; f70.param1 = offset;
read_file_70.param2 = 0; f70.param2 = 0;
read_file_70.param3 = data_size; f70.param3 = data_size;
read_file_70.param4 = buffer; f70.param4 = buffer;
read_file_70.rezerv = 0; f70.rezerv = 0;
read_file_70.name = file_path; f70.name = file_path;
$mov eax,70 $mov eax,70
$mov ebx,#read_file_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }
:f70 write_file_70;
:int CreateFile(dword data_size, buffer, file_path) :int CreateFile(dword data_size, buffer, file_path)
{ {
write_file_70.func = 2; f70.func = 2;
write_file_70.param1 = 0; f70.param1 = 0;
write_file_70.param2 = 0; f70.param2 = 0;
write_file_70.param3 = data_size; f70.param3 = data_size;
write_file_70.param4 = buffer; f70.param4 = buffer;
write_file_70.rezerv = 0; f70.rezerv = 0;
write_file_70.name = file_path; f70.name = file_path;
$mov eax,70 $mov eax,70
$mov ebx,#write_file_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }
//////////////////////////////////////// ////////////////////////////////////////
// WriteInFileThatAlredyExists // // WriteInFileThatAlredyExists //
//////////////////////////////////////// ////////////////////////////////////////
:f70 write_file_offset_70;
:int WriteFile(dword offset, data_size, buffer, file_path) :int WriteFile(dword offset, data_size, buffer, file_path)
{ {
write_file_offset_70.func = 3; f70.func = 3;
write_file_offset_70.param1 = offset; f70.param1 = offset;
write_file_offset_70.param2 = 0; f70.param2 = 0;
write_file_offset_70.param3 = data_size; f70.param3 = data_size;
write_file_offset_70.param4 = buffer; f70.param4 = buffer;
write_file_offset_70.rezerv = 0; f70.rezerv = 0;
write_file_offset_70.name = file_path; f70.name = file_path;
$mov eax,70 $mov eax,70
$mov ebx,#write_file_offset_70.func $mov ebx,#f70.func
$int 0x40
}
:int RenameMove(dword path_to, path_from)
{
f70.func = 10;
f70.param1 =
f70.param2 =
f70.param3 = 0;
f70.param4 = path_to;
f70.rezerv = 0;
f70.name = path_from;
$mov eax,70
$mov ebx,#f70.func
$int 0x40 $int 0x40
} }
:f70 read_dir_70;
:int ReadDir(dword file_count, read_buffer, dir_path) :int ReadDir(dword file_count, read_buffer, dir_path)
{ {
read_dir_70.func = 1; f70.func = 1;
read_dir_70.param1 = f70.param1 =
read_dir_70.param2 = f70.param2 =
read_dir_70.rezerv = 0; f70.rezerv = 0;
read_dir_70.param3 = file_count; f70.param3 = file_count;
read_dir_70.param4 = read_buffer; f70.param4 = read_buffer;
read_dir_70.name = dir_path; f70.name = dir_path;
$mov eax,70 $mov eax,70
$mov ebx,#read_dir_70.func $mov ebx,#f70.func
$int 0x40 $int 0x40
} }