github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Directory.Build.targets, this seems to help to import the target correctly. Removed chocolatey package again, as this seems to be the more stable approach (let's see if the build runs...)

Browse source
This commit is contained in:
Robin Krom 2021-01-28 09:12:55 +01:00
commit 6831505ead
24 changed files with 175 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

12
GreenshotConfluencePlugin/ConfluenceUtils.cs
View file

@ -33,8 +33,8 @@ namespace GreenshotConfluencePlugin {
public class ConfluenceUtils {
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluenceUtils));
public static List<Confluence.Page> GetCurrentPages() {
List<Confluence.Page> pages = new List<Confluence.Page>();
public static List<Page> GetCurrentPages() {
List<Page> pages = new List<Page>();
Regex pageIdRegex = new Regex(@"pageId=(\d+)");
Regex spacePageRegex = new Regex(@"\/display\/([^\/]+)\/([^#]+)");
foreach(string browserurl in GetBrowserUrls()) {
@ -50,7 +50,7 @@ namespace GreenshotConfluencePlugin {
long pageId = long.Parse(pageIdMatch[0].Groups[1].Value);
try {
bool pageDouble = false;
foreach(Confluence.Page page in pages) {
foreach(Page page in pages) {
if (page.Id == pageId) {
pageDouble = true;
LOG.DebugFormat("Skipping double page with ID {0}", pageId);
@ -58,7 +58,7 @@ namespace GreenshotConfluencePlugin {
}
}
if (!pageDouble) {
Confluence.Page page = ConfluencePlugin.ConfluenceConnector.GetPage(pageId);
Page page = ConfluencePlugin.ConfluenceConnector.GetPage(pageId);
LOG.DebugFormat("Adding page {0}", page.Title);
pages.Add(page);
}
@ -82,7 +82,7 @@ namespace GreenshotConfluencePlugin {
}
try {
bool pageDouble = false;
foreach(Confluence.Page page in pages) {
foreach(Page page in pages) {
if (page.Title.Equals(title)) {
LOG.DebugFormat("Skipping double page with title {0}", title);
pageDouble = true;
@ -90,7 +90,7 @@ namespace GreenshotConfluencePlugin {
}
}
if (!pageDouble) {
Confluence.Page page = ConfluencePlugin.ConfluenceConnector.GetPage(space, title);
Page page = ConfluencePlugin.ConfluenceConnector.GetPage(space, title);
LOG.DebugFormat("Adding page {0}", page.Title);
pages.Add(page);