Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f0bcfdfd30 | |||
| 650d0def51 | |||
| f57518a1d5 | |||
| 1be0a94b51 | |||
| 3c38a1a6cc | |||
| ba0b79de64 | |||
| 60bd3163a9 | |||
| a3a3ac1dcc | |||
| 9d58a1a113 |
+1
-1
@@ -2,7 +2,7 @@
|
||||
; Erfordert Inno Setup 6.x (https://jrsoftware.org/isinfo.php)
|
||||
|
||||
#define MyAppName "Starface Outlook Sync"
|
||||
#define MyAppVersion "0.0.0.7"
|
||||
#define MyAppVersion "0.0.0.12"
|
||||
#define MyAppPublisher "HackerSoft - Hacker-Net Telekommunikation"
|
||||
#define MyAppURL "https://www.hacker-net.de"
|
||||
#define MyAppExeName "StarfaceOutlookSync.exe"
|
||||
|
||||
@@ -153,6 +153,32 @@ namespace StarfaceOutlookSync.Services
|
||||
}
|
||||
}
|
||||
|
||||
private dynamic FindFolderByPath(dynamic folder, string targetPath)
|
||||
{
|
||||
try
|
||||
{
|
||||
string currentPath = folder.FolderPath;
|
||||
if (currentPath == targetPath)
|
||||
return folder;
|
||||
|
||||
var subs = folder.Folders;
|
||||
for (int i = 1; i <= (int)subs.Count; i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
var sub = subs[i];
|
||||
var match = FindFolderByPath(sub, targetPath);
|
||||
if (match != null) return match;
|
||||
Marshal.ReleaseComObject(sub);
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
Marshal.ReleaseComObject(subs);
|
||||
}
|
||||
catch { }
|
||||
return null;
|
||||
}
|
||||
|
||||
private dynamic GetFolderByPath(string folderPath)
|
||||
{
|
||||
var app = GetOutlookApp();
|
||||
@@ -163,51 +189,69 @@ namespace StarfaceOutlookSync.Services
|
||||
|
||||
try
|
||||
{
|
||||
var parts = folderPath.Split(new[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
dynamic current = null;
|
||||
|
||||
// Versuch 1: Alle Kontaktordner durchsuchen und per FolderPath matchen
|
||||
var stores = ns.Stores;
|
||||
for (int i = 1; i <= (int)stores.Count; i++)
|
||||
{
|
||||
var store = stores[i];
|
||||
var root = store.GetRootFolder();
|
||||
string rootName = root.Name;
|
||||
|
||||
if (rootName == parts[0])
|
||||
try
|
||||
{
|
||||
current = root;
|
||||
break;
|
||||
var store = stores[i];
|
||||
var root = store.GetRootFolder();
|
||||
var match = FindFolderByPath(root, folderPath);
|
||||
if (match != null)
|
||||
{
|
||||
Marshal.ReleaseComObject(stores);
|
||||
return match;
|
||||
}
|
||||
Marshal.ReleaseComObject(root);
|
||||
Marshal.ReleaseComObject(store);
|
||||
}
|
||||
Marshal.ReleaseComObject(root);
|
||||
Marshal.ReleaseComObject(store);
|
||||
catch { }
|
||||
}
|
||||
Marshal.ReleaseComObject(stores);
|
||||
|
||||
if (current == null)
|
||||
return ns.GetDefaultFolder(OlFolderContacts);
|
||||
|
||||
for (int i = 1; i < parts.Length; i++)
|
||||
// Versuch 2: Namespace.Folders direkt navigieren
|
||||
var parts = folderPath.Split(new[] { '\\' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
if (parts.Length >= 1)
|
||||
{
|
||||
bool found = false;
|
||||
var subFolders = current.Folders;
|
||||
for (int j = 1; j <= (int)subFolders.Count; j++)
|
||||
var topFolders = ns.Folders;
|
||||
for (int i = 1; i <= (int)topFolders.Count; i++)
|
||||
{
|
||||
var sub = subFolders[j];
|
||||
if ((string)sub.Name == parts[i])
|
||||
var topFolder = topFolders[i];
|
||||
if ((string)topFolder.Name == parts[0])
|
||||
{
|
||||
current = sub;
|
||||
found = true;
|
||||
break;
|
||||
dynamic current = topFolder;
|
||||
for (int p = 1; p < parts.Length; p++)
|
||||
{
|
||||
bool found = false;
|
||||
var subs = current.Folders;
|
||||
for (int j = 1; j <= (int)subs.Count; j++)
|
||||
{
|
||||
var sub = subs[j];
|
||||
if ((string)sub.Name == parts[p])
|
||||
{
|
||||
current = sub;
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
Marshal.ReleaseComObject(sub);
|
||||
}
|
||||
Marshal.ReleaseComObject(subs);
|
||||
if (!found) { current = null; break; }
|
||||
}
|
||||
if (current != null)
|
||||
{
|
||||
Marshal.ReleaseComObject(topFolders);
|
||||
return current;
|
||||
}
|
||||
}
|
||||
Marshal.ReleaseComObject(sub);
|
||||
Marshal.ReleaseComObject(topFolder);
|
||||
}
|
||||
Marshal.ReleaseComObject(subFolders);
|
||||
|
||||
if (!found)
|
||||
return ns.GetDefaultFolder(OlFolderContacts);
|
||||
Marshal.ReleaseComObject(topFolders);
|
||||
}
|
||||
|
||||
return current;
|
||||
System.Diagnostics.Debug.WriteLine($"Folder not found by path: {folderPath}, using default");
|
||||
return ns.GetDefaultFolder(OlFolderContacts);
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -221,24 +265,51 @@ namespace StarfaceOutlookSync.Services
|
||||
try
|
||||
{
|
||||
var folder = GetFolderByPath(folderPath);
|
||||
var items = folder.Items;
|
||||
System.Diagnostics.Debug.WriteLine($"Reading contacts from: {(string)folder.FolderPath}");
|
||||
|
||||
for (int i = 1; i <= (int)items.Count; i++)
|
||||
var items = folder.Items;
|
||||
int count = (int)items.Count;
|
||||
System.Diagnostics.Debug.WriteLine($"Items count: {count}");
|
||||
|
||||
for (int i = 1; i <= count; i++)
|
||||
{
|
||||
dynamic item = null;
|
||||
try
|
||||
{
|
||||
item = items[i];
|
||||
// Nur ContactItems verarbeiten (Class = 40 = olContact)
|
||||
if ((int)item.Class == 40)
|
||||
int itemClass = -1;
|
||||
try { itemClass = (int)item.Class; } catch { }
|
||||
|
||||
// olContact = 40, aber manche Kontakte melden Class anders
|
||||
// Versuch einfach die Kontakt-Felder zu lesen
|
||||
if (itemClass == 40)
|
||||
{
|
||||
contacts.Add(MapFromOutlook(item));
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fallback: Pruefen ob es trotzdem ein Kontakt ist
|
||||
try
|
||||
{
|
||||
string eid = item.EntryID;
|
||||
string fn = item.FirstName;
|
||||
string ln = item.LastName;
|
||||
// Hat Kontakt-Felder -> ist ein Kontakt
|
||||
contacts.Add(MapFromOutlook(item));
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Kein Kontakt, ueberspringen
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine($"Error reading item {i}: {ex.Message}");
|
||||
}
|
||||
catch { }
|
||||
finally
|
||||
{
|
||||
if (item != null) Marshal.ReleaseComObject(item);
|
||||
if (item != null) try { Marshal.ReleaseComObject(item); } catch { }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -155,11 +155,14 @@ namespace StarfaceOutlookSync.Services
|
||||
return books;
|
||||
}
|
||||
|
||||
public event Action<string> OnDebug;
|
||||
|
||||
public async Task<List<UnifiedContact>> GetContactsAsync(StarfaceAddressBook book)
|
||||
{
|
||||
var contacts = new List<UnifiedContact>();
|
||||
int page = 0;
|
||||
const int pageSize = 200;
|
||||
bool firstPage = true;
|
||||
|
||||
while (true)
|
||||
{
|
||||
@@ -172,11 +175,68 @@ namespace StarfaceOutlookSync.Services
|
||||
var resp = await _http.GetAsync($"{_baseUrl}/contacts?{query}");
|
||||
if (!resp.IsSuccessStatusCode) break;
|
||||
|
||||
var array = JArray.Parse(await resp.Content.ReadAsStringAsync());
|
||||
var body = await resp.Content.ReadAsStringAsync();
|
||||
JArray array;
|
||||
|
||||
// Die API gibt je nach Version ein Array oder ein Objekt mit "items" zurueck
|
||||
var token = JToken.Parse(body);
|
||||
if (token is JArray directArray)
|
||||
{
|
||||
array = directArray;
|
||||
}
|
||||
else if (token is JObject obj)
|
||||
{
|
||||
// Versuche gaengige Felder: items, contacts, data, results
|
||||
array = (obj["items"] ?? obj["contacts"] ?? obj["data"] ?? obj["results"]) as JArray;
|
||||
if (array == null)
|
||||
{
|
||||
// Einzelnes Kontakt-Objekt? Dann in Array wrappen
|
||||
if (obj["id"] != null && obj["blocks"] != null)
|
||||
{
|
||||
array = new JArray { obj };
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine($"Unerwartete Starface-Antwort: {body.Substring(0, Math.Min(200, body.Length))}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (array.Count == 0) break;
|
||||
|
||||
OnDebug?.Invoke($"Seite {page}: {array.Count} Kontakte in Liste");
|
||||
|
||||
// Die Listen-API gibt nur Summary zurueck.
|
||||
// Jeden Kontakt einzeln abrufen fuer alle Felder.
|
||||
foreach (var item in array)
|
||||
contacts.Add(MapFromStarface(item));
|
||||
{
|
||||
var id = item["id"]?.ToString();
|
||||
if (string.IsNullOrEmpty(id)) continue;
|
||||
|
||||
try
|
||||
{
|
||||
var detailResp = await _http.GetAsync($"{_baseUrl}/contacts/{id}");
|
||||
if (detailResp.IsSuccessStatusCode)
|
||||
{
|
||||
var detailBody = await detailResp.Content.ReadAsStringAsync();
|
||||
var detailObj = JObject.Parse(detailBody);
|
||||
|
||||
if (firstPage)
|
||||
{
|
||||
OnDebug?.Invoke($"Starface Kontakt-Detail (1. Kontakt):\n{detailObj.ToString(Formatting.Indented)}");
|
||||
firstPage = false;
|
||||
}
|
||||
|
||||
contacts.Add(MapFromStarface(detailObj));
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
||||
if (array.Count < pageSize) break;
|
||||
page++;
|
||||
@@ -224,7 +284,10 @@ namespace StarfaceOutlookSync.Services
|
||||
var contact = new UnifiedContact();
|
||||
contact.StarfaceId = item["id"]?.ToString() ?? "";
|
||||
|
||||
var attrs = new Dictionary<string, string>();
|
||||
// Attribute per "name"-Feld mappen (zuverlaessiger als displayKey,
|
||||
// weil viele Felder USER_DEFINED als displayKey haben)
|
||||
var byName = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||
var byDisplayKey = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||
var blocks = item["blocks"] as JArray;
|
||||
if (blocks != null)
|
||||
{
|
||||
@@ -234,79 +297,123 @@ namespace StarfaceOutlookSync.Services
|
||||
if (blockAttrs == null) continue;
|
||||
foreach (var attr in blockAttrs)
|
||||
{
|
||||
var key = attr["displayKey"]?.ToString() ?? "";
|
||||
var name = attr["name"]?.ToString() ?? "";
|
||||
var displayKey = attr["displayKey"]?.ToString() ?? "";
|
||||
var val = attr["value"]?.ToString() ?? "";
|
||||
if (!string.IsNullOrEmpty(val))
|
||||
attrs[key] = val;
|
||||
{
|
||||
if (!string.IsNullOrEmpty(name))
|
||||
byName[name] = val;
|
||||
// displayKey nur als Fallback (viele sind USER_DEFINED)
|
||||
if (!string.IsNullOrEmpty(displayKey) && displayKey != "USER_DEFINED")
|
||||
byDisplayKey[displayKey] = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
contact.FirstName = attrs.GetValueOrDefault("NAME", "");
|
||||
contact.LastName = attrs.GetValueOrDefault("SURNAME", "");
|
||||
contact.Company = attrs.GetValueOrDefault("COMPANY", "");
|
||||
contact.JobTitle = attrs.GetValueOrDefault("JOB_TITLE", "");
|
||||
contact.Email = attrs.GetValueOrDefault("EMAIL", "");
|
||||
contact.PhoneWork = attrs.GetValueOrDefault("OFFICE_PHONE_NUMBER", "");
|
||||
contact.PhoneMobile = attrs.GetValueOrDefault("MOBILE_PHONE_NUMBER", "");
|
||||
contact.PhoneHome = attrs.GetValueOrDefault("PRIVATE_PHONE_NUMBER", "");
|
||||
contact.Fax = attrs.GetValueOrDefault("FAX_NUMBER", "");
|
||||
contact.Street = attrs.GetValueOrDefault("STREET", "");
|
||||
contact.City = attrs.GetValueOrDefault("CITY", "");
|
||||
contact.PostalCode = attrs.GetValueOrDefault("POSTAL_CODE", "");
|
||||
contact.State = attrs.GetValueOrDefault("STATE", "");
|
||||
contact.Country = attrs.GetValueOrDefault("COUNTRY", "");
|
||||
contact.Website = attrs.GetValueOrDefault("URL", "");
|
||||
contact.Notes = attrs.GetValueOrDefault("NOTE", "");
|
||||
contact.Salutation = attrs.GetValueOrDefault("SALUTATION", "");
|
||||
contact.Title = attrs.GetValueOrDefault("TITLE", "");
|
||||
contact.Birthday = attrs.GetValueOrDefault("BIRTHDAY", "");
|
||||
// Primaer nach name-Feld mappen, Fallback auf displayKey
|
||||
string Get(string name, string displayKey = null)
|
||||
{
|
||||
if (byName.TryGetValue(name, out var v)) return v;
|
||||
if (displayKey != null && byDisplayKey.TryGetValue(displayKey, out v)) return v;
|
||||
return "";
|
||||
}
|
||||
|
||||
contact.FirstName = Get("firstname", "NAME");
|
||||
contact.LastName = Get("familyname", "SURNAME");
|
||||
contact.Company = Get("company", "COMPANY");
|
||||
contact.JobTitle = Get("jobtitle", "JOB_TITLE");
|
||||
contact.Email = Get("e-mail", "EMAIL");
|
||||
contact.PhoneWork = Get("phone", "PHONE_NUMBER");
|
||||
contact.PhoneMobile = Get("mobile", "MOBILE_PHONE_NUMBER");
|
||||
contact.PhoneHome = Get("homephone", "PRIVATE_PHONE_NUMBER");
|
||||
contact.Fax = Get("fax", "FAX_NUMBER");
|
||||
contact.Street = Get("street", "STREET");
|
||||
contact.City = Get("city", "CITY");
|
||||
contact.PostalCode = Get("postcode", "POSTAL_CODE");
|
||||
contact.State = Get("state", "STATE");
|
||||
contact.Country = Get("country", "COUNTRY");
|
||||
contact.Website = Get("url", "URL");
|
||||
contact.Notes = Get("comment", "NOTE");
|
||||
contact.Salutation = Get("salutation", "SALUTATION");
|
||||
contact.Title = Get("title", "TITLE");
|
||||
contact.Birthday = Get("birthday", "BIRTHDAY");
|
||||
|
||||
return contact;
|
||||
}
|
||||
|
||||
private JObject MapToStarface(UnifiedContact contact)
|
||||
{
|
||||
var attrs = new JArray();
|
||||
|
||||
void AddAttr(string displayKey, string name, string value)
|
||||
JArray MakeAttrs(params (string displayKey, string name, string value)[] fields)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(value))
|
||||
attrs.Add(new JObject { ["displayKey"] = displayKey, ["name"] = name, ["value"] = value });
|
||||
var arr = new JArray();
|
||||
foreach (var (dk, n, v) in fields)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(v))
|
||||
arr.Add(new JObject { ["displayKey"] = dk, ["name"] = n, ["value"] = v });
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
AddAttr("NAME", "firstName", contact.FirstName);
|
||||
AddAttr("SURNAME", "lastName", contact.LastName);
|
||||
AddAttr("COMPANY", "company", contact.Company);
|
||||
AddAttr("JOB_TITLE", "jobTitle", contact.JobTitle);
|
||||
AddAttr("EMAIL", "email", contact.Email);
|
||||
AddAttr("OFFICE_PHONE_NUMBER", "businessPhone", contact.PhoneWork);
|
||||
AddAttr("MOBILE_PHONE_NUMBER", "mobilePhone", contact.PhoneMobile);
|
||||
AddAttr("PRIVATE_PHONE_NUMBER", "homePhone", contact.PhoneHome);
|
||||
AddAttr("FAX_NUMBER", "fax", contact.Fax);
|
||||
AddAttr("STREET", "street", contact.Street);
|
||||
AddAttr("CITY", "city", contact.City);
|
||||
AddAttr("POSTAL_CODE", "postalCode", contact.PostalCode);
|
||||
AddAttr("STATE", "state", contact.State);
|
||||
AddAttr("COUNTRY", "country", contact.Country);
|
||||
AddAttr("URL", "website", contact.Website);
|
||||
AddAttr("NOTE", "notes", contact.Notes);
|
||||
AddAttr("SALUTATION", "salutation", contact.Salutation);
|
||||
AddAttr("TITLE", "title", contact.Title);
|
||||
AddAttr("BIRTHDAY", "birthday", contact.Birthday);
|
||||
// Block-Struktur wie von der Starface erwartet
|
||||
var contactBlock = MakeAttrs(
|
||||
("NAME", "firstname", contact.FirstName),
|
||||
("SURNAME", "familyname", contact.LastName),
|
||||
("COMPANY", "company", contact.Company)
|
||||
);
|
||||
|
||||
var addressBlock = MakeAttrs(
|
||||
("USER_DEFINED", "street", contact.Street),
|
||||
("POSTAL_CODE", "postcode", contact.PostalCode),
|
||||
("USER_DEFINED", "city", contact.City),
|
||||
("USER_DEFINED", "state", contact.State),
|
||||
("USER_DEFINED", "country", contact.Country)
|
||||
);
|
||||
|
||||
var phoneBlock = MakeAttrs(
|
||||
("PHONE_NUMBER", "phone", contact.PhoneWork),
|
||||
("PRIVATE_PHONE_NUMBER", "homephone", contact.PhoneHome),
|
||||
("MOBILE_PHONE_NUMBER", "mobile", contact.PhoneMobile),
|
||||
("FAX_NUMBER", "fax", contact.Fax)
|
||||
);
|
||||
|
||||
var emailBlock = MakeAttrs(
|
||||
("EMAIL", "e-mail", contact.Email),
|
||||
("URL", "url", contact.Website),
|
||||
("USER_DEFINED", "comment", contact.Notes)
|
||||
);
|
||||
|
||||
var blocks = new JArray();
|
||||
blocks.Add(new JObject
|
||||
{
|
||||
["name"] = "contact",
|
||||
["resourceKey"] = "de.vertico.starface.addressbook.block.label_contact",
|
||||
["attributes"] = contactBlock
|
||||
});
|
||||
blocks.Add(new JObject
|
||||
{
|
||||
["name"] = "address",
|
||||
["resourceKey"] = "de.vertico.starface.addressbook.block.label_address",
|
||||
["attributes"] = addressBlock
|
||||
});
|
||||
blocks.Add(new JObject
|
||||
{
|
||||
["name"] = "telephone",
|
||||
["resourceKey"] = "de.vertico.starface.addressbook.block.label_telephone",
|
||||
["attributes"] = phoneBlock
|
||||
});
|
||||
blocks.Add(new JObject
|
||||
{
|
||||
["name"] = "email",
|
||||
["resourceKey"] = "de.vertico.starface.addressbook.block.label_email",
|
||||
["attributes"] = emailBlock
|
||||
});
|
||||
|
||||
return new JObject
|
||||
{
|
||||
["id"] = contact.StarfaceId ?? "",
|
||||
["blocks"] = new JArray
|
||||
{
|
||||
new JObject
|
||||
{
|
||||
["name"] = "contact",
|
||||
["resourceKey"] = "contact",
|
||||
["attributes"] = attrs
|
||||
}
|
||||
}
|
||||
["blocks"] = blocks
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@ namespace StarfaceOutlookSync.Services
|
||||
Log("Verbinde mit Starface...");
|
||||
using (var starface = new StarfaceApiClient(profile.StarfaceConnection))
|
||||
{
|
||||
starface.OnDebug += (msg) => Log(msg);
|
||||
var loginOk = await starface.LoginAsync();
|
||||
if (!loginOk)
|
||||
{
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
<AssemblyTitle>Starface Outlook Sync</AssemblyTitle>
|
||||
<Company>HackerSoft - Hacker-Net Telekommunikation</Company>
|
||||
<Product>Starface Outlook Sync</Product>
|
||||
<Version>0.0.0.7</Version>
|
||||
<AssemblyVersion>0.0.0.7</AssemblyVersion>
|
||||
<FileVersion>0.0.0.7</FileVersion>
|
||||
<Version>0.0.0.12</Version>
|
||||
<AssemblyVersion>0.0.0.12</AssemblyVersion>
|
||||
<FileVersion>0.0.0.12</FileVersion>
|
||||
<Description>Synchronisiert Outlook-Kontakte mit Starface Telefonanlage</Description>
|
||||
<Copyright>Stefan Hacker - HackerSoft</Copyright>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace StarfaceOutlookSync.UI
|
||||
|
||||
var lblVersion = new Label
|
||||
{
|
||||
Text = "Version 0.0.0.7",
|
||||
Text = "Version 0.0.0.12",
|
||||
Left = 0, Top = 56, Width = 340, Height = 20,
|
||||
TextAlign = ContentAlignment.MiddleCenter,
|
||||
ForeColor = Color.Gray
|
||||
|
||||
Reference in New Issue
Block a user