KAZ/webtransfer
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Pl4yep2on/webtransfer into dev

Browse Source
This commit is contained in:
GMrrc
2024-11-29 14:58:09 +01:00
parent c39233ceb7 48e5280a57
commit 0d4d10f51e
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/FileTable.vue
View File

@@ -254,7 +254,7 @@ export default {
try {
const client = getClient();
let directoryItems;
if (this.currentTab === 'default'){
if (this.currentTab === 'default' || (this.currentTab === 'favorites' && this.current_dir !== '/')){
directoryItems = await client.getDirectoryContents(this.root_path + this.current_dir);
}
else if(this.currentTab === 'favorites'){
@@ -264,6 +264,7 @@ export default {
this.files = directoryItems.map(file => ({
basename: file.basename,
filename:file.filename,
size: file.size,
href: client.getFileDownloadLink(file.filename),
type: file.type
@@ -313,7 +314,19 @@ export default {
async handleClickElem(file) {
if (this.isTransfering) return;
if (file.type === 'directory') {
this.current_dir = this.current_dir === '/' ? '/' + file.basename : this.current_dir + '/' + file.basename;
if(this.currentTab === 'default'){
this.current_dir = this.current_dir === '/' ? '/' + file.basename : this.current_dir + '/' + file.basename;
}
else{
let path = file.filename;
let pathSplited = path.split('/');
let result = pathSplited.slice(3);
let dir = '';
result.forEach(element => {
dir += '/' + element
});
this.current_dir = dir;
}
this.breadcrumbParts = this.getBreadcrumbParts()
await this.fetchFiles();
} else {
@@ -596,8 +609,8 @@ export default {
if (names.initialFileName !== names.newFileName) {
const client = getClient()
try {
const oldName = this.root_path + this.current_dir + names.initialFileName;
const newName = this.root_path + this.current_dir + names.newFileName;
const oldName = this.root_path + this.current_dir + '/' + names.initialFileName;
const newName = this.root_path + this.current_dir + '/' + names.newFileName;
let alreadyExists = await this.elemtAlreadyExists(newName);
if (!alreadyExists) {
await client.moveFile(oldName, newName);