From: Jean-Michel Nirgal Vourgère <jmv@nirgal.com>
Date: Sat, 5 Apr 2008 11:58:47 +0000 (+0000)
Subject: Renamed ccoop-atomize to ccoop-feeder
X-Git-Url: https://git.nirgal.com/?p=ccoop.git;a=commitdiff_plain;h=1890254b31548d3272eb4749b31b27561b642223

Renamed ccoop-atomize to ccoop-feeder
---

diff --git a/README b/README
index 5a6f0b1..890f3c6 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ Avertissements de sécurité
 
 Ces scripts dépendent du fait que le mot de passe utilisateur de coopanet soit stocké dans un fichier texte, ce qui est fondamentalement dangeureux. Considérez le risque que cela vous fait courrir par rapport au bénéfice apporté.
 
-Dans tous les cas, utilisez un mot de passe différent pour la consultation des comptes et pour les transferts. Le mot de passe de transfert ne vous serra jamais demandé.
+Dans tous les cas, utilisez un mot de passe différent pour la consultation des comptes et pour les transferts. Le mot de passe de transfert ne vous sera jamais demandé.
 
 Configuration
 -------------
diff --git a/ccoop-atomize b/ccoop-atomize
deleted file mode 100755
index e095523..0000000
--- a/ccoop-atomize
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-
-import sys,os,datetime
-
-account=sys.argv[1]
-name=sys.argv[2]
-balance=sys.argv[3]
-
-lines = file(os.path.join(os.getenv("CCPATH"), account+".csv")).readlines()
-nlines = len(lines)
-
-print '<?xml version="1.0" encoding="UTF-8"?>'
-print '<feed xmlns="http://www.w3.org/2005/Atom">'
-print "<id>tag:nirgal.com,2000:ccoop/"+account+"</id>"
-print "<title>"+name+" "+account+"</title>"
-print '<subtitle type="text">Balance: '+balance+'</subtitle>'
-print "<updated>"+datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")+"</updated>"
- 
-iline = 0
-for line in lines:
-    line = line[:-1]
-    iline+=1
-    if not line:
-        continue
-    date,libel1,libel2,amount,sign,checkid = line.split(';')
-    date=date[6:]+"-"+date[3:5]+"-"+date[0:2]
-    libel1=libel1.strip()
-    libel2=libel2.strip()
-    amount=amount.strip()
-    sign=sign.strip()
-    print "<entry>"
-    print "   <id>"+str(nlines-iline)+"</id>"
-    print "   <updated>"+date+"</updated>"
-    print "   <title>"+libel1+"</title>"
-    print "   <content type='text'>"
-    print "      "+libel1
-    print "      "+libel2
-    print "      "+sign
-    print "      "+amount
-    print "      "+checkid
-    print "   </content>"
-    print "</entry>"
-
-print "</feed>"
diff --git a/ccoop-feeder b/ccoop-feeder
new file mode 100755
index 0000000..d699cd2
--- /dev/null
+++ b/ccoop-feeder
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+
+import sys,os,datetime
+
+account=sys.argv[1]
+name=sys.argv[2]
+balance=sys.argv[3]
+
+lines = file(os.path.join(os.getenv("CCPATH"), account+".csv")).readlines()
+nlines = len(lines)
+
+print '<?xml version="1.0" encoding="UTF-8"?>'
+print '<feed xmlns="http://www.w3.org/2005/Atom">'
+print "<id>tag:nirgal.com,2000:ccoop/"+account+"</id>"
+print "<title>"+name+" "+account+"</title>"
+print '<subtitle type="text">Balance: '+balance+'</subtitle>'
+print "<updated>"+datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")+"</updated>"
+ 
+iline = 0
+for line in lines:
+    line = line[:-1] # remove extra \n
+    iline+=1
+    if not line:
+        continue
+    date,libel1,libel2,amount,sign,checkid = line.split(';')
+    date=date[6:]+"-"+date[3:5]+"-"+date[0:2] # RFC says we should add time
+    libel1=libel1.strip()
+    libel2=libel2.strip()
+    amount=amount.strip()
+    sign=sign.strip()
+    print "<entry>"
+    print "   <id>"+str(nlines-iline)+"</id>"
+    print "   <updated>"+date+"</updated>"
+    print "   <title>"+libel1+"</title>"
+    print "   <content type='text'>"
+    print "      "+libel1
+    print "      "+libel2
+    print "      "+sign
+    print "      "+amount
+    print "      "+checkid
+    print "   </content>"
+    print "</entry>"
+
+print "</feed>"
diff --git a/ccoop-update b/ccoop-update
index 20dba1a..f9ddd66 100755
--- a/ccoop-update
+++ b/ccoop-update
@@ -206,7 +206,7 @@ function updatehistory() {
     done
 }
 
-function atomize() {
+function makefeed() {
     inform "Updating feeds"
     if [[ "${0:0:1}"=="/" ]]; then
         # absolute path
@@ -219,7 +219,7 @@ function atomize() {
         name=${accountsNames[$idx]}
         balance=${accountsBalances[$idx]}
 
-        "$path/ccoop-atomize" "$account" "$name" "$balance" > $CCPATH/$account.atom
+        "$path/ccoop-feeder" "$account" "$name" "$balance" > $CCPATH/$account.atom
     done
 }
 
@@ -252,5 +252,5 @@ fi
 
 fetchall
 updatehistory
-atomize
+makefeed