SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 20:03:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

W3xx remove filesize finetune, fixes #495

Browse Source
This commit is contained in:
sbcgua 2016-12-12 14:29:45 +02:00
parent c48741b7d1
commit c78d3bb339
7 changed files with 102 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zabapgit_css_common.w3mi.xml
View File

@ -17,24 +17,12 @@
<NAME>filename</NAME> <NAME>filename</NAME>
<VALUE>~wwwtmp.css</VALUE> <VALUE>~wwwtmp.css</VALUE>
</WWWPARAMS> </WWWPARAMS>
<WWWPARAMS>
<RELID>MI</RELID>
<OBJID>ZABAPGIT_CSS_COMMON</OBJID>
<NAME>filesize</NAME>
<VALUE>12615</VALUE>
</WWWPARAMS>
<WWWPARAMS> <WWWPARAMS>
<RELID>MI</RELID> <RELID>MI</RELID>
<OBJID>ZABAPGIT_CSS_COMMON</OBJID> <OBJID>ZABAPGIT_CSS_COMMON</OBJID>
<NAME>mimetype</NAME> <NAME>mimetype</NAME>
<VALUE>text/css</VALUE> <VALUE>text/css</VALUE>
</WWWPARAMS> </WWWPARAMS>
<WWWPARAMS>
<RELID>MI</RELID>
<OBJID>ZABAPGIT_CSS_COMMON</OBJID>
<NAME>version</NAME>
<VALUE/>
</WWWPARAMS>
</PARAMS> </PARAMS>
</asx:values> </asx:values>
</asx:abap> </asx:abap>

12
src/zabapgit_js_common.w3mi.xml
View File

@ -17,24 +17,12 @@
<NAME>filename</NAME> <NAME>filename</NAME>
<VALUE>common.js</VALUE> <VALUE>common.js</VALUE>
</WWWPARAMS> </WWWPARAMS>
<WWWPARAMS>
<RELID>MI</RELID>
<OBJID>ZABAPGIT_JS_COMMON</OBJID>
<NAME>filesize</NAME>
<VALUE>6500</VALUE>
</WWWPARAMS>
<WWWPARAMS> <WWWPARAMS>
<RELID>MI</RELID> <RELID>MI</RELID>
<OBJID>ZABAPGIT_JS_COMMON</OBJID> <OBJID>ZABAPGIT_JS_COMMON</OBJID>
<NAME>mimetype</NAME> <NAME>mimetype</NAME>
<VALUE>text/javascript</VALUE> <VALUE>text/javascript</VALUE>
</WWWPARAMS> </WWWPARAMS>
<WWWPARAMS>
<RELID>MI</RELID>
<OBJID>ZABAPGIT_JS_COMMON</OBJID>
<NAME>version</NAME>
<VALUE/>
</WWWPARAMS>
</PARAMS> </PARAMS>
</asx:values> </asx:values>
</asx:abap> </asx:abap>

119
src/zabapgit_object_w3xx.prog.abap
View File

