[xiph-commits] r13867 - websites/validator.xspf.org

sping at svn.xiph.org sping at svn.xiph.org
Thu Sep 20 16:21:39 PDT 2007


Author: sping
Date: 2007-09-20 16:21:39 -0700 (Thu, 20 Sep 2007)
New Revision: 13867

Added:
   websites/validator.xspf.org/COPYING
Modified:
   websites/validator.xspf.org/check.py
Log:
URI validation integrated


Added: websites/validator.xspf.org/COPYING
===================================================================
--- websites/validator.xspf.org/COPYING	                        (rev 0)
+++ websites/validator.xspf.org/COPYING	2007-09-20 23:21:39 UTC (rev 13867)
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Modified: websites/validator.xspf.org/check.py
===================================================================
--- websites/validator.xspf.org/check.py	2007-09-20 23:00:48 UTC (rev 13866)
+++ websites/validator.xspf.org/check.py	2007-09-20 23:21:39 UTC (rev 13867)
@@ -1,30 +1,76 @@
-#!/usr/bin/python
-# ------------------------------------------------------------------------------
-# Written by Sebastian Pipping <webmaster at hartwork.org>
-# Licensed under LGPL (GNU Lesser General Public License)
-# http://www.gnu.org/licenses/lgpl.html
+#! /usr/bin/python
+# coding: utf-8
+# -----------------------------------------------------------------------
+# Online XSPF Validator
+# Copyright (C) 2007, Sebastian Pipping / Xiph.Org Foundation
 #
-# NOTE: Python 2.4 or later required for current line attribute of Expat parser
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
 #
-# 2007-08-09 // Sebastian Pipping <webmaster at hartwork.org>
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Sebastian Pipping, sping at xiph.org
+#
+# -----------------------------------------------------------------------
+# REQUIREMENTS
+# -----------------------------------------------------------------------
+# * Python 2.4 or later (for current line attribute of Expat parser)
+# * Ft.Lib.Uri of 4Suite (http://4suite.org/)
+#   (package python-4suite-xml in Debian testing/unstable)
+#
+# -----------------------------------------------------------------------
+# HISTORY
+# -----------------------------------------------------------------------
+# 2007-09-21 -- Sebastian Pipping <webmaster at hartwork.org>
+#
+#   * Added: RFC 3986 URI validation
+#   * Changed: Code re-licensed under LGPLv3 (LGPL-Any before) to be
+#       able to use 4Suite's Apache-licensed URI validation code
+#       (http://www.gnu.org/licenses/lgpl-3.0.html)
+#
+# 2007-08-09 -- Sebastian Pipping <webmaster at hartwork.org>
+#
 #   * Fixed: Ivo's changes repaired to have same look again
 #       I use tables when pixel-exact layout is need since
 #       CSS support in browsers is not good enough yet
-# 2007-07-30
+#
+# 2007-07-30 -- Ivo Emanuel Gonçalves <justivo at gmail.com>
+#
 #   * Some HTML and CSS fixes by Ivo Emanuel Gonçalves <justivo at gmail.com>
-#     (probably should remove those bloody tables, but I can't see
-#     through the sea of Python.  Not without my Python-reading glasses)
-# 2007-07-25
+#       (probably should remove those bloody tables, but I can't see
+#       through the sea of Python.  Not without my Python-reading glasses)
+#
+# 2007-07-25 -- Sebastian Pipping <webmaster at hartwork.org>
+#
 #   * Changes: License changed from GPL to LGPL
-# 2007-02-18
+#       (http://www.gnu.org/licenses/lgpl-2.1.html)
+#
+# 2007-02-18 -- Sebastian Pipping <webmaster at hartwork.org>
+#
 #   * Added: License header for source code release
-# 2007-01-20
+#
+# 2007-01-20 -- Sebastian Pipping <webmaster at hartwork.org>
+#
 #   * Changed: URI checking removed until proper parser available
-# 2007-01-09
+#
+# 2007-01-09 -- Sebastian Pipping <webmaster at hartwork.org>
+#
 #   * Fixed: No highlighting on XML error bug fixed
-# 2006-10-09
+#
+# 2006-10-09 -- Sebastian Pipping <webmaster at hartwork.org>
+#
 #   * Changed: "Valid" now on the top
-# 2006-10-04
+#
+# 2006-10-04 -- Sebastian Pipping <webmaster at hartwork.org>
 # ------------------------------------------------------------------------------
 
 import cgi
@@ -34,6 +80,13 @@
 import xml.parsers.expat
 import re
 
+try:
+    from Ft.Lib import Uri
+except ImportError:
+    print "ERROR: Package 'Ft.Lib' is missing. On Debian testing/unstable run:\n" \
+            "sudo apt-get install python-4suite-xml"
+    sys.exit(1)
+
 print "Content-Type: text/html"     # HTML is following
 print                               # blank line, end of headers
 
@@ -364,7 +417,6 @@
     firstTrackDuration = True
     firstTrack = True
 
-    uriRegex = re.compile("^[a-zA-Z0-9.+-]+:")
     dateRegex = re.compile("^(-?\\d\\d\\d\\d)-(0[1-9]|1[0-2])-(0[1-9]|1[0-9]|2[0-9]|3[0-1])T([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(\\.\\d+)?([+-](((0[0-9]|1[0-3]):[0-5][0-9])|14:00)|Z)?$")
 
     checker = xml.parsers.expat.ParserCreate()
@@ -1000,7 +1052,7 @@
 
 
 def isUri(text):
-    return True # 2007-01-20, TODO, OLD: globals()["uriRegex"].match(text)
+    return Uri.MatchesUriRefSyntax(text)
 
 
 



More information about the commits mailing list