This should fix the #2080 (#2159)

* Use network interface names instead of their hardware description

* formatting

* formatting

* make this PR backwards-compatible

* Update description

* make it more general

* Update comment

* do not check the backwards compatibility for empty string

* Fix the interface name recognition

* removed unused imports

* removed not used method

* Use better argument name

src/main/external-resources/UMS.conf

@@ -137,10 +137,11 @@ single_instance =
 
 # Force networking on interface
 # -----------------------------
-# Specifies the (physical) network interface to attach to, should only be
+# Specifies the network interface to attach to, should only be
 # relevant when the server has more than one network interface and UMS picks
 # the wrong one. The selector displays all available network interfaces.
-# E.g. network_interface = eth0
+# E.g. network_interface = Intel(R) Dual Band Wireless-AC 3160
+# NOTE: Do not change it directly here but use the selector in the UMS GUI.
 # Default: "", which means UMS will automatically select a network interface.
 network_interface =
 

src/main/java/net/pms/network/NetworkConfiguration.java

@@ -22,6 +22,7 @@
 import java.util.*;
 import net.pms.PMS;
 import net.pms.configuration.PmsConfiguration;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,11 +85,12 @@ public String getShortName() {
 		}
 
 		/**
-		 * Returns the display name of the interface association.
+		 * Returns the display name of the interface association 
+		 * with IP address if exists.
 		 *
 		 * @return The name.
 		 */
-		public String getDisplayName() {
+		public String getDisplayNameWithAddress() {
 			String displayName = iface.getDisplayName();
 
 			if (displayName != null) {
@@ -103,7 +105,24 @@ public String getDisplayName() {
 
 			return displayName;
 		}
-
+
+		/**
+		 * Returns the display name of the interface association.
+		 *
+		 * @return The name.
+		 */
+		public String getDisplayName() {
+			String displayName = iface.getDisplayName();
+
+			if (displayName != null) {
+				displayName = displayName.trim();
+			} else {
+				displayName = iface.getName();
+			}
+
+			return displayName;
+		}
+
 		@Override
 		public String toString() {
 			return "InterfaceAssociation(addr=" + addr + ", iface=" + iface + ", parent=" + parentName + ')';
@@ -287,7 +306,7 @@ private void checkNetworkInterface(NetworkInterface networkInterface, String par
 						LOGGER.trace("found {} -> {}", networkInterface.getName(), address.getHostAddress());
 						final InterfaceAssociation ia = new InterfaceAssociation(address, networkInterface, parentName);
 						interfaces.add(ia);
-						mainAddress.put(networkInterface.getName(), ia);
+						mainAddress.put(networkInterface.getDisplayName(), ia);
 						foundAddress = true;
 					}
 				} else {
@@ -303,16 +322,18 @@ private void checkNetworkInterface(NetworkInterface networkInterface, String par
 		}
 	}
 
+
 	/**
-	 * Returns the list of discovered interface names.
+	 * Returns the list of user friendly names of interfaces with their IP
+	 * address.
 	 *
-	 * @return The interface names.
+	 * @return The list of names.
 	 */
-	public List<String> getKeys() {
+	public List<String> getDisplayNamesWithAddress() {
 		List<String> result = new ArrayList<>(interfaces.size());
 
 		for (InterfaceAssociation i : interfaces) {
-			result.add(i.getShortName());
+			result.add(i.getDisplayNameWithAddress());
 		}
 
 		return result;
@@ -328,7 +349,7 @@ public List<String> getDisplayNames() {
 		List<String> result = new ArrayList<>(interfaces.size());
 
 		for (InterfaceAssociation i : interfaces) {
-				result.add(i.getDisplayName());
+			result.add(i.getDisplayName());
 		}
 
 		return result;
@@ -386,6 +407,8 @@ private InterfaceAssociation getFirstInterfaceWithAddress() {
 	 * @return The IP address.
 	 */
 	public InterfaceAssociation getAddressForNetworkInterfaceName(String name) {
+		// for backwards-compatibility check if the short network interface name is used
+		name = replaceShortInterfaceNameByDisplayName(name);
 		return mainAddress.get(name);
 	}
 
@@ -463,4 +486,21 @@ public static synchronized NetworkConfiguration getInstance() {
 	public static synchronized void forgetConfiguration() {
 		config = null;
 	}
+
+	/**
+	 * for backwards-compatibility check if the short network interface name is used
+	 * 
+	 * @return the standard display name 
+	 */
+	public String replaceShortInterfaceNameByDisplayName(String interfaceName) {
+		if (StringUtils.isNotBlank(interfaceName)) {
+			for (InterfaceAssociation netInterface : interfaces) {
+				if (netInterface.getShortName().equals(interfaceName)) {
+					interfaceName = netInterface.getDisplayName();
+					break;
+				}
+			}
+		}
+		return interfaceName;
+	}
 }

src/main/java/net/pms/newgui/GeneralTab.java

@@ -375,12 +375,15 @@ public void keyReleased(KeyEvent e) {
 
 			final KeyedComboBoxModel<String, String> networkInterfaces = createNetworkInterfacesModel();
 			networkinterfacesCBX = new JComboBox<>(networkInterfaces);
-			networkInterfaces.setSelectedKey(configuration.getNetworkInterface());
+			String savedNetworkInterface = configuration.getNetworkInterface();
+			// for backwards-compatibility check if the short network interface name is used
+			savedNetworkInterface = NetworkConfiguration.getInstance().replaceShortInterfaceNameByDisplayName(savedNetworkInterface);
+			networkInterfaces.setSelectedKey(savedNetworkInterface);
 			networkinterfacesCBX.addItemListener(new ItemListener() {
 				@Override
 				public void itemStateChanged(ItemEvent e) {
 					if (e.getStateChange() == ItemEvent.SELECTED) {
-						configuration.setNetworkInterface((String) networkInterfaces.getSelectedKey());
+						configuration.setNetworkInterface(networkInterfaces.getSelectedKey());
 					}
 				}
 			});
@@ -612,8 +615,8 @@ public void actionPerformed(ActionEvent e) {
 	}
 
 	private KeyedComboBoxModel<String, String> createNetworkInterfacesModel() {
-		List<String> keys = NetworkConfiguration.getInstance().getKeys();
-		List<String> names = NetworkConfiguration.getInstance().getDisplayNames();
+		List<String> keys = NetworkConfiguration.getInstance().getDisplayNames();
+		List<String> names = NetworkConfiguration.getInstance().getDisplayNamesWithAddress();
 		keys.add(0, "");
 		names.add(0, "");
 		return new KeyedComboBoxModel<>(