@ -12,13 +12,20 @@ CLASS lcl_object_w3super DEFINITION INHERITING FROM lcl_objects_super ABSTRACT.
PUBLIC SECTION. PUBLIC SECTION.
INTERFACES lif_object. INTERFACES lif_object.
TYPES: ty_wwwparams_tt TYPE STANDARD TABLE OF wwwparams WITH DEFAULT KEY. TYPES ty_wwwparams_tt TYPE STANDARD TABLE OF wwwparams WITH DEFAULT KEY.
METHODS: CONSTANTS: BEGIN OF c_param_names,
constructor version TYPE w3_name VALUE 'version',
IMPORTING fileext TYPE w3_name VALUE 'fileextension',
is_item TYPE ty_item filesize TYPE w3_name VALUE 'filesize',
iv_language TYPE spras. filename TYPE w3_name VALUE 'filename',
mimetype TYPE w3_name VALUE 'mimetype',
END OF c_param_names.
METHODS constructor
IMPORTING
is_item TYPE ty_item
iv_language TYPE spras.
PROTECTED SECTION. PROTECTED SECTION.
@ -33,18 +40,19 @@ CLASS lcl_object_w3super DEFINITION INHERITING FROM lcl_objects_super ABSTRACT.
RETURNING VALUE(rv_ext) TYPE string RETURNING VALUE(rv_ext) TYPE string
RAISING lcx_exception. RAISING lcx_exception.
METHODS patch_size METHODS normalize_params
IMPORTING iv_size TYPE i OPTIONAL " Overwrite if given IMPORTING iv_size TYPE i
EXPORTING ev_size TYPE i " Return size as integer
CHANGING ct_params TYPE ty_wwwparams_tt " Param table to patch CHANGING ct_params TYPE ty_wwwparams_tt " Param table to patch
RAISING lcx_exception. RAISING lcx_exception.
METHODS patch_filename METHODS strip_params
CHANGING ct_params TYPE ty_wwwparams_tt CHANGING ct_params TYPE ty_wwwparams_tt
RAISING lcx_exception. RAISING lcx_exception.
METHODS clear_version METHODS find_param
CHANGING ct_params TYPE ty_wwwparams_tt IMPORTING it_params TYPE ty_wwwparams_tt
iv_name TYPE w3_name
RETURNING VALUE(rv_value) TYPE string
RAISING lcx_exception. RAISING lcx_exception.
ENDCLASS. "lcl_object_W3SUPER DEFINITION ENDCLASS. "lcl_object_W3SUPER DEFINITION
@ -145,15 +153,9 @@ CLASS lcl_object_w3super IMPLEMENTATION.
lcx_exception=>raise( 'Cannot read W3xx data' ). lcx_exception=>raise( 'Cannot read W3xx data' ).
ENDIF. ENDIF.
" Condense size string + get size to local integer lv_size = find_param( it_params = lt_w3params iv_name = c_param_names-filesize ).
patch_size( IMPORTING ev_size = lv_size " Clean params (remove version, filesize & clear filename from path)
CHANGING ct_params = lt_w3params ). strip_params( CHANGING ct_params = lt_w3params ).
" Remove file path (for security concerns)
patch_filename( CHANGING ct_params = lt_w3params ).
" Clear version
clear_version( CHANGING ct_params = lt_w3params ).
CASE ms_key-relid. CASE ms_key-relid.
WHEN 'MI'. WHEN 'MI'.
@ -264,11 +266,9 @@ CLASS lcl_object_w3super IMPLEMENTATION.
lcx_exception=>raise( 'Wrong W3xx type' ). lcx_exception=>raise( 'Wrong W3xx type' ).
ENDCASE. ENDCASE.
" Update size of file (for the case file was actually changed remotely) " Update size of file based on actual data file size, prove param object name
" Will also trigger "stage" at next sync if remote XML normalize_params( EXPORTING iv_size = lv_size
" was not updated with the new file size CHANGING ct_params = lt_w3params ).
patch_size( EXPORTING iv_size = lv_size
CHANGING ct_params = lt_w3params ).
CALL FUNCTION 'WWWPARAMS_UPDATE' CALL FUNCTION 'WWWPARAMS_UPDATE'
TABLES TABLES
@ -368,67 +368,60 @@ CLASS lcl_object_w3super IMPLEMENTATION.
METHOD get_ext. METHOD get_ext.
FIELD-SYMBOLS <param> LIKE LINE OF it_params. rv_ext = find_param( it_params = it_params iv_name = c_param_names-fileext ).
READ TABLE it_params ASSIGNING <param> WITH KEY name = 'fileextension'.
IF sy-subrc > 0.
lcx_exception=>raise( |W3xx: Cannot find file ext for { ms_key-objid }| ).
ENDIF.
rv_ext = <param>-value.
SHIFT rv_ext LEFT DELETING LEADING '.'. SHIFT rv_ext LEFT DELETING LEADING '.'.
ENDMETHOD. " get_ext. ENDMETHOD. " get_ext.
METHOD patch_size. METHOD normalize_params.
FIELD-SYMBOLS <param> LIKE LINE OF ct_params. FIELD-SYMBOLS <param> LIKE LINE OF ct_params.
READ TABLE ct_params ASSIGNING <param> WITH KEY name = 'filesize'. " Ensure filesize param exists
READ TABLE ct_params ASSIGNING <param> WITH KEY name = c_param_names-filesize.
IF sy-subrc > 0. IF sy-subrc <> 0.
lcx_exception=>raise( |W3xx: Cannot find file size for { ms_key-objid }| ). APPEND INITIAL LINE TO ct_params ASSIGNING <param>.
<param>-name = c_param_names-filesize.
ENDIF. ENDIF.
IF iv_size IS NOT INITIAL. LOOP AT ct_params ASSIGNING <param>.
<param>-value = iv_size. <param>-relid = ms_key-relid. " Ensure param key = object key
ENDIF. <param>-objid = ms_key-objid.
CONDENSE <param>-value. IF <param>-name = c_param_names-filesize. " Patch filesize = real file size
<param>-value = iv_size.
CONDENSE <param>-value.
ENDIF.
ENDLOOP.
ev_size = <param>-value. ENDMETHOD. " normalize_params.
ENDMETHOD. " patch_size. METHOD strip_params.
METHOD patch_filename.
FIELD-SYMBOLS <param> LIKE LINE OF ct_params. FIELD-SYMBOLS <param> LIKE LINE OF ct_params.
READ TABLE ct_params ASSIGNING <param> WITH KEY name = 'filename'. " Remove path from filename
find_param( it_params = ct_params iv_name = c_param_names-filename ). " Check exists
IF sy-subrc > 0. READ TABLE ct_params ASSIGNING <param> WITH KEY name = c_param_names-filename.
lcx_exception=>raise( |W3xx: Cannot find file name for { ms_key-objid }| ).
ENDIF.
" Remove path
<param>-value = lcl_path=>get_filename_from_syspath( |{ <param>-value }| ). <param>-value = lcl_path=>get_filename_from_syspath( |{ <param>-value }| ).
ENDMETHOD. " patch_filename. " Clear version & filesize
DELETE ct_params WHERE name = c_param_names-version.
DELETE ct_params WHERE name = c_param_names-filesize.
METHOD clear_version. ENDMETHOD. " strip_params.
FIELD-SYMBOLS <param> LIKE LINE OF ct_params. METHOD find_param.
READ TABLE ct_params ASSIGNING <param> WITH KEY name = 'version'. FIELD-SYMBOLS <param> LIKE LINE OF it_params.
READ TABLE it_params ASSIGNING <param> WITH KEY name = iv_name.
IF sy-subrc > 0. IF sy-subrc > 0.
lcx_exception=>raise( |W3xx: Cannot find version for { ms_key-objid }| ). lcx_exception=>raise( |W3xx: Cannot find { iv_name } for { ms_key-objid }| ).
ENDIF. ENDIF.
" Clear version rv_value = <param>-value.
CLEAR <param>-value.
ENDMETHOD. " clear_version. ENDMETHOD. " find_param.
METHOD lif_object~compare_to_remote_version. METHOD lif_object~compare_to_remote_version.
CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result. CREATE OBJECT ro_comparison_result TYPE lcl_null_comparison_result.

