* update bindings sample dialog

source/net/sourceforge/filebot/ui/rename/BindingDialog.java

@@ -1,7 +1,5 @@
-
 package net.sourceforge.filebot.ui.rename;
 
-
 import static net.sourceforge.filebot.MediaTypes.*;
 import static net.sourceforge.filebot.Settings.*;
 import static net.sourceforge.filebot.ui.NotificationLogging.*;
@@ -66,7 +64,6 @@ import net.sourceforge.filebot.mediainfo.MediaInfoException;
 import net.sourceforge.tuned.DefaultThreadFactory;
 import net.sourceforge.tuned.ui.LazyDocumentListener;
 
-
 class BindingDialog extends JDialog {
 
 	private final JTextField infoTextField = new JTextField();
@@ -77,8 +74,7 @@ class BindingDialog extends JDialog {
 
 	private boolean submit = false;
 
-	
+	public BindingDialog(Window owner, String title, Format infoObjectFormat, boolean editable) {
-	public BindingDialog(Window owner, String title, Format infoObjectFormat) {
 		super(owner, title, ModalityType.DOCUMENT_MODAL);
 		this.infoObjectFormat = infoObjectFormat;
 
@@ -138,13 +134,11 @@ class BindingDialog extends JDialog {
 				mediaInfoAction.setEnabled(getMediaFile() != null && getMediaFile().isFile());
 			}
 
-			
 			@Override
 			public void removeUpdate(DocumentEvent e) {
 				changedUpdate(e);
 			}
 
-			
 			@Override
 			public void insertUpdate(DocumentEvent e) {
 				changedUpdate(e);
@@ -160,12 +154,15 @@ class BindingDialog extends JDialog {
 			}
 		});
 
+		mediaFileTextField.setEditable(editable);
+		infoTextField.setEditable(editable);
+		selectFileAction.setEnabled(editable);
+
 		// initialize window properties
 		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
 		setSize(420, 520);
 	}
 
-	
 	private JTable createBindingTable(TableModel model) {
 		JTable table = new JTable(model);
 		table.setAutoCreateRowSorter(true);
@@ -212,18 +209,15 @@ class BindingDialog extends JDialog {
 		return table;
 	}
 
-	
 	private List<String> getSampleExpressions() {
 		ResourceBundle bundle = ResourceBundle.getBundle(getClass().getName());
 		return Arrays.asList(bundle.getString("expressions").split(","));
 	}
 
-	
 	public boolean submit() {
 		return submit;
 	}
 
-	
 	private void finish(boolean submit) {
 		this.submit = submit;
 
@@ -234,23 +228,19 @@ class BindingDialog extends JDialog {
 		dispose();
 	}
 
-	
 	public void setInfoObject(Object info) {
 		infoTextField.putClientProperty("model", info);
 		infoTextField.setText(info == null ? "" : infoObjectFormat.format(info));
 	}
 
-	
 	public void setMediaFile(File mediaFile) {
 		mediaFileTextField.setText(mediaFile == null ? "" : mediaFile.getAbsolutePath());
 	}
 
-	
 	public Object getInfoObject() {
 		return infoTextField.getClientProperty("model");
 	}
 
-	
 	public File getMediaFile() {
 		File file = new File(mediaFileTextField.getText());
 
@@ -306,7 +296,6 @@ class BindingDialog extends JDialog {
 			return null;
 		}
 
-		
 		@Override
 		public void actionPerformed(ActionEvent evt) {
 			Map<StreamKind, List<Map<String, String>>> mediaInfo = getMediaInfo(getMediaFile());
@@ -408,24 +397,20 @@ class BindingDialog extends JDialog {
 		}
 	};
 
-	
 	private static class Evaluator extends SwingWorker<String, Void> {
 
 		private final String expression;
 		private final Object bindingBean;
 
-		
 		private Evaluator(String expression, Object bindingBean) {
 			this.expression = expression;
 			this.bindingBean = bindingBean;
 		}
 
-		
 		public String getExpression() {
 			return expression;
 		}
 
-		
 		@Override
 		protected String doInBackground() throws Exception {
 			ExpressionFormat format = new ExpressionFormat(expression) {
@@ -448,7 +433,6 @@ class BindingDialog extends JDialog {
 			return value;
 		}
 
-		
 		@Override
 		public String toString() {
 			try {
@@ -459,14 +443,12 @@ class BindingDialog extends JDialog {
 		}
 	}
 
-	
 	private static class BindingTableModel extends AbstractTableModel {
 
 		private final List<Evaluator> model = new ArrayList<Evaluator>();
 
 		private final ExecutorService executor = Executors.newFixedThreadPool(2, new DefaultThreadFactory("Evaluator", Thread.MIN_PRIORITY));
 
-		
 		public void setModel(Collection<String> expressions, Object bindingBean) {
 			// cancel old workers and clear model
 			clear();
@@ -491,7 +473,6 @@ class BindingDialog extends JDialog {
 			fireTableDataChanged();
 		}
 
-		
 		public void clear() {
 			for (Evaluator evaluator : model) {
 				evaluator.cancel(true);
@@ -503,7 +484,6 @@ class BindingDialog extends JDialog {
 			fireTableDataChanged();
 		}
 
-		
 		public void fireTableCellUpdated(Evaluator element) {
 			int index = model.indexOf(element);
 
@@ -512,103 +492,92 @@ class BindingDialog extends JDialog {
 			}
 		}
 
-		
 		@Override
 		public String getColumnName(int column) {
 			switch (column) {
-				case 0:
+			case 0:
-					return "Expression";
+				return "Expression";
-				case 1:
+			case 1:
-					return "Value";
+				return "Value";
-				default:
+			default:
-					return null;
+				return null;
 			}
 		}
 
-		
 		@Override
 		public int getColumnCount() {
 			return 2;
 		}
 
-		
 		@Override
 		public int getRowCount() {
 			return model.size();
 		}
 
-		
 		@Override
 		public Class<?> getColumnClass(int column) {
 			switch (column) {
-				case 0:
+			case 0:
-					return String.class;
+				return String.class;
-				case 1:
+			case 1:
-					return Future.class;
+				return Future.class;
-				default:
+			default:
-					return null;
+				return null;
 			}
 		}
 
-		
 		@Override
 		public Object getValueAt(int row, int column) {
 			switch (column) {
-				case 0:
+			case 0:
-					return model.get(row).getExpression();
+				return model.get(row).getExpression();
-				case 1:
+			case 1:
-					return model.get(row);
+				return model.get(row);
-				default:
+			default:
-					return null;
+				return null;
 			}
 		}
 	}
 
-	
 	private static class ParameterTableModel extends AbstractTableModel {
 
 		private final List<Entry<?, ?>> data;
 
-		
 		public ParameterTableModel(Map<?, ?> data) {
 			this.data = new ArrayList<Entry<?, ?>>(data.entrySet());
 		}
 
-		
 		@Override
 		public int getRowCount() {
 			return data.size();
 		}
 
-		
 		@Override
 		public int getColumnCount() {
 			return 2;
 		}
 
-		
 		@Override
 		public String getColumnName(int column) {
 			switch (column) {
-				case 0:
+			case 0:
-					return "Parameter";
+				return "Parameter";
-				case 1:
+			case 1:
-					return "Value";
+				return "Value";
-				default:
+			default:
-					return null;
+				return null;
 			}
 		}
 
-		
 		@Override
 		public Object getValueAt(int row, int column) {
 			switch (column) {
-				case 0:
+			case 0:
-					return data.get(row).getKey();
+				return data.get(row).getKey();
-				case 1:
+			case 1:
-					return data.get(row).getValue();
+				return data.get(row).getValue();
-				default:
+			default:
-					return null;
+				return null;
 			}
 		}
 	}

source/net/sourceforge/filebot/ui/rename/BindingDialog.properties

@@ -2,4 +2,4 @@
 parameter.exclude: ^StreamKind|Count$
 
 # preview expressions (keys are tagged so they can be sorted alphabetically)
-expressions: n,y,s,e,t,d,startdate,absolute,special,imdbid,episode,sxe,s00e00,movie,vc,ac,cf,vf,af,resolution,hpi,ws,sdhd,source,group,crc32,fn,ext,file,pi,pn,lang,actors,director,collection,genres,certification,rating,dim,info.runtime,info.status,imdb.rating,imdb.votes,media.title,media.durationString,media.overallBitRateString,video.codecID,video.frameRate,video.displayAspectRatioString,video.height,video.scanType,audio.format,audio.bitRateString,audio.language,text.codecInfo,text.language
+expressions: n,y,s,e,es,sxe,s00e00,t,d,startdate,absolute,special,episode,series,primaryTitle,alias,movie,tmdbid,imdbid,music,artist,albumArtist,album,pi,pn,lang,actors,director,collection,genres,certification,rating,vc,ac,cf,vf,hpi,af,resolution,dim,ws,sdhd,source,group,original,fn,ext,file,file.name,folder,folder.name,crc32,info,info.runtime,info.status,imdb,imdb.rating,imdb.votes,duration,seconds,minutes,media,media.title,media.overallBitRateString,video,video.codecID,video.frameRate,video.displayAspectRatioString,video.scanType,audio,audio.bitRateString,audio.language,audios,audios.language,text,text.codecInfo,text.language,texts,texts.language

source/net/sourceforge/filebot/ui/rename/FormatDialog.java

@@ -88,11 +88,12 @@ import com.cedarsoftware.util.io.JsonWriter;
 public class FormatDialog extends JDialog {
 
 	private boolean submit = false;
-
-	private Mode mode;
 	private ExpressionFormat format;
 
-	private MediaBindingBean sample;
+	private Mode mode;
+	private boolean locked = false;
+	private MediaBindingBean sample = null;
+
 	private ExecutorService executor = createExecutor();
 	private RunnableFuture<String> currentPreviewFuture;
 
@@ -233,6 +234,7 @@ public class FormatDialog extends JDialog {
 
 	public void setState(Mode mode, MediaBindingBean bindings, boolean locked) {
 		this.mode = mode;
+		this.locked = locked;
 
 		if (locked) {
 			this.setTitle(String.format("%s Format", mode));
@@ -245,7 +247,6 @@ public class FormatDialog extends JDialog {
 
 		switchEditModeAction.putValue(Action.NAME, String.format("Switch to %s Format", mode.next()));
 		switchEditModeAction.setEnabled(!locked);
-		changeSampleAction.setEnabled(!locked);
 
 		updateHelpPanel(mode);
 
@@ -606,7 +607,7 @@ public class FormatDialog extends JDialog {
 
 		@Override
 		public void actionPerformed(ActionEvent evt) {
-			BindingDialog dialog = new BindingDialog(getWindow(evt.getSource()), String.format("%s Bindings", mode), mode.getFormat());
+			BindingDialog dialog = new BindingDialog(getWindow(evt.getSource()), String.format("%s Bindings", mode), mode.getFormat(), !locked);
 
 			dialog.setInfoObject(sample.getInfoObject());
 			dialog.setMediaFile(sample.getMediaFile());