Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
neuro-images
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
neuro-images
Commits
b41cd46e
Commit
b41cd46e
authored
Jun 02, 2022
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
логика переносак папки на сервере и переименование картинок из пары
parent
4fb1e492
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
6 deletions
+63
-6
script-main.js
src/public/js/script-main.js
+4
-5
Main.php
src/src/App/Action/Admin/Main.php
+59
-1
No files found.
src/public/js/script-main.js
View file @
b41cd46e
...
@@ -135,7 +135,7 @@ $(document).ready(function(){
...
@@ -135,7 +135,7 @@ $(document).ready(function(){
7
:
{
0
:[
0
,
12
,
0
,
3
],
2
:[
3
,
9
,
12
,
4
],
4
:
[
6
,
6
,
6
,
6
],
6
:
[
9
,
3
,
4
,
12
]},
7
:
{
0
:[
0
,
12
,
0
,
3
],
2
:[
3
,
9
,
12
,
4
],
4
:
[
6
,
6
,
6
,
6
],
6
:
[
9
,
3
,
4
,
12
]},
8
:
{
0
:[
0
,
12
,
0
,
3
],
2
:[
3
,
9
,
12
,
4
],
4
:
[
6
,
6
,
6
,
6
],
6
:
[
9
,
3
,
4
,
12
],
8
:
[
12
,
0
,
3
,
0
]},
8
:
{
0
:[
0
,
12
,
0
,
3
],
2
:[
3
,
9
,
12
,
4
],
4
:
[
6
,
6
,
6
,
6
],
6
:
[
9
,
3
,
4
,
12
],
8
:
[
12
,
0
,
3
,
0
]},
9
:
{
0
:[
0
,
12
,
0
,
2
],
2
:[
3
,
9
,
12
,
3
],
4
:
[
5
,
7
,
6
,
4
],
6
:
[
6
,
6
,
4
,
5
],
8
:
[
9
,
3
,
3
,
12
]},
9
:
{
0
:[
0
,
12
,
0
,
2
],
2
:[
3
,
9
,
12
,
3
],
4
:
[
5
,
7
,
6
,
4
],
6
:
[
6
,
6
,
4
,
5
],
8
:
[
9
,
3
,
3
,
12
]},
10
:
{
0
:[
0
,
12
,
0
,
2
],
2
:[
2
,
10
,
12
,
4
],
4
:
[
4
,
8
,
6
,
4
],
6
:
[
6
,
6
,
4
,
5
],
8
:
[
10
,
2
,
3
,
12
]},
10
:
{
0
:[
0
,
12
,
0
,
2
],
2
:[
2
,
10
,
12
,
3
],
4
:
[
4
,
8
,
6
,
4
],
6
:
[
6
,
6
,
4
,
5
],
8
:
[
10
,
2
,
3
,
12
]},
}
}
...
@@ -348,10 +348,8 @@ $(document).ready(function(){
...
@@ -348,10 +348,8 @@ $(document).ready(function(){
// Клик на "Сохранить" для объявления:
// Клик на "Сохранить" для объявления:
$
(
'.btn.btn-primary.save-folders'
).
on
(
'click'
,
function
(){
$
(
'.btn.btn-primary.save-folders'
).
on
(
'click'
,
function
(){
//if (!confirm('Применить действия над изображениями?')) return false;
//if (!confirm('Применить действия над изображениями?')) return false;
// Формируем данные о картинках-парах:
// Формируем данные о картинках-парах:
var
data
=
{};
var
data
=
{};
$
(
'.b-list_folders-item'
).
each
(
function
(){
$
(
'.b-list_folders-item'
).
each
(
function
(){
...
@@ -364,6 +362,7 @@ $(document).ready(function(){
...
@@ -364,6 +362,7 @@ $(document).ready(function(){
folderContent
=
$
(
'.b-folder-content[data-folder="'
+
folderName
+
'"]'
),
folderContent
=
$
(
'.b-folder-content[data-folder="'
+
folderName
+
'"]'
),
$pairedFoto
=
$
(
'.b-foto_inner.paired'
,
folderContent
);
$pairedFoto
=
$
(
'.b-foto_inner.paired'
,
folderContent
);
data
[
folderName
]
=
null
;
if
(
$pairedFoto
.
length
>
0
)
{
if
(
$pairedFoto
.
length
>
0
)
{
$pairedFoto
.
each
(
function
(){
$pairedFoto
.
each
(
function
(){
var
var
...
@@ -375,14 +374,14 @@ $(document).ready(function(){
...
@@ -375,14 +374,14 @@ $(document).ready(function(){
}
}
dataPaired
[
pairNum
].
push
(
$this
.
data
(
'foto'
));
dataPaired
[
pairNum
].
push
(
$this
.
data
(
'foto'
));
});
});
data
[
folderName
]
=
dataPaired
;
}
}
data
[
folderName
]
=
dataPaired
;
}
}
});
});
var
var
$form
=
$
(
'#save-folders-form'
),
$form
=
$
(
'#save-folders-form'
),
action
=
$form
.
attr
(
'action'
),
action
=
$form
.
attr
(
'action'
),
...
...
src/src/App/Action/Admin/Main.php
View file @
b41cd46e
...
@@ -81,7 +81,65 @@ class Main extends Common
...
@@ -81,7 +81,65 @@ class Main extends Common
private
function
saveFolders
(
ServerRequestInterface
$request
)
private
function
saveFolders
(
ServerRequestInterface
$request
)
{
{
$data
=
$request
->
getParsedBody
();
$data
=
$request
->
getParsedBody
();
return
new
JsonResponse
(
$data
);
//return new JsonResponse($data);
$folders_list
=
[];
chdir
(
'public/'
);
foreach
(
$data
as
$folder
=>
$pairs
)
{
$from
=
"fotos/
$folder
"
;
$to
=
"fotos-arch/
$folder
"
;
if
(
is_dir
(
$from
))
{
// Копируем папку в директорию-архив:
$folders_list
[]
=
$folder
;
mkdir
(
$to
,
0777
);
chmod
(
$to
,
0777
);
$d
=
dir
(
$from
);
while
(
false
!==
(
$entry
=
$d
->
read
()))
{
if
(
$entry
==
"."
||
$entry
==
".."
)
continue
;
if
(
$pairs
)
{
$pair_num
=
''
;
foreach
(
$pairs
as
$pair
=>
$pair_files
)
{
if
(
in_array
(
$entry
,
$pair_files
))
{
$pair_num
=
$pair
.
'--'
;
break
;
}
}
//$folders_list[] = $folder;
copy
(
"
$from
/
$entry
"
,
"
$to
/
$pair_num$entry
"
);
}
else
{
copy
(
"
$from
/
$entry
"
,
"
$to
/
$entry
"
);
}
}
$d
->
close
();
// Удаляем старую папку:
$folders_list
[]
=
$from
;
$includes
=
glob
(
$from
.
'/*'
);
foreach
(
$includes
as
$include
)
{
unlink
(
$include
);
}
rmdir
(
$from
);
}
}
chdir
(
'..'
);
return
new
JsonResponse
(
$folders_list
);
// Сформировать тестовые данные для статистики по фидам:
// Сформировать тестовые данные для статистики по фидам:
if
(
$data
[
'feedTestData'
])
{
if
(
$data
[
'feedTestData'
])
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment