Skip to content

Updates #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhuyifei1999 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 51 additions & 9 deletions Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2010 Derrick Coetzee
/* Copyright (c) 2010 Derrick Coetzee

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -36,7 +36,7 @@ namespace PicasaReview
{
class Program
{
static string wikiSiteUrl = "http://commons.wikimedia.org";
static string wikiSiteUrl = "https://commons.wikimedia.org";
static string username;
static string password;

Expand Down Expand Up @@ -545,27 +545,70 @@ private static bool UpdateLicense(Page page, string licenseName, out string lice
static Regex mediaUrlRegex = new Regex("media:content url='([^']+)'");
static Regex summaryTextRegex = new Regex("<summary type='text'>([^<]*)</summary>");

static Regex picasaUrlRegex2 = new Regex("https?://picasaweb\\.google(\\.[\\.a-z]+)/lh/photo/.+", RegexOptions.IgnoreCase);
static Regex IdRegex2 = new Regex(",\"href\":\"https?://picasaweb\\.google\\.[\\.a-z]+/data/feed/tiny/user/([0-9]+)/photoid/([0-9]+)\\?");

private static bool FetchPicasaImageInfo(Page page, out string licenseName, out string mediaUrl)
{
licenseName = mediaUrl = null;

Match m;
m = picasaUrlRegex.Match(page.text);

string url;
string picasaImagePage;
string albumId;
string userId;
string photoId;
string summary;

if (!m.Success)
{
UpdateSourceField(page);
m = picasaUrlRegex.Match(page.text);
if (!m.Success)
{
return false;
m = picasaUrlRegex2.Match(page.text);
if (!m.Success)
{
return false;
}
else
{
url = m.Groups[0].ToString();
url = url.Replace(m.Groups[1].ToString(), ".com"); // Use English version

picasaImagePage = WgetToString(url);
if (picasaImagePage == null) return false;
m = albumIdRegex.Match(picasaImagePage);
if (!m.Success)
{
m = new Regex("var _album = {id:'([0-9]+)'").Match(picasaImagePage);
if (!m.Success)
{
return false;
}
}
albumId = m.Groups[1].ToString();

m = IdRegex2.Match(picasaImagePage);
if (!m.Success)
{
return false;
}
userId = m.Groups[1].ToString();
photoId = m.Groups[2].ToString();

return GetImageInfo(userId, albumId, photoId, out licenseName, out mediaUrl, out summary);
}
}
}
string url = m.Groups[0].ToString();
url = m.Groups[0].ToString();
url = url.Replace(m.Groups[1].ToString(), ".com"); // Use English version
string userId = m.Groups[2].ToString();
string photoId = m.Groups[3].ToString();
userId = m.Groups[2].ToString();
photoId = m.Groups[3].ToString();

string picasaImagePage = WgetToString(url);
picasaImagePage = WgetToString(url);
if (picasaImagePage == null) return false;
m = albumIdRegex.Match(picasaImagePage);
if (!m.Success)
Expand All @@ -576,9 +619,8 @@ private static bool FetchPicasaImageInfo(Page page, out string licenseName, out
return false;
}
}
string albumId = m.Groups[1].ToString();
albumId = m.Groups[1].ToString();

string summary;
return GetImageInfo(userId, albumId, photoId, out licenseName, out mediaUrl, out summary);
}

Expand Down