diff --git a/INSTALL b/INSTALL index 4ad83672..3ad2f1c9 100644 --- a/INSTALL +++ b/INSTALL @@ -15,13 +15,6 @@ http://www.activestate.com/ActivePerl) if you want to install OpenSSL on Windows! -Install with Distutils ----------------------- -The Distutils package has a lot of install options to tweak and ease -your installation. -To install LinkChecker run "python setup.py install". -Debian users can build the .deb package with "debian/rules binary". - Install without Distutils ------------------------- Execute "python install.py" to install LinkChecker in the distribution @@ -32,6 +25,13 @@ ssl.c -o ssl.o" Put the distribution directory in your path to execute the linkchecker script from everywhere. +Install with Distutils +---------------------- +The Distutils package has a lot of install options to tweak and ease +your installation. +To install LinkChecker run "python setup.py install". +Debian users can build the .deb package with "debian/rules binary". + Running LinkChecker ------------------- diff --git a/MANIFEST.in b/MANIFEST.in index 67ac83e3..6a1bcd15 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -12,5 +12,6 @@ include debian/dirs include debian/docs include DNS/README include linkcheck/__init__.py.tmpl -recursive-include test *.html *.py *.tmpl +include test/viewprof.py test/profiletest.py.tmpl +recursive-include test *.html recursive-include locale *.mo *.po diff --git a/Makefile b/Makefile index 34c72061..8b1320f4 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,11 @@ PROXY=--proxy= -itreasure.calvinsplayground.de -s LCOPTS=-ocolored -Ftext -Fhtml -Fgml -Fsql -Fcsv -R -t0 -v PACKAGE = linkchecker DEBPACKAGE = ../$(PACKAGE)_$(VERSION)_i386.deb -RPMPATH=build/bdist.linux2-i686/rpm -RPMPACKAGE=$(RPMPATH)/RPMS/i386/$(PACKAGE)-$(VERSION)-1.i386.rpm -SRPMPACKAGE=$(RPMPATH)/SRPMS/$(PACKAGE)-$(VERSION)-1.src.rpm -ALLPACKAGES = $(DEBPACKAGE) $(RPMPACKAGE) $(SRPMPACKAGE) +SRCPACKAGE = linkchecker-$(VERSION).tar.gz +RPMPATH=build/bdist.linux2/rpm +#RPMPACKAGE=$(RPMPATH)/RPMS/i386/$(PACKAGE)-$(VERSION)-1.i386.rpm +#SRPMPACKAGE=$(RPMPATH)/SRPMS/$(PACKAGE)-$(VERSION)-1.src.rpm +ALLPACKAGES = $(DEBPACKAGE) $(SRCPACKAGE) #$(RPMPACKAGE) $(SRPMPACKAGE) SOURCES = linkcheck/Config.py \ linkcheck/FileUrlData.py \ linkcheck/FtpUrlData.py \ @@ -43,7 +44,7 @@ clean: python setup.py clean --all rm -rf $(ALLPACKAGES) $(PACKAGE)-out.* -dist: +dist: mo version python setup.py sdist bdist_rpm fakeroot debian/rules binary @@ -57,12 +58,12 @@ files: version: echo $(VERSION) > VERSION -upload: version files packages +upload: files packages scp debian/changelog shell1.sourceforge.net:/home/groups/linkchecker/htdocs/changes.txt scp VERSION shell1.sourceforge.net:/home/groups/linkchecker/htdocs/raw/ scp $(DEBPACKAGE) ../Packages.gz shell1.sourceforge.net:/home/groups/linkchecker/htdocs/debian ncftpput download.sourceforge.net /incoming $(ALLPACKAGES) - ssh -C calvin@shell1.sourceforge.net cd /home/groups/linkchecker/htdocs/raw && make + ssh -C shell1.sourceforge.net cd /home/groups/linkchecker/htdocs/raw && make test: rm -f test/*.result diff --git a/README b/README index d185053b..f0595761 100644 --- a/README +++ b/README @@ -19,6 +19,11 @@ o robots.txt exclusion protocol support o internationalization support +Installing, Requirements, Running +--------------------------------- +Read the file INSTALL. + + License -------- LinkChecker is licensed under the GNU Public License. @@ -104,7 +109,7 @@ o Wash-O-matic. LinkChecker has a secret option which washes all your dirty clothes in a matter of seconds. o Y2K-Compatibility(tm) guarantee. The fact that you can read this text in the Millenium age is proof enough! -o Self destruction option (also called kamikaze option). Hit your fists +o Self destruction option (also called kamikaze option). Punch your fists several times on your keyboard. Banzaaaiiii! o There is no spoon. Wake up already! diff --git a/debian/changelog b/debian/changelog index 22cbb412..8baf0282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,9 @@ linkchecker (1.2.3) unstable; urgency=low * Renice the main thread loop by sleep()ing some time * New function config.reset() * fix dead lock with news: urls + * print how much links we checked - -- Bastian Kleineidam Sun, 18 Jun 2000 00:23:44 +0200 + -- Bastian Kleineidam Thu, 22 Jun 2000 11:23:49 +0200 linkchecker (1.2.2) unstable; urgency=low diff --git a/linkcheck/Logging.py b/linkcheck/Logging.py index 42fdc411..796b761d 100644 --- a/linkcheck/Logging.py +++ b/linkcheck/Logging.py @@ -388,10 +388,10 @@ class ColoredLogger(StandardLogger): self.fd.flush() - def endOfOutput(self): + def endOfOutput(self, linknumber=-1): if self.prefix: self.fd.write("o\n") - StandardLogger.endOfOutput(self) + StandardLogger.endOfOutput(self, linknumber=linknumber) class GMLLogger(StandardLogger): @@ -414,7 +414,7 @@ class GMLLogger(StandardLogger): def newUrl(self, urlData): self.nodes.append(urlData) - def endOfOutput(self): + def endOfOutput(self, linknumber=-1): writtenNodes = {} # write nodes nodeid = 1 @@ -500,7 +500,7 @@ class SQLLogger(StandardLogger): self.separator)) self.fd.flush() - def endOfOutput(self): + def endOfOutput(self, linknumber=-1): self.stoptime = time.time() duration = self.stoptime - self.starttime name = _("seconds") @@ -537,7 +537,7 @@ class BlacklistLogger: self.errors = 1 self.blacklist[urlData.getCacheKey()] = urlData - def endOfOutput(self): + def endOfOutput(self, linknumber=-1): """write the blacklist""" fd = open(args['filename'], "w") for url in self.blacklist.keys(): @@ -595,7 +595,7 @@ class CSVLogger(StandardLogger): urlData.cached)) self.fd.flush() - def endOfOutput(self): + def endOfOutput(self, linknumber=-1): self.stoptime = time.time() duration = self.stoptime - self.starttime name = _("seconds") diff --git a/linkchecker.tmpl b/linkchecker.tmpl index b38c0196..8bbd1f7e 100755 --- a/linkchecker.tmpl +++ b/linkchecker.tmpl @@ -169,11 +169,12 @@ config.read(configfiles) # check for environment variables (currently only http_proxy) if os.environ.has_key("http_proxy"): - proxy = re.compile("(?:http://)?(.+):(.+)").match( + proxy = re.compile("^(http://)?(?P.+?)(:(?P\d+))?").search( os.environ["http_proxy"]) if proxy: - config["proxy"] = proxy.group(1) - config["proxyport"] = int(proxy.group(2)) + config["proxy"] = proxy.group('host') + if proxy.group('port'): + config["proxyport"] = int(proxy.group('port')) else: config["proxy"] = os.environ["http_proxy"] diff --git a/locale/de/LC_MESSAGES/linkcheck.po b/locale/de/LC_MESSAGES/linkcheck.po index db82a076..368e13dd 100644 --- a/locale/de/LC_MESSAGES/linkcheck.po +++ b/locale/de/LC_MESSAGES/linkcheck.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-18 15:21+0200\n" +"POT-Creation-Date: 2000-06-22 01:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,18 +30,15 @@ msgstr " (aus dem Cache)\n" msgid " errors" msgstr " Fehler" -msgid " found." -msgstr " gefunden" - -msgid " found.\n" -msgstr " gefunden.\n" +msgid " found\n" +msgstr " gefunden\n" #, c-format -msgid " in %d links found\n" -msgstr " in %d Verweisen gefunden\n" +msgid " in %d links" +msgstr " in %d URLs" -msgid " in 1 link found\n" -msgstr " in 1 Verweis gefunden\n" +msgid " in 1 link" +msgstr " in einer URL" msgid " warnings, " msgstr " Warnungen, " @@ -220,6 +217,9 @@ msgstr "Kein NNTP Server angegeben; pr msgid "No adresses found" msgstr "Keine Adressen gefunden" +msgid "No user or password found" +msgstr "Kein Benutzername oder Passwort gefunden" + #, c-format msgid "None of the mail hosts for %s accepts an SMTP connection: %s" msgstr "Keiner der Mail Hosts für %s akzeptiert eine SMTP Verbindung: %s" @@ -327,7 +327,7 @@ msgstr "" "\n" "OPTIONEN\n" "-a, --anchors\n" -" Prüfe interne Verweise. Standard ist keine Prüfung.\n" +" Prüfe interne URLs. Standard ist keine Prüfung.\n" "-D, --debug\n" " Drucke zusätzlich Debug Information.\n" "-e regex, --extern=regex\n" @@ -367,12 +367,12 @@ msgstr "" "-q, --quiet\n" " Keine Ausgabe. Dies ist nur in Verbindung mit -F nützlich.\n" "-r depth, --recursion-level=depth\n" -" Prüfe rekursiv alle Verweise bis zu der angegebenen Tiefe\n" +" Prüfe rekursiv alle URLs bis zu der angegebenen Tiefe\n" " (depth >= 0). Standard Tiefe ist 1.\n" "-R, --robots-txt\n" " Befolge den Robots Exclusion Standard.\n" "-s, --strict\n" -" Prüfe lediglich die Syntax von externen Verweisen. Es wird keine.\n" +" Prüfe lediglich die Syntax von externen URLs. Es wird keine.\n" " Verbindung zu diesen Rechner aufgebaut.\n" "-t num, --threads=num\n" " Generiere nicht mehr als num Threads. Standard Anzahl von Threads\n" @@ -390,7 +390,7 @@ msgstr "" " Logge Warnungen.\n" "-W regex, --warning-regex=regex\n" " Definieren Sie einen regulären Ausdruck, der eine Warnung ausdruckt\n" -" falls er den Inhalt eines geprüften Verweises matcht.\n" +" falls er den Inhalt einer geprüften URL matcht.\n" " Dies gilt natürlich nur für gültige Seiten deren Inhalt wir\n" " bekommen können.\n" " Sie können dies verwenden, um Seiten mit Fehlermeldungen wie z.B.\n" diff --git a/locale/fr/LC_MESSAGES/linkcheck.po b/locale/fr/LC_MESSAGES/linkcheck.po index 1cd2468e..fc5c40d5 100644 --- a/locale/fr/LC_MESSAGES/linkcheck.po +++ b/locale/fr/LC_MESSAGES/linkcheck.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-06-18 15:21+0200\n" +"POT-Creation-Date: 2000-06-22 01:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,13 +28,23 @@ msgstr "" msgid " errors" msgstr " erreurs" +msgid " found\n" +msgstr "" + msgid " found.\n" msgstr "" +#, c-format +msgid " in %d links" +msgstr "" + #, c-format msgid " in %d links found\n" msgstr "" +msgid " in 1 link" +msgstr "" + msgid " in 1 link found\n" msgstr "" @@ -191,6 +201,9 @@ msgstr "" msgid "No adresses found" msgstr "" +msgid "No user or password found" +msgstr "" + #, c-format msgid "None of the mail hosts for %s accepts an SMTP connection: %s" msgstr "" diff --git a/util1.py b/util1.py index bd4aa4bc..7721f038 100644 --- a/util1.py +++ b/util1.py @@ -182,6 +182,5 @@ if __name__=='__main__': abbuzze() except: _curses.endwin() - type, value = sys.exc_info()[:2] - print type,value + print sys.exc_info()[:2] print "Sorry, your washing machine is broken!"