Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Minor cleanups and tinkering in /json/dir. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c1963c49b0a09e262ae261dc4d47ed57 |
User & Date: | stephan 2012-03-18 16:37:18.642 |
Context
2012-03-18
| ||
23:44 | Fix compiler warnings and update custom makefile. ... (check-in: 43631b08 user: mistachkin tags: trunk) | |
16:37 | Minor cleanups and tinkering in /json/dir. ... (check-in: c1963c49 user: stephan tags: trunk) | |
16:36 | /json/finfo now sorts ASC when --after is specified. ... (check-in: 5dcaeca7 user: stephan tags: trunk) | |
Changes
Changes to src/json_dir.c.
︙ | ︙ | |||
104 105 106 107 108 109 110 | ** of all files and subdirectories in the zD[] directory. ** ** Subdirectory names begin with "/". This causes them to sort ** first and it also gives us an easy way to distinguish files ** from directories in the loop that follows. */ db_multi_exec( | | | > > | > > | | | | | > > | | | > > < < | | | | | | < > > | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | ** of all files and subdirectories in the zD[] directory. ** ** Subdirectory names begin with "/". This causes them to sort ** first and it also gives us an easy way to distinguish files ** from directories in the loop that follows. */ db_multi_exec( "CREATE TEMP TABLE localfiles(n UNIQUE NOT NULL %s, u, sz, mtime DEFAULT NULL);", filename_collation() ); if( zCI ){ Stmt ins; ManifestFile *pFile; ManifestFile *pPrev = 0; int nPrev = 0; int c; db_prepare(&ins, "INSERT OR IGNORE INTO localfiles VALUES(" /*0*/ "pathelement(:x,0)," /*1*/ ":u, " /*2*/ "(SELECT size from blob where uuid=:s), " /*3: TODO: mtime*/" NULL" ")" ); manifest_file_rewind(pM); while( (pFile = manifest_file_next(pM,0))!=0 ){ if( nD>0 && ((pFile->zName[nD-1]!='/') || (0!=memcmp(pFile->zName, zD, nD-1))) ){ continue; } /*printf("zD=%s, nD=%d, pFile->zName=%s\n", zD, nD, pFile->zName);*/ if( pPrev && memcmp(&pFile->zName[nD],&pPrev->zName[nD],nPrev)==0 && (pFile->zName[nD+nPrev]==0 || pFile->zName[nD+nPrev]=='/') ){ continue; } db_bind_text(&ins, ":x", &pFile->zName[nD]); db_bind_text(&ins, ":u", pFile->zUuid); db_bind_text(&ins, ":s", pFile->zUuid); /*db_bind_text(&ins, ":u3", pFile->zUuid);*/ db_step(&ins); db_reset(&ins); pPrev = pFile; for(nPrev=0; (c=pPrev->zName[nD+nPrev]) && c!='/'; nPrev++){} if( c=='/' ) nPrev++; } db_finalize(&ins); }else if( zD && *zD ){ if( filenames_are_case_sensitive() ){ db_multi_exec( "INSERT OR IGNORE INTO localfiles" " SELECT pathelement(name,%d), NULL, NULL, NULL FROM filename" " WHERE name GLOB '%q/*'", nD, zD ); }else{ db_multi_exec( "INSERT OR IGNORE INTO localfiles" " SELECT pathelement(name,%d), NULL, NULL, NULL FROM filename" " WHERE name LIKE '%q/%%'", nD, zD ); } }else{ db_multi_exec( "INSERT OR IGNORE INTO localfiles" " SELECT pathelement(name,0), NULL, NULL, NULL FROM filename" ); } if(zCI){ db_prepare( &q, "SELECT n as name, u as uuid, sz as size FROM localfiles ORDER BY n"); }else{/* UUIDs are all NULL. */ db_prepare( &q, "SELECT n as name FROM localfiles ORDER BY n"); } zKeyName = cson_new_string("name",4); cson_value_add_reference( cson_string_value(zKeyName) ); zKeyUuid = cson_new_string("uuid",4); cson_value_add_reference( cson_string_value(zKeyUuid) ); zKeyIsDir = cson_new_string("isDir",5); cson_value_add_reference( cson_string_value(zKeyIsDir) ); if( zCI ){ zKeySize = cson_new_string("size",4); cson_value_add_reference( cson_string_value(zKeySize) ); } zPayload = cson_new_object(); cson_object_set_s( zPayload, zKeyName, json_new_string((zD&&*zD) ? zD : "/") ); #if 0 if(zUuid){ cson_object_set_s( zPayload, zKeyUuid, cson_string_value(cson_new_string(zUuid, strlen(zUuid))) ); } #endif if( zUuid ){ cson_object_set( zPayload, "checkin", json_new_string(zUuid) ); } while( (SQLITE_ROW==db_step(&q)) ){ cson_value * name = NULL; char const * n = db_column_text(&q,0); char const isDir = ('/'==*n); zEntry = cson_new_object(); if(!zEntries){ zEntries = cson_new_array(); cson_object_set( zPayload, "entries", cson_array_value(zEntries) ); } cson_array_append(zEntries, cson_object_value(zEntry) ); if(isDir){ name = json_new_string( n+1 ); cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() ); } else{ name = json_new_string( n ); } cson_object_set_s(zEntry, zKeyName, name ); if( zCI && !isDir){ /* don't add the uuid/size for dir entries - that data refers to one of the files in that directory :/. */ char const * u = db_column_text(&q,1); sqlite_int64 const sz = db_column_int64(&q,2); /*sqlite_int64 const ts = db_column_int64(&q,3);*/ if(u && *u){ cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) ); } cson_object_set_s(zEntry, zKeySize, cson_value_new_integer( (cson_int_t)sz )); /*cson_object_set(zEntry, "mtime", cson_value_new_integer( (cson_int_t)ts ));*/ } } db_finalize(&q); if(pM){ manifest_destroy(pM); } cson_value_free( cson_string_value( zKeyName ) ); |
︙ | ︙ |