5
src/zabapgit_repo.prog.abap
View File

@ -46,6 +46,8 @@ CLASS lcl_repo DEFINITION ABSTRACT FRIENDS lcl_repo_srv.
update_local_checksums update_local_checksums
IMPORTING it_files TYPE ty_file_signatures_tt IMPORTING it_files TYPE ty_file_signatures_tt
RAISING lcx_exception, RAISING lcx_exception,
rebuild_local_checksums
RAISING lcx_exception,
is_offline is_offline
RETURNING VALUE(rv_offline) TYPE abap_bool RETURNING VALUE(rv_offline) TYPE abap_bool
RAISING lcx_exception. RAISING lcx_exception.
@ -118,8 +120,7 @@ CLASS lcl_repo_online DEFINITION INHERITING FROM lcl_repo FINAL.
RETURNING VALUE(rt_results) TYPE ty_results_tt RETURNING VALUE(rt_results) TYPE ty_results_tt
RAISING lcx_exception, RAISING lcx_exception,
reset_status, reset_status,
rebuild_local_checksums rebuild_local_checksums REDEFINITION,
RAISING lcx_exception,
push push
IMPORTING is_comment TYPE ty_comment IMPORTING is_comment TYPE ty_comment
io_stage TYPE REF TO lcl_stage io_stage TYPE REF TO lcl_stage

36
src/zabapgit_repo_impl.prog.abap
View File

