Sergey Astanin avatar Sergey Astanin committed 19e78b2

Accept set URLs as well as set ID.

Comments (0)

Files changed (1)

 
 from cgi import escape
 from os.path import expanduser
+from re import match
 from string import Template
 from sys import argv, version_info, exit
 from xml.etree import ElementTree as ET
             print "photoset:", pset[0], pset[1]
             write_photoset_index(flck, pset, embeddable, linkwhat)
     elif args[0] == "photoset" or args[0] == "set":
-        pset_id = args[1]
+        pset = args[1]
+        pset_pattern = "http://www\.flickr\.com/photos/.*/sets/([0-9]+)/?"
+        m = match(pset_pattern, pset)
+        pset_id = m.groups()[0] if m else pset
         fn = write_photoset_index(flck, pset_id, embeddable, linkwhat)
         print file(fn).read()
     else:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.