refs #299,#36,#40,#37,#33 closed
This commit is contained in:
@@ -177,8 +177,8 @@ public class FilesWorker {
|
|||||||
System.out.println(dirs.size() + " Directories");
|
System.out.println(dirs.size() + " Directories");
|
||||||
System.out.println(pics.size() + " Pics");
|
System.out.println(pics.size() + " Pics");
|
||||||
|
|
||||||
int uploadeddirs = 0;
|
int queueddirs = 0;
|
||||||
int uploadedfiles = 0;
|
int queuedfiles = 0;
|
||||||
|
|
||||||
// GET THE UI
|
// GET THE UI
|
||||||
SOMGUI.changetoupload();
|
SOMGUI.changetoupload();
|
||||||
@@ -188,13 +188,13 @@ public class FilesWorker {
|
|||||||
|
|
||||||
for (File dir : dirs) {
|
for (File dir : dirs) {
|
||||||
|
|
||||||
uploadeddirs++;
|
queueddirs++;
|
||||||
|
|
||||||
System.out.println("Queueing Directories " + dir.toString());
|
System.out.println("Queueing Directories " + dir.toString());
|
||||||
limitdirs.add(dir);
|
limitdirs.add(dir);
|
||||||
if (limitdirs.size() >= SOMConfig.PARALLEL_UPLOADS
|
if (limitdirs.size() >= SOMConfig.PARALLEL_UPLOADS
|
||||||
// Upload even if limit is not reached
|
// Upload even if limit is not reached
|
||||||
|| (dirs.size() - uploadeddirs) < SOMConfig.PARALLEL_UPLOADS) {
|
|| (dirs.size() - queueddirs) < SOMConfig.PARALLEL_UPLOADS) {
|
||||||
|
|
||||||
System.out.println("Launch Dir upload");
|
System.out.println("Launch Dir upload");
|
||||||
uploadDir(limitdirs);
|
uploadDir(limitdirs);
|
||||||
@@ -208,15 +208,15 @@ public class FilesWorker {
|
|||||||
List<File> limitpics = new ArrayList<File>();
|
List<File> limitpics = new ArrayList<File>();
|
||||||
for (File pic : pics
|
for (File pic : pics
|
||||||
) {
|
) {
|
||||||
|
// Counter for queues files
|
||||||
uploadedfiles++;
|
queuedfiles++;
|
||||||
|
|
||||||
System.out.println("Queueing File " + pic.toString());
|
System.out.println("Queueing File " + pic.toString());
|
||||||
limitpics.add(pic);
|
limitpics.add(pic);
|
||||||
|
|
||||||
if (limitpics.size() >= SOMConfig.PARALLEL_UPLOADS
|
if (limitpics.size() >= SOMConfig.PARALLEL_UPLOADS
|
||||||
// Upload even if limit is not reached
|
// Upload even if limit is not reached
|
||||||
|| (pics.size() - uploadedfiles) < SOMConfig.PARALLEL_UPLOADS) {
|
|| (pics.size() - queuedfiles) < SOMConfig.PARALLEL_UPLOADS) {
|
||||||
|
|
||||||
System.out.println("Launch File upload");
|
System.out.println("Launch File upload");
|
||||||
uploadFile(limitpics);
|
uploadFile(limitpics);
|
||||||
|
|||||||
Reference in New Issue
Block a user