Skip to content

Item 5185: Zip Files for mass spec data #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-ankurj merged 17 commits into from
Apr 29, 2019
Merged

Item 5185: Zip Files for mass spec data #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5f0f2f9
Item 5185: zip multiple directories in parts
labkey-ankurj Mar 25, 2019
3d34d55
Item 5185: Error handling on failed zip
labkey-ankurj Mar 26, 2019
2a0d9e7
Item 5185: Refactoring zip code out from FileDrop.js into ZipLoad.js
labkey-ankurj Mar 27, 2019
8d4257c
Item 5185: removing original drop as it is not needed
labkey-ankurj Mar 27, 2019
7dd6320
Item 5186: Add filePattern for test integration
labkey-ankurj Apr 1, 2019
d36ee23
Merge branch 'develop' into 19.2_fb_zipLoader
cnathe Apr 2, 2019
5bcbd70
Merge branch 'develop' into 19.2_fb_zipLoader
cnathe Apr 3, 2019
ae83a7c
Item 5186: upload files in edge without zipping
labkey-ankurj Apr 3, 2019
e2fee55
Item 5186: code review changes
labkey-ankurj Apr 4, 2019
8838cc2
Merge branch 'develop' into 19.2_fb_zipLoader
cnathe Apr 9, 2019
60a9a1e
Automated test helper to get registered dropzones and accept FileEntr…
cnathe Apr 9, 2019
5cfceb7
Merge branch 'develop' into 19.2_fb_zipLoader
labkey-ankurj Apr 15, 2019
2828e83
Issue 37261:Folder doesn't get zipped in firefox
labkey-ankurj Apr 15, 2019
827db0c
Issue 37261:Folder doesn't get zipped in firefox - code review
labkey-ankurj Apr 15, 2019
34395cb
Issue 37261:Folder doesn't get zipped in firefox-test file pattern
labkey-ankurj Apr 15, 2019
670f00b
Zip files for mass spec - Automation test
labkey-sweta Apr 16, 2019
ca30403
Merge branch 'develop' into 19.2_fb_zipLoader
labkey-sweta Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/src/org/labkey/api/files/DirectoryPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public class DirectoryPattern
String _ext;
DirectoryPattern _subDirectory;
String _fileExt;
Module module;
Module _module;

public DirectoryPattern(Module module)
{
this.module = module;
this._module = module;
}

public String getExt()
Expand Down Expand Up @@ -51,7 +51,7 @@ public void setFileExt(String fileExt)

public Module getModule()
{
return module;
return _module;
}

public JSONObject toJSON()
Expand Down
8 changes: 4 additions & 4 deletions api/src/org/labkey/api/files/FileContentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,13 @@ default void fireFileMoveEvent(@NotNull Path src, @NotNull Path dest, @Nullable
void ensureFileData(QueryUpdateService qus, @NotNull User user, @NotNull Container container);

/**
* Add a recognizer for the directory pattern in order to zip the matching directory before uploading to files webpart.
* Allows a module to register a directory pattern to be checked in the files webpart in order to zip the matching directory before uploading.
* @param directoryPattern DirectoryPattern
* */
void addZipUploadRecognizer(DirectoryPattern directoryPattern);
void addZiploaderPattern(DirectoryPattern directoryPattern);

/**
* Returns the Map of moduleNames and DirectoryPattern
* Returns a list of DirectoryPattern objects for the active modules in the given container.
* */
List<DirectoryPattern> getZiploaderPattern(Container container);
List<DirectoryPattern> getZiploaderPatterns(Container container);
}
32 changes: 0 additions & 32 deletions api/src/org/labkey/api/files/FilePattern.java
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions filecontent/src/org/labkey/filecontent/FileContentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,23 +1378,23 @@ public ApiResponse execute(CustomPropertiesForm form, BindException errors)
}

