Skip to content
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

Jump to bottom

first shot at implementing https://github.com/yarl/vicuna/issues/98 #102

Closed
wants to merge 3 commits into from
Closed

first shot at implementing https://github.com/yarl/vicuna/issues/98 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
408c30e
first shot at implementing https://github.com/yarl/vicuna/issues/98
FlominatorTM Apr 1, 2017
01ed012
tabs => blanks as requested in https://github.com/yarl/vicuna/pull/10…
FlominatorTM Apr 6, 2017
6d05965
fixing what appears to be incomplete renaming of a variable (first sh…
FlominatorTM Apr 25, 2017
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
17 changes: 17 additions & 0 deletions src/cuploader/PFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.drew.imaging.ImageProcessingException;
import com.drew.metadata.Directory;
import com.drew.metadata.exif.ExifIFD0Directory;
import com.drew.metadata.iptc.IptcDirectory;
import com.drew.metadata.exif.ExifSubIFDDirectory;
import com.drew.metadata.exif.GpsDirectory;
import cuploader.Data.Elem;
Expand Down Expand Up @@ -90,6 +91,7 @@ public PFile(File file, int number) {
String name = file.getName();
tName.setText(name.substring(0, name.lastIndexOf('.')));
readEXIF();
readIPTC();
selectToUpload(true);
//generateThumbnail();

Expand Down Expand Up @@ -987,6 +989,21 @@ private void showCategoryHints(boolean b) {
}
}

/**
* Reads caption from file ITPC
*/
private void readIPTC(){
try {
Directory directory = ImageMetadataReader.readMetadata(file).getDirectory(IptcDirectory.class);
if(directory != null && directory.containsTag(IptcDirectory.TAG_CAPTION)) {
tDesc.setText(directory.getDescription(IptcDirectory.TAG_CAPTION));
}
}
catch (ImageProcessingException ex) {
}
catch (IOException ex) {
}
}
/**
* Reads info from file EXIF (date, gps, rotation)
*/
Expand Down
18 changes: 9 additions & 9 deletions src/cuploader/frames/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ private void loadFiles(ActionEvent evt) {

if (ch.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
File[] selected = ch.getSelectedFiles();
ArrayList<File> files = new ArrayList<File>();
files = new ArrayList<File>();

for (File f : selected) {
if (Data.settings.loadSubdirectory) {
Expand Down Expand Up @@ -1808,16 +1808,16 @@ public void dragExit(DropTargetEvent dte) {
pFilesScroll.setVisible(true);
}

public ArrayList<File> array;
public ArrayList<File> files;

public void addToArray(File f) {
if (f.isFile()) {
array.add(f);
files.add(f);
}

if (f.isDirectory()) {
File[] files = f.listFiles();
for (File fi : files) {
File[] filesDir = f.listFiles();
for (File fi : filesDir) {
addToArray(fi);
}
}
Expand All @@ -1835,7 +1835,7 @@ public void drop(DropTargetDropEvent dtde) {
//System.out.println("Possible flavor: " + flavors[i].getMimeType());
if (flavors[i].isFlavorJavaFileListType()) {
dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
array = new ArrayList<File>();
files = new ArrayList<File>();
@SuppressWarnings("unchecked")
List<File> list = (List<File>) tr.getTransferData(flavors[i]);

Expand All @@ -1844,14 +1844,14 @@ public void drop(DropTargetDropEvent dtde) {
addToArray(f);
} else {
if (f.isDirectory()) {
array.addAll(Arrays.asList(f.listFiles()));
files.addAll(Arrays.asList(f.listFiles()));
}
if (f.isFile()) {
array.add(f);
files.add(f);
}
}
}
addImages(array);
addImages(files);
dtde.dropComplete(true);
return;
} else if (flavors[i].isRepresentationClassInputStream()) {
Expand Down