Skip to content

Commit

Permalink
Fixes progress dialog appearance
Browse files Browse the repository at this point in the history
  • Loading branch information
hlfernandez committed Feb 3, 2025
1 parent f4eaf6f commit 72bf827
Show file tree
Hide file tree
Showing 17 changed files with 28 additions and 22 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<packaging>pom</packaging>

<name>SEquence DAtaset builder</name>
Expand Down
2 changes: 1 addition & 1 deletion seda-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
stable" && \
apt-get update && apt-get install -y docker-ce docker-ce-cli containerd.io

RUN wget https://www.sing-group.org/seda/downloads/releases/seda-linux-64b-1.7.1.tar.gz -O /tmp/SEDA.tar.gz && \
RUN wget https://www.sing-group.org/seda/downloads/releases/seda-linux-64b-1.7.2.tar.gz -O /tmp/SEDA.tar.gz && \
mkdir /opt/SEDA && tar zxvf /tmp/SEDA.tar.gz -C /opt/SEDA && rm /tmp/SEDA.tar.gz

RUN sed -i -e "s#DIR=#if [ -d \"/data\" ]; then D_ARGS='-Dseda.output.directory=/data -Dseda.input.directory=/data'; else D_ARGS='-Dseda.output.directory=/ -Dseda.input.directory=/'; fi\n\nDIR=#g" /opt/SEDA/run-gui.sh
Expand Down
2 changes: 1 addition & 1 deletion seda-docker/Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
stable" && \
apt-get update && apt-get install -y docker-ce docker-ce-cli containerd.io

COPY seda-linux-64b-1.7.1.tar.gz /tmp/SEDA.tar.gz
COPY seda-linux-64b-1.7.2.tar.gz /tmp/SEDA.tar.gz

RUN mkdir /opt/SEDA && tar zxvf /tmp/SEDA.tar.gz -C /opt/SEDA && rm /tmp/SEDA.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion seda-docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.3"
services:
seda:
image: pegi3s/seda:1.7.1
image: pegi3s/seda:1.7.2
build:
context: ./
dockerfile: Dockerfile.local
4 changes: 2 additions & 2 deletions seda-docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# General information about the project.
project = u'SEDA'
copyright = u'2017-2024, Jorge Vieira, Cristina Vieira, Noé Vázquez, Miguel Reboiro-Jato and Hugo López-Fernández'
copyright = u'2017-2025, Jorge Vieira, Cristina Vieira, Noé Vázquez, Miguel Reboiro-Jato and Hugo López-Fernández'
author = u'Jorge Vieira, Cristina Vieira, Noé Vázquez, Miguel Reboiro-Jato and Hugo López-Fernández'

# The version info for the project you're documenting, acts as replacement for
Expand All @@ -56,7 +56,7 @@
# The short X.Y version.
version = u'1.7'
# The full version, including alpha/beta/rc tags.
release = u'1.7.1'
release = u'1.7.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-bedtools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-blast/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-cga/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-clustalomega/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-emboss/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-pfam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-prosplign-procompart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-sapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda-plugin-splign-compart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion seda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sing_group</groupId>
<artifactId>seda-all</artifactId>
<version>1.7.1</version>
<version>1.7.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ public List<File> process(File outputDirectory) throws IOException {
for (File file : files) {
// Move and rename each file to output directory
File renamedFile = new File(outputDirectory, subDir.getName() + ".fasta");
Files.move(file.toPath(), renamedFile.toPath());
if (!renamedFile.exists()) {
Files.move(file.toPath(), renamedFile.toPath());
} else {
System.out.println("File " + renamedFile.getAbsolutePath() + " already exists. Skipping.");
}
extractedFiles.add(renamedFile);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,23 +384,25 @@ private void loadNcbiDataset() {

new CustomSwingWorker(() -> {
showFileChooserAndProcess(
JFileChooser.FILES_ONLY, JFileChooser.OPEN_DIALOG, true, zipFile -> {
System.out.println(zipFile);
JFileChooser.FILES_ONLY, JFileChooser.OPEN_DIALOG, false, zipFile -> {
System.out.println("Processing NCBI ZIP file" + zipFile);
try {
SwingUtilities.invokeLater(() -> {
dialog.setVisible(true);
});
new NcbiDatasetProcessor(zipFile.toFile())
.process(IOUtils.createSedaUserHomeDirectory("SEDA_NCBI_datasets"))
.forEach(f -> model.addAvailablePath(f.toPath()));
} catch (IOException e) {
e.printStackTrace();
} finally {
dialog.dispose();
}
dialog.dispose();
},
() -> {
dialog.dispose();
});
}).execute();

dialog.setVisible(true);
}

private void updateAvailableAndSelectedLabels() {
Expand Down

0 comments on commit 72bf827

Please sign in to comment.