@RequiresPermission(ReadPermission.class)
public class GetZipUploadRecognizerAction extends ReadOnlyApiAction
public class GetZiploaderPatternsAction extends ReadOnlyApiAction
{

@Override
public Object execute(Object o, BindException errors) throws Exception
public Object execute(Object o, BindException errors)
{
ApiSimpleResponse response = new ApiSimpleResponse();
FileContentService svc = FileContentService.get();
List<DirectoryPattern> directoryPattern = new ArrayList<>();
List<DirectoryPattern> directoryPatterns = new ArrayList<>();
List<JSONObject> directoryPatternsJson = new ArrayList<>();

if(null != svc)
{
directoryPattern = svc.getZiploaderPattern(getContainer());
directoryPatterns = svc.getZiploaderPatterns(getContainer());
}

for(DirectoryPattern directory: directoryPattern)
for(DirectoryPattern directory: directoryPatterns)
{
directoryPatternsJson.add(directory.toJSON());
}
Expand Down
6 changes: 3 additions & 3 deletions filecontent/src/org/labkey/filecontent/FileContentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public class FileContentServiceImpl implements FileContentService
private final ContainerListener _containerListener = new FileContentServiceContainerListener();
private final List<FileListener> _fileListeners = new CopyOnWriteArrayList<>();

private List<DirectoryPattern> _ziploaderPattern = new ArrayList<>();
private final List<DirectoryPattern> _ziploaderPattern = new CopyOnWriteArrayList<>();

enum Props
{
Expand Down Expand Up @@ -1398,13 +1398,13 @@ public void ensureFileData(QueryUpdateService qus, @NotNull User user, @NotNull


@Override
public void addZipUploadRecognizer(DirectoryPattern directoryPattern)
public void addZiploaderPattern(DirectoryPattern directoryPattern)
{
_ziploaderPattern.add(directoryPattern);
}

@Override
public List<DirectoryPattern> getZiploaderPattern(Container container)
public List<DirectoryPattern> getZiploaderPatterns(Container container)
{
List<DirectoryPattern> registeredPatterns = new ArrayList<>();
for(Module module : container.getActiveModules())
Expand Down
54 changes: 26 additions & 28 deletions filecontent/webapp/File.lib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
<libraries xmlns="http://labkey.org/clientLibrary/xml/">
<library compileInProductionMode="true">
<script path="File/data/webdav/Proxy.js"/>
<script path="File/data/webdav/URI.js"/>
<script path="File/data/webdav/Response.js"/>
<script path="File/data/Pipeline.js"/>
<script path="File/system/Abstract.js"/>
<script path="File/system/Webdav.js"/>
<script path="File/panel/Browser.js"/>
<script path="File/panel/Preview.js"/>
<script path="File/panel/Upload.js"/>
<script path="File/panel/Admin.js"/>
<script path="File/panel/Toolbar.js"/>
<script path="File/panel/FileProperties.js"/>
<script path="File/panel/Actions.js"/>
<script path="File/panel/EmailProps.js"/>
<script path="File/panel/EditCustomFileProps.js"/>
<script path="File/panel/ContextMenu.js"/>
<script path="File/util/IconUtil.js"/>
<script path="File/FileContent.css"/>
</library>
<dependencies>
<dependency path="Ext4ClientApi"/> <!-- Needed for EditCustomFileProps.js -->
<dependency path="Dropzone"/>
<dependency path="internal-FileDrop"/>
<dependency path="zipjs"/>
</dependencies>
</libraries>
<libraries xmlns="http://labkey.org/clientLibrary/xml/">
<library compileInProductionMode="true">
<script path="File/data/webdav/Proxy.js"/>
<script path="File/data/webdav/URI.js"/>
<script path="File/data/webdav/Response.js"/>
<script path="File/data/Pipeline.js"/>
<script path="File/system/Abstract.js"/>
<script path="File/system/Webdav.js"/>
<script path="File/panel/Browser.js"/>
<script path="File/panel/Preview.js"/>
<script path="File/panel/Upload.js"/>
<script path="File/panel/Admin.js"/>
<script path="File/panel/Toolbar.js"/>
<script path="File/panel/FileProperties.js"/>
<script path="File/panel/Actions.js"/>
<script path="File/panel/EmailProps.js"/>
<script path="File/panel/EditCustomFileProps.js"/>
<script path="File/panel/ContextMenu.js"/>
<script path="File/util/IconUtil.js"/>
<script path="File/FileContent.css"/>
</library>
<dependencies>
<dependency path="Ext4ClientApi"/> <!-- Needed for EditCustomFileProps.js -->
<dependency path="internal-FileDrop"/>
</dependencies>
</libraries>
1 change: 1 addition & 0 deletions internal/webapp/internal-FileDrop.lib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<libraries xmlns="http://labkey.org/clientLibrary/xml/">
<library compileInProductionMode="true">
<script path="internal/FileDrop/FileDrop.js"/>
<script path="internal/ZipLoad/ZipLoad.js"/>
</library>
<dependencies>
<dependency path="Ext4"/>
Expand Down
Loading