@ -243,7 +243,7 @@ CLASS lcl_repo_online IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD rebuild_local_checksums. METHOD rebuild_local_checksums. "REMOTE
DATA: lt_remote TYPE ty_files_tt, DATA: lt_remote TYPE ty_files_tt,
lt_local TYPE ty_files_item_tt, lt_local TYPE ty_files_item_tt,
@ -639,6 +639,40 @@ CLASS lcl_repo IMPLEMENTATION.
rv_yes = ms_data-write_protect. rv_yes = ms_data-write_protect.
ENDMETHOD. "is_write_protected ENDMETHOD. "is_write_protected
METHOD rebuild_local_checksums. "LOCAL (BASE)
DATA: lt_local TYPE ty_files_item_tt,
ls_last_item TYPE ty_item,
lt_checksums TYPE lcl_persistence_repo=>ty_local_checksum_tt.
FIELD-SYMBOLS: <ls_checksum> LIKE LINE OF lt_checksums,
<ls_file_sig> LIKE LINE OF <ls_checksum>-files,
<ls_local> LIKE LINE OF lt_local.
lt_local = get_files_local( ).
DELETE lt_local " Remove non-code related files except .abapgit
WHERE item IS INITIAL
AND NOT ( file-path = gc_root_dir AND file-filename = gc_dot_abapgit ).
SORT lt_local BY item.
LOOP AT lt_local ASSIGNING <ls_local>.
IF ls_last_item <> <ls_local>-item OR sy-tabix = 1. " First or New item reached ?
APPEND INITIAL LINE TO lt_checksums ASSIGNING <ls_checksum>.
<ls_checksum>-item = <ls_local>-item.
ls_last_item = <ls_local>-item.
ENDIF.
APPEND INITIAL LINE TO <ls_checksum>-files ASSIGNING <ls_file_sig>.
MOVE-CORRESPONDING <ls_local>-file TO <ls_file_sig>.
ENDLOOP.
set( it_checksums = lt_checksums ).
ENDMETHOD. " rebuild_local_checksums.
ENDCLASS. "lcl_repo IMPLEMENTATION ENDCLASS. "lcl_repo IMPLEMENTATION
*----------------------------------------------------------------------* *----------------------------------------------------------------------*

8
src/zabapgit_services_repo.prog.abap
View File

@ -265,16 +265,20 @@ CLASS lcl_services_repo IMPLEMENTATION.
DATA: lv_answer TYPE c, DATA: lv_answer TYPE c,
lv_question TYPE string, lv_question TYPE string,
lo_repo TYPE REF TO lcl_repo_online. lo_repo TYPE REF TO lcl_repo.
lo_repo ?= lcl_app=>repo_srv( )->get( iv_key ). lo_repo ?= lcl_app=>repo_srv( )->get( iv_key ).
lv_question = 'This will rebuild and overwrite local repo checksums.' lv_question = 'This will rebuild and overwrite local repo checksums.'.
IF lo_repo->is_offline( ) = abap_false.
lv_question = lv_question
&& ' The logic: if local and remote file differs then:' && ' The logic: if local and remote file differs then:'
&& ' if remote branch is ahead then assume changes are remote,' && ' if remote branch is ahead then assume changes are remote,'
&& ' else (branches are equal) assume changes are local.' && ' else (branches are equal) assume changes are local.'
&& ' This will lead to incorrect state for files changed on both sides.' && ' This will lead to incorrect state for files changed on both sides.'
&& ' Please make sure you don''t have ones like that.'. && ' Please make sure you don''t have ones like that.'.
ENDIF.
lv_answer = lcl_popups=>popup_to_confirm( lv_answer = lcl_popups=>popup_to_confirm(
titlebar = 'Warning' titlebar = 'Warning'

4
src/zabapgit_view_repo.prog.abap
View File

@ -260,12 +260,12 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
iv_act = |{ gc_action-repo_remote_change }?{ lv_key }| ). iv_act = |{ gc_action-repo_remote_change }?{ lv_key }| ).
lo_tb_advanced->add( iv_txt = 'Make off-line' lo_tb_advanced->add( iv_txt = 'Make off-line'
iv_act = |{ gc_action-repo_remote_detach }?{ lv_key }| ). iv_act = |{ gc_action-repo_remote_detach }?{ lv_key }| ).
lo_tb_advanced->add( iv_txt = 'Update local checksums'
iv_act = |{ gc_action-repo_refresh_checksums }?{ lv_key }| ).
ELSE. ELSE.
lo_tb_advanced->add( iv_txt = 'Make on-line' lo_tb_advanced->add( iv_txt = 'Make on-line'
iv_act = |{ gc_action-repo_remote_attach }?{ lv_key }| ). iv_act = |{ gc_action-repo_remote_attach }?{ lv_key }| ).
ENDIF. ENDIF.
lo_tb_advanced->add( iv_txt = 'Update local checksums'
iv_act = |{ gc_action-repo_refresh_checksums }?{ lv_key }| ).
lo_tb_advanced->add( iv_txt = 'Remove' lo_tb_advanced->add( iv_txt = 'Remove'
iv_act = |{ gc_action-repo_remove }?{ lv_key }| ). iv_act = |{ gc_action-repo_remove }?{ lv_key }| ).
lo_tb_advanced->add( iv_txt = 'Uninstall' lo_tb_advanced->add( iv_txt = 'Uninstall'