mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 01:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

move list of supported extentions to specific panels because 32-bit did not really support swf.

Browse Source
This commit is contained in:
Brian Carrier 2013-09-11 15:34:04 -04:00
parent 282523a46f
commit 9c48c2ddd5
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
View File

@ -25,9 +25,7 @@ import java.util.Arrays;
import java.util.logging.Level; import java.util.logging.Level;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import javax.swing.SwingUtilities;
import org.openide.nodes.Node; import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.lookup.ServiceProvider; import org.openide.util.lookup.ServiceProvider;
import org.openide.util.lookup.ServiceProviders; import org.openide.util.lookup.ServiceProviders;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer; import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
@ -41,16 +39,15 @@ import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM;
@ServiceProvider(service = DataContentViewer.class, position = 5) @ServiceProvider(service = DataContentViewer.class, position = 5)
}) })
public class DataContentViewerMedia extends javax.swing.JPanel implements DataContentViewer { public class DataContentViewerMedia extends javax.swing.JPanel implements DataContentViewer {
private static final String[] AUDIO_EXTENSIONS = new String[]{".mp3", ".wav", ".wma"};
private String[] IMAGES; // use javafx supported
private static final String[] VIDEOS = new String[]{".swf", ".mov", ".m4v", ".flv", ".mp4", ".3gp", ".avi", ".mpg", ".mpeg", ".wmv"};
private static final String[] AUDIOS = new String[]{".mp3", ".wav", ".wma"};
private static final Logger logger = Logger.getLogger(DataContentViewerMedia.class.getName()); private static final Logger logger = Logger.getLogger(DataContentViewerMedia.class.getName());
private AbstractFile lastFile; private AbstractFile lastFile;
//UI //UI
private final MediaViewVideoPanel videoPanel; private final MediaViewVideoPanel videoPanel;
private final String[] videoExtensions; // get them from the panel
private String[] imageExtensions; // use javafx supported
private final MediaViewImagePanel imagePanel; private final MediaViewImagePanel imagePanel;
private boolean videoPanelInited; private boolean videoPanelInited;
private boolean imagePanelInited; private boolean imagePanelInited;
@ -72,6 +69,8 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
videoPanelInited = videoPanel.isInited(); videoPanelInited = videoPanel.isInited();
imagePanelInited = imagePanel.isInited(); imagePanelInited = imagePanel.isInited();
videoExtensions = videoPanel.getExtensions();
customizeComponents(); customizeComponents();
logger.log(Level.INFO, "Created MediaView instance: " + this); logger.log(Level.INFO, "Created MediaView instance: " + this);
} }
@ -80,12 +79,12 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
//initialize supported image types //initialize supported image types
//TODO use mime-types instead once we have support //TODO use mime-types instead once we have support
String[] fxSupportedImagesSuffixes = ImageIO.getReaderFileSuffixes(); String[] fxSupportedImagesSuffixes = ImageIO.getReaderFileSuffixes();
IMAGES = new String[fxSupportedImagesSuffixes.length]; imageExtensions = new String[fxSupportedImagesSuffixes.length];
//logger.log(Level.INFO, "Supported image formats by javafx image viewer: "); //logger.log(Level.INFO, "Supported image formats by javafx image viewer: ");
for (int i = 0; i < fxSupportedImagesSuffixes.length; ++i) { for (int i = 0; i < fxSupportedImagesSuffixes.length; ++i) {
String suffix = fxSupportedImagesSuffixes[i]; String suffix = fxSupportedImagesSuffixes[i];
//logger.log(Level.INFO, "suffix: " + suffix); //logger.log(Level.INFO, "suffix: " + suffix);
IMAGES[i] = "." + suffix; imageExtensions[i] = "." + suffix;
} }
add(imagePanel, IMAGE_VIEWER_LAYER); add(imagePanel, IMAGE_VIEWER_LAYER);
@ -132,11 +131,11 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
final Dimension dims = DataContentViewerMedia.this.getSize(); final Dimension dims = DataContentViewerMedia.this.getSize();
if (imagePanelInited && containsExt(file.getName(), IMAGES)) { if (imagePanelInited && containsExt(file.getName(), imageExtensions)) {
imagePanel.showImageFx(file, dims); imagePanel.showImageFx(file, dims);
this.switchPanels(false); this.switchPanels(false);
} else if (videoPanelInited } else if (videoPanelInited
&& (containsExt(file.getName(), VIDEOS) || containsExt(file.getName(), AUDIOS))) { && (containsExt(file.getName(), videoExtensions) || containsExt(file.getName(), AUDIO_EXTENSIONS))) {
videoPanel.setupVideo(file, dims); videoPanel.setupVideo(file, dims);
switchPanels(true); switchPanels(true);
} }
@ -203,13 +202,13 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
} }
String name = file.getName().toLowerCase(); String name = file.getName().toLowerCase();
if (imagePanelInited && containsExt(name, IMAGES)) { if (imagePanelInited && containsExt(name, imageExtensions)) {
return true; return true;
} //for gstreamer formats, check if initialized first, then } //for gstreamer formats, check if initialized first, then
//support audio formats, and video formats //support audio formats, and video formats
else if (videoPanelInited && videoPanel.isInited() else if (videoPanelInited && videoPanel.isInited()
&& (containsExt(name, AUDIOS) && (containsExt(name, AUDIO_EXTENSIONS)
|| (containsExt(name, VIDEOS)))) { || (containsExt(name, videoExtensions)))) {
return true; return true;
} }
@ -227,7 +226,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
String name = file.getName().toLowerCase(); String name = file.getName().toLowerCase();
boolean deleted = file.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.UNALLOC); boolean deleted = file.isDirNameFlagSet(TSK_FS_NAME_FLAG_ENUM.UNALLOC);
if (containsExt(name, VIDEOS) && deleted) { if (containsExt(name, videoExtensions) && deleted) {
return 0; return 0;
} else { } else {
return 7; return 7;

6
Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
View File

@ -76,6 +76,7 @@ import org.sleuthkit.datamodel.TskData;
}) })
public class FXVideoPanel extends MediaViewVideoPanel { public class FXVideoPanel extends MediaViewVideoPanel {
private static final String[] EXTENSIONS = new String[]{".swf", ".mov", ".m4v", ".flv", ".mp4", ".3gp", ".avi", ".mpg", ".mpeg", ".wmv"};
private static final Logger logger = Logger.getLogger(MediaViewVideoPanel.class.getName()); private static final Logger logger = Logger.getLogger(MediaViewVideoPanel.class.getName());
private boolean fxInited = false; private boolean fxInited = false;
// FX Components // FX Components
@ -639,4 +640,9 @@ public class FXVideoPanel extends MediaViewVideoPanel {
// return frames; // return frames;
// } // }
// } // }
@Override
public String[] getExtensions() {
return EXTENSIONS;
}
} }

7
Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
View File

@ -67,6 +67,8 @@ import org.sleuthkit.datamodel.TskData;
}) })
public class GstVideoPanel extends MediaViewVideoPanel { public class GstVideoPanel extends MediaViewVideoPanel {
private static final String[] EXTENSIONS = new String[]{".mov", ".m4v", ".flv", ".mp4", ".3gp", ".avi", ".mpg", ".mpeg", ".wmv"};
private static final Logger logger = Logger.getLogger(GstVideoPanel.class.getName()); private static final Logger logger = Logger.getLogger(GstVideoPanel.class.getName());
private boolean gstInited; private boolean gstInited;
private static final long MIN_FRAME_INTERVAL_MILLIS = 500; private static final long MIN_FRAME_INTERVAL_MILLIS = 500;
@ -767,4 +769,9 @@ public class GstVideoPanel extends MediaViewVideoPanel {
}); });
} }
} }
@Override
public String[] getExtensions() {
return EXTENSIONS;
}
} }

5
Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java
View File

@ -115,4 +115,9 @@ public abstract class MediaViewVideoPanel extends JPanel implements FrameCapture
* @param dims dimension of the parent window * @param dims dimension of the parent window
*/ */
abstract void setupVideo(final AbstractFile file, final Dimension dims); abstract void setupVideo(final AbstractFile file, final Dimension dims);
/**
* Return the extensions supported by this video panel.
*/
abstract public String[] getExtensions();
} }