Update #202

hdsdi3g · Nov 9, 2016 · 580954a · 580954a
1 parent 80ba9bf
commit 580954a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/app/hd3gtv/mydmam/storage/IgnoreFiles.java b/app/hd3gtv/mydmam/storage/IgnoreFiles.java
@@ -22,6 +22,9 @@ public abstract class IgnoreFiles {
 
 	public abstract boolean isDirNameIsAllowed(String dirname);
 
+	/**
+	 * All but *.lnk files
+	 */
 	public static IgnoreFiles default_list = new IgnoreFiles() {
 
 		public boolean isFileNameIsAllowed(String filename) {
@@ -36,6 +39,9 @@ public boolean isDirNameIsAllowed(String dirname) {
 		}
 	};
 
+	/**
+	 * All but .lnk desktop.ini .DS_Store .localized .Icon Thumbs.db
+	 */
 	public static IgnoreFiles directory_config_list = new IgnoreFiles() {
 
 		public boolean isFileNameIsAllowed(String filename) {

diff --git a/app/hd3gtv/mydmam/storage/StorageSMB.java b/app/hd3gtv/mydmam/storage/StorageSMB.java
@@ -34,16 +34,18 @@ public class StorageSMB extends StorageURILoginPassword {
 
 	StorageSMB(URILoginPasswordConfiguration configuration) {
 		super(configuration);
-		auth = new NtlmPasswordAuthentication("", configuration.login, configuration.password);
+		if (configuration.domain == null) {
+			auth = new NtlmPasswordAuthentication("", configuration.login, configuration.password);
+		} else {
+			auth = new NtlmPasswordAuthentication(configuration.domain, configuration.login, configuration.password);
+		}
 
 		StringBuffer sb = new StringBuffer();
 		sb.append("smb://");
 		sb.append(configuration.host);
 		sb.append(configuration.relative_path);
 		sb.append("/");
 		root_path = sb.toString();
-		/*
-		configuration.relative_path = file.getPath();*/
 	}
 
 	class AbstractFileSmb implements AbstractFile {

diff --git a/app/hd3gtv/mydmam/storage/URILoginPasswordConfiguration.java b/app/hd3gtv/mydmam/storage/URILoginPasswordConfiguration.java
@@ -27,6 +27,7 @@ final class URILoginPasswordConfiguration {
 	String host;
 	int port;
 	String relative_path;
+	String domain;
 
 	URILoginPasswordConfiguration(String configuration_path, LinkedHashMap<String, ?> optional_storage_def) {
 		int pos_colon = configuration_path.indexOf(":");
@@ -72,6 +73,9 @@ final class URILoginPasswordConfiguration {
 		if (optional_storage_def.containsKey("password")) {
 			password = (String) optional_storage_def.get("password");
 		}
+		if (optional_storage_def.containsKey("domain")) {
+			domain = (String) optional_storage_def.get("domain");
+		}
 	}
 
 	public String toString() {
@@ -83,6 +87,10 @@ private String toURI(boolean show_passwords) {
 		sb.append(type);
 		sb.append("://");
 		if (login != null) {
+			if (domain != null) {
+				sb.append(domain);
+				sb.append("\\");
+			}
 			sb.append(login);
 			if (password != null) {
 				sb.append(":");

diff --git a/conf/app.d-examples/storage.yml.example b/conf/app.d-examples/storage.yml.example
@@ -7,6 +7,7 @@ storage:
             # or path: ftp_passive://user:password@host/dest/path/to/go
             # with file, ftp_passive, ftp_active, smb, ftp_broadcastserver
             # password: A:Spec:alP:ssword
+            # domain: my-ad-domain.network # Set AD Windows domain, only for SMB access.
             regular_indexing: true # set to false for just declare a storage.
             period: 600 # in seconds: if regular_indexing, it will index this storage regulary, else period will help to calculate the ttl for pushing in database.
             # mounted: /Volumes/host/dest/path/to/go # if you want the local tools, like ffmpeg or ImageMagick can access to a distant file, you can mount it in local.