Changeset 9

Timestamp:

03/24/08 22:15:06 (4 years ago)

Author:

christian

Message:

Fixed an error while setting up the printer
Added Quartz-based PDF size reduction

Location:

SipgateFax/trunk

Files:

• Resources/Library (added)
• Resources/Library/Filters (added)
• Resources/Library/Filters/CompressForFax.qfilter (added)
• Resources/usr/libexec/cups/backend/sipgate (modified) (7 diffs)
• Resources/usr/share/cups/model/SipgateFax.ppd (modified) (1 diff)
• SipgateFax Installer.pmdoc/01resources-contents.xml (modified) (1 diff)
• SipgateFax Installer.pmdoc/01resources.xml (modified) (1 diff)
• scripts/Create printer.app/Contents/Resources/Scripts/main.scpt (modified) (previous)
• scripts/preflight.sh (added)

SipgateFax/trunk/Resources/usr/libexec/cups/backend/sipgate

@@ -68 +68 @@
 user = sys.argv[2]
 title = sys.argv[3]
+copies = sys.argv[4]
 opts = sys.argv[5].replace("\\ ", "%20").split()
 atPos = os.environ['DEVICE_URI'].find('@')
@@ -74 +75 @@
 faxTo = toE164(getOptionFromArray(opts, 'faxTo'))
 if faxTo==False:
-        sys.stderr.write("ERROR: No fax number given")
+        sys.stderr.write("ERROR: No fax number given\n")
         sys.exit(CUPS_BACKEND_CANCEL)
 
 if len(cred)!=2:
-        sys.stderr.write("ERROR: Credentials missing in device_uri")
+        sys.stderr.write("ERROR: Credentials missing in device_uri\n")
         sys.exit(CUPS_BACKEND_CANCEL)
-
-#dbg = open('/tmp/sipgate.log', 'w')
-#for param in os.environ.keys():
-#       sys.stderr.write("%20s %s\n" % (param,os.environ[param]))
-#dbg.write("\nfaxTo: %s\n" % faxTo)
-#dbg.write("host: %s\n" % host)
-#dbg.write("u/p %s %s" % (cred[0], cred[1]))
-#dbg.close()
 
 if argc == 7:
@@ -93 +86 @@
         infilename = sys.argv[6]
 else:
+        sys.stderr.write("INFO: file is stdin\n")
         infilename = tempfile.mktemp("sipfax.pdf")
         try:
@@ -98 +92 @@
         except:
                 sys.stderr.write("ERROR: unable to create tmp file %s\n" % infilename)
-                sys.exit(1)
+                sys.exit(CUPS_BACKEND_FAILED)
 
-        sys.stderr.write("INFO: file is stdin\n")
         try:
                 infile.write(sys.stdin.read())
+                infile.close()
         except:
                 sys.stderr.write("ERROR: unable to copy into tmpfile\n")
@@ -108 +102 @@
                 sys.exit(CUPS_BACKEND_FAILED)
 
-infile = open(infilename, "r")
+outfilename = tempfile.mktemp("sipcompress.out.pdf")
+cmd = "/System/Library/Printers/Libraries/quartzfilter"
+filterpath = "/Library/Filters/CompressForFax.qfilter"
+ret = os.system("%s \"%s\" \"%s\" \"%s\"" % (cmd, infilename, filterpath, outfilename))
+if ret == 0:
+        infile = open(outfilename, "r")
+else:
+        sys.stderr.write("ERROR: Filter error %s\n" % ret);
+        infile = open(infilename, "r")
+
 faxcontent = base64.encodestring(infile.read());
 infile.close()
@@ -118 +121 @@
 result = server.samurai.ClientIdentify({
         'ClientName':'SipgateFax for Mac OSX',
-        'ClientVersion':'1.0b1',
+        'ClientVersion':'1.0b2',
         'ClientVendor':'Christian Aust, software-consultant.net',
 })
@@ -139 +142 @@
 if argc == 6:
     os.unlink(infilename)
+os.unlink(outfilename)
 
 sys.exit(CUPS_BACKEND_OK)

SipgateFax/trunk/Resources/usr/share/cups/model/SipgateFax.ppd

@@ -31 +31 @@
 *% Convert the cups raster format to pdf for sipgate
 *%
-*cupsFilter:    "application/vnd.cups-postscript 33 pstopdffilter"
+*cupsFilter:    "application/vnd.cups-postscript 0 pstopdffilter"
 
 *OpenUI *Resolution/Auflösung: PickOne

SipgateFax/trunk/SipgateFax Installer.pmdoc/01resources-contents.xml

@@ -1 @@
-<pkg-contents spec="1.12"><f n="Resources" o="christian" g="staff" p="16877" pt="/Users/christian/Documents/Projekte/SipgateFax/Resources" m="false" t="file"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="usr" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="libexec" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="cups" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="backend" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><f n="sipgate.svn-base" o="root" g="wheel" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><f n="sipgate.svn-work" o="root" g="wheel" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><f n="sipgate.svn-base" o="root" g="wheel" p="33277"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="sipgate" o="root" g="wheel" p="33277"/></f></f></f><f n="share" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="cups" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="model" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><f n="SipgateFax.ppd.svn-work" o="root" g="wheel" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><f n="SipgateFax.ppd.svn-base" o="root" g="wheel" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="SipgateFax.ppd" o="root" g="wheel" p="33188"/></f></f></f></f></f></pkg-contents>
+<pkg-contents spec="1.12"><f n="Resources" o="christian" g="staff" p="16877" pt="/Users/christian/Documents/Projekte/SipgateFax/Resources" m="false" t="file"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="Library" o="root" g="admin" p="17405"><f n="Filters" o="christian" g="admin" p="16877"><f n="CompressForFax.qfilter" o="christian" g="admin" p="33204"/></f></f><f n="usr" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="libexec" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="cups" o="root" g="wheel" p="16877"><f n=".DS_Store" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="backend" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><f n="sipgate.svn-base" o="root" g="wheel" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><f n="sipgate.svn-base" o="root" g="wheel" p="33277"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="sipgate" o="root" g="wheel" p="33277"/></f></f></f><f n="share" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="cups" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="model" o="root" g="wheel" p="16877"><f n=".svn" o="root" g="wheel" p="16893"><f n="all-wcprops" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="format" o="root" g="wheel" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="wheel" p="16893"><f n="SipgateFax.ppd.svn-base" o="root" g="wheel" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><f n="SipgateFax.ppd.svn-base" o="root" g="wheel" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="wheel" p="16893"><f n="prop-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="props" o="root" g="wheel" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="wheel" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="SipgateFax.ppd" o="root" g="wheel" p="33188"/></f></f></f></f></f></pkg-contents>

SipgateFax/trunk/SipgateFax Installer.pmdoc/01resources.xml

@@ -1 @@
-<pkgref spec="1.12" uuid="20D054C8-ADCB-4FB7-A4BE-E61160D07CFA"><config><identifier>net.software-consultant.sipgateFaxDriver.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">Resources</installFrom><installTo mod="true">/</installTo><flags><followSymbolicLinks/><discardResourceForks/><allowRevert/><mod>discardResourceForks</mod><mod>allowRevert</mod></flags><packageStore type="internal"></packageStore><mod>locationType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>extraFiles</mod><mod>version</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postflight.isRelativeType</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>installTo.path</mod></config><scripts><postflight relative="true" mod="true">scripts/postflight.sh</postflight><scripts-dir relative="true" mod="true">scripts</scripts-dir></scripts><contents><file-list>01resources-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
+<pkgref spec="1.12" uuid="20D054C8-ADCB-4FB7-A4BE-E61160D07CFA"><config><identifier>net.software-consultant.sipgateFaxDriver.pkg</identifier><version>3</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">Resources</installFrom><installTo mod="true">/</installTo><flags><followSymbolicLinks/><discardResourceForks/><allowRevert/><mod>discardResourceForks</mod><mod>allowRevert</mod></flags><packageStore type="internal"></packageStore><mod>locationType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>extraFiles</mod><mod>version</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod><mod>scripts.preflight.path</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>scripts.postflight.isRelativeType</mod></config><scripts><preflight relative="true" mod="true">scripts/preflight.sh</preflight><postflight relative="true" mod="true">scripts/postflight.sh</postflight><scripts-dir relative="true" mod="true">scripts</scripts-dir></scripts><contents><file-list>01resources-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>