Fossil

Diff
Login

Diff

Differences From Artifact [e96b878512]:

To Artifact [de79d0095f]:


46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

61
62
63
64
65
66
67
/*
** Impl of /json/dir. 98% of it was taken directly
** from browse.c::page_dir()
*/
static cson_value * json_page_dir_list(){
  cson_object * zPayload = NULL;
  cson_array * zEntries = NULL;
  cson_array * zFiles = NULL;
  cson_array * zDirs = NULL;
  cson_object * zEntry = NULL;
  cson_string * zKeyName = NULL;
  cson_string * zKeyIsDir = NULL;
  cson_string * zKeyUuid = NULL;
  char * zD = NULL;
  char const * zDX = NULL;

  int nD;
  char * zUuid = NULL;
  char const * zCI = NULL;
  Manifest * pM = NULL;
  Stmt q = empty_Stmt;
  int rid = 0;
  char * zPrefix = NULL;







<
<






>







46
47
48
49
50
51
52


53
54
55
56
57
58
59
60
61
62
63
64
65
66
/*
** Impl of /json/dir. 98% of it was taken directly
** from browse.c::page_dir()
*/
static cson_value * json_page_dir_list(){
  cson_object * zPayload = NULL;
  cson_array * zEntries = NULL;


  cson_object * zEntry = NULL;
  cson_string * zKeyName = NULL;
  cson_string * zKeyIsDir = NULL;
  cson_string * zKeyUuid = NULL;
  char * zD = NULL;
  char const * zDX = NULL;
  cson_value const * zDV = NULL;
  int nD;
  char * zUuid = NULL;
  char const * zCI = NULL;
  Manifest * pM = NULL;
  Stmt q = empty_Stmt;
  int rid = 0;
  char * zPrefix = NULL;
82
83
84
85
86
87
88





89





90







91
92
93

94
95
96
97
98
99
100
101
    }else{
      json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
                   "Checkin name [%s] is unresolved.",
                   zCI);
      return NULL;
    }
  }











  zDX = json_find_option_cstr("name",NULL,"n");







  if((!zDX || !*zDX) && !g.isHTTP){
    zDX = json_command_arg(g.json.dispatchDepth+1);
  }

  zD = (zDX && *zDX) ? fossil_strdup(zDX) : NULL;
  nD = zD ? strlen(zD)+1 : 0;
  while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }

  sqlite3_create_function(g.db, "pathelement", 2, SQLITE_UTF8, 0,
                          pathelementFunc, 0, 0);

  /* Compute the temporary table "localfiles" containing the names







>
>
>
>
>
|
>
>
>
>
>
|
>
>
>
>
>
>
>
|
|

>
|







81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
    }else{
      json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
                   "Checkin name [%s] is unresolved.",
                   zCI);
      return NULL;
    }
  }
  zDV = json_req_payload_get("name");
  if(!zDV){
    zDV = cson_object_get( g.json.param.o, "name" );
    if(!zDV && !g.isHTTP){
      zDX = json_command_arg(g.json.dispatchDepth+1);
    }
  }
  if(!zDX){
    zDX = zDV ? cson_value_get_cstr(zDV) : NULL;
  }
  if(!zDX && !g.isHTTP){
    zDX = json_find_option_cstr("name",NULL,"n");
  }
#if 1
  if(zDX && (!*zDX || (0==strcmp(zDX,"/")))){
    zDX = NULL;
  }
#endif
#if 0
  if(!zDX || !*zDX){
    zDX = "/";
  }
#endif
  zD = zDX ? fossil_strdup(zDX) : NULL;
  nD = zD ? strlen(zD)+1 : 0;
  while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }

  sqlite3_create_function(g.db, "pathelement", 2, SQLITE_UTF8, 0,
                          pathelementFunc, 0, 0);

  /* Compute the temporary table "localfiles" containing the names
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

    db_prepare(&ins,
       "INSERT OR IGNORE INTO localfiles VALUES(pathelement(:x,0), :u)"
    );
    manifest_file_rewind(pM);
    while( (pFile = manifest_file_next(pM,0))!=0 ){
      if( nD>0 
       && (memcmp(pFile->zName, zD, nD-1)!=0 || pFile->zName[nD-1]!='/')
      ){
        continue;
      }

      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_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 ){
    if( filenames_are_case_sensitive() ){
      db_multi_exec(
        "INSERT OR IGNORE INTO localfiles"
        " SELECT pathelement(name,%d), NULL FROM filename"
        "  WHERE name GLOB '%q/*'",
        nD, zD
      );







|



>















|







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

    db_prepare(&ins,
       "INSERT OR IGNORE INTO localfiles VALUES(pathelement(:x,0), :u)"
    );
    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_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 FROM filename"
        "  WHERE name GLOB '%q/*'",
        nD, zD
      );
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
  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) );

  zPayload = cson_new_object();
  cson_object_set_s( zPayload, zKeyName, json_new_string(zD ? zD : "/") );
  if(zUuid){
    cson_object_set_s( zPayload, zKeyUuid, cson_string_value(cson_new_string(zUuid, strlen(zUuid))) );
  }

  if( zCI ) cson_object_set( zPayload, "checkin", json_new_string(zCI) );


  while( (SQLITE_ROW==db_step(&q)) ){
    cson_value * name = NULL;
    char const * n = db_column_text(&q,0);
    char const * u = zCI ? db_column_text(&q,1) : NULL;
    zEntry = cson_new_object();
#if 0
    if('/'==*n){
      if(!zDirs){
        zDirs = cson_new_array();
        cson_object_set( zPayload, "dirs", cson_array_value(zDirs) );
      }
      cson_array_append(zDirs, cson_object_value(zEntry) );
      cson_object_set_s(zEntry, zKeyName, json_new_string( n+1 ) );
    }else{
      if(!zFiles){
        zFiles = cson_new_array();
        cson_object_set( zPayload, "files", cson_array_value(zFiles) );
      }
      cson_array_append(zFiles, cson_object_value(zEntry) );
      cson_object_set_s(zEntry, zKeyName, json_new_string( n ) );
    }
    if(u && *u){
      cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
    }
#else
    if(!zEntries){
      zEntries = cson_new_array();
      cson_object_set( zPayload, "entries", cson_array_value(zEntries) );
    }
    if('/'==*n){
      name = json_new_string( n+1 );
      cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() );

    } else{
      name = json_new_string( n );
    }
    if(u && *u){
      cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
    }
    cson_object_set_s(zEntry, zKeyName, name );
    cson_array_append(zEntries, cson_object_value(zEntry) );
#endif
  }
  db_finalize(&q);
  if(pM){
    manifest_destroy(pM);
  }
  cson_value_free( cson_string_value( zKeyName  ) );
  cson_value_free( cson_string_value( zKeyUuid  ) );







|



>
|
>






<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
















<







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
  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) );

  zPayload = cson_new_object();
  cson_object_set_s( zPayload, zKeyName, json_new_string((zD&&*zD) ? zD : "/") );
  if(zUuid){
    cson_object_set_s( zPayload, zKeyUuid, cson_string_value(cson_new_string(zUuid, strlen(zUuid))) );
  }
  if( zCI ){
    cson_object_set( zPayload, "checkin", json_new_string(zCI) );
  }

  while( (SQLITE_ROW==db_step(&q)) ){
    cson_value * name = NULL;
    char const * n = db_column_text(&q,0);
    char const * u = zCI ? db_column_text(&q,1) : NULL;
    zEntry = cson_new_object();




















    if(!zEntries){
      zEntries = cson_new_array();
      cson_object_set( zPayload, "entries", cson_array_value(zEntries) );
    }
    if('/'==*n){
      name = json_new_string( n+1 );
      cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() );

    } else{
      name = json_new_string( n );
    }
    if(u && *u){
      cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
    }
    cson_object_set_s(zEntry, zKeyName, name );
    cson_array_append(zEntries, cson_object_value(zEntry) );

  }
  db_finalize(&q);
  if(pM){
    manifest_destroy(pM);
  }
  cson_value_free( cson_string_value( zKeyName  ) );
  cson_value_free( cson_string_value( zKeyUuid